Skip to content

Commit f47e43e

Browse files
stomarstomar
committed
Fix layouts etc. for restructured locales data
Fix layouts, includes, and plugins to work with the restructured locales data. For example, `locales.sitelinks[page.lang]` becomes `locales[page.lang].sitelinks`.
1 parent 6b2923e commit f47e43e

17 files changed

+57
-58
lines changed

‎_includes/credits.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{% if site.data.locales.credits[page.lang] %}
2-
<p>{{ site.data.locales.credits[page.lang] }}</p>
1+
{% if site.data.locales[page.lang].credits %}
2+
<p>{{ site.data.locales[page.lang].credits }}</p>
33
{% else %}
4-
<p>{{ site.data.locales.credits['en'] }}</p>
4+
<p>{{ site.data.locales['en'].credits }}</p>
55
{% endif %}

‎_includes/languages.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<p>
2-
{% if site.data.locales.languages_heading[page.lang] %}
3-
{{ site.data.locales.languages_heading[page.lang] }}
2+
{% if site.data.locales[page.lang].languages_heading %}
3+
{{ site.data.locales[page.lang].languages_heading }}
44
{% else %}
5-
{{ site.data.locales.languages_heading['en'] }}
5+
{{ site.data.locales['en'].languages_heading }}
66
{% endif %}
77
<a href="/bg/">Български</a>,
88
<a href="/de/">Deutsch</a>,

‎_includes/rss_discovery.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
{% if site.data.locales.sidebar[page.lang] %}
2-
{% assign syndicate = site.data.locales.sidebar[page.lang].syndicate %}
1+
{% if site.data.locales[page.lang].sidebar %}
2+
{% assign syndicate = site.data.locales[page.lang].sidebar.syndicate %}
33
{% else %}
4-
{% assign syndicate = site.data.locales.sidebar['en'].syndicate %}
4+
{% assign syndicate = site.data.locales['en'].sidebar.syndicate %}
55
{% endif %}
66
<link href="{{ syndicate.recent_news.url }}" rel="alternate" title="{{ syndicate.recent_news.text }}" type="application/rss+xml">

‎_includes/search.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{% if site.data.locales.search[page.lang] %}
2-
{% assign cx_id = site.data.locales.search[page.lang].cx_id %}
3-
{% assign text = site.data.locales.search[page.lang].text %}
1+
{% if site.data.locales[page.lang].search %}
2+
{% assign cx_id = site.data.locales[page.lang].search.cx_id %}
3+
{% assign text = site.data.locales[page.lang].search.text %}
44
{% else %}
5-
{% assign text = site.data.locales.search['en'].text %}
5+
{% assign text = site.data.locales['en'].search.text %}
66
{% endif%}
77
<form id="search-form" action="https://www.google.com/cse">
88
<table class="fieldset">

‎_includes/sidebar.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
{% if site.data.locales.sidebar[page.lang] %}
2-
{% assign sidebar = site.data.locales.sidebar[page.lang] %}
1+
{% if site.data.locales[page.lang].sidebar %}
2+
{% assign sidebar = site.data.locales[page.lang].sidebar %}
33
{% else %}
4-
{% assign sidebar = site.data.locales.sidebar['en'] %}
4+
{% assign sidebar = site.data.locales['en'].sidebar %}
55
{% endif %}
66

77
{% if page.sidebar != null %}

‎_includes/sitelinks.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
{% if site.data.locales.sitelinks[page.lang] %}
2-
{% assign sitelinks = site.data.locales.sitelinks[page.lang] %}
1+
{% if site.data.locales[page.lang].sitelinks %}
2+
{% assign sitelinks = site.data.locales[page.lang].sitelinks %}
33
{% else %}
4-
{% assign sitelinks = site.data.locales.sitelinks['en'] %}
4+
{% assign sitelinks = site.data.locales['en'].sitelinks %}
55
{% endif %}
66
{% for link in sitelinks %}
77
<a href="{{ link.url }}/">{{ link.text }}</a>

‎_includes/subscription-form.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% assign locales = site.data.locales.subscription_form[page.lang] %}
1+
{% assign locales = site.data.locales[page.lang].subscription_form %}
22

33
<form action="https://ruby-lang-mls.herokuapp.com/submit" id="subscriptions-form" method="post" markdown="1">
44

‎_includes/syndicate.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
{% if site.data.locales.sidebar[page.lang] %}
2-
{% assign syndicate = site.data.locales.sidebar[page.lang].syndicate %}
1+
{% if site.data.locales[page.lang].sidebar %}
2+
{% assign syndicate = site.data.locales[page.lang].sidebar.syndicate %}
33
{% else %}
4-
{% assign syndicate = site.data.locales.sidebar['en'].syndicate %}
4+
{% assign syndicate = site.data.locales['en'].sidebar.syndicate %}
55
{% endif %}
66

77
<h3>{{ syndicate.text }}</h3>

‎_layouts/default.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<div id="header">
3939
<div id="header_content" class="container">
4040
<a href="/{{ page.lang }}/">
41-
<h1>{{ site.data.locales.ruby[page.lang] }}</h1>
42-
<h2>{{ site.data.locales.slogan[page.lang] }}</h2>
41+
<h1>{{ site.data.locales[page.lang].ruby }}</h1>
42+
<h2>{{ site.data.locales[page.lang].slogan }}</h2>
4343
</a>
4444

4545
<div class="site-links">

‎_layouts/homepage.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
{% assign number_of_excerpts = 4 %}
1212
{% assign number_of_other = 6 %}
1313

14-
{% if site.data.locales.news[page.lang] %}
15-
{% assign news = site.data.locales.news[page.lang] %}
14+
{% if site.data.locales[page.lang].news %}
15+
{% assign news = site.data.locales[page.lang].news %}
1616
{% else %}
17-
{% assign news = site.data.locales.news['en'] %}
17+
{% assign news = site.data.locales['en'].news %}
1818
{% endif %}
1919

2020
{% for post in site.categories[page.lang] limit:number_of_excerpts %}

‎_layouts/news.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
layout: default
33
---
44

5-
{% if site.data.locales.news[page.lang] %}
6-
{% assign locales = site.data.locales.news[page.lang] %}
5+
{% if site.data.locales[page.lang].news %}
6+
{% assign locales = site.data.locales[page.lang].news %}
77
{% else %}
8-
{% assign locales = site.data.locales.news['en'] %}
8+
{% assign locales = site.data.locales['en'].news %}
99
{% endif %}
1010

1111
<div id="content-wrapper">

‎_layouts/news_archive_month.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
layout: default
33
---
44

5-
{% if site.data.locales.news[page.lang] %}
6-
{% assign locales = site.data.locales.news[page.lang] %}
5+
{% if site.data.locales[page.lang].news %}
6+
{% assign locales = site.data.locales[page.lang].news %}
77
{% else %}
8-
{% assign locales = site.data.locales.news['en'] %}
8+
{% assign locales = site.data.locales['en'].news %}
99
{% endif %}
1010

1111
<div id="content-wrapper">

‎_layouts/news_archive_year.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
layout: default
33
---
44

5-
{% if site.data.locales.news[page.lang] %}
6-
{% assign locales = site.data.locales.news[page.lang] %}
5+
{% if site.data.locales[page.lang].news %}
6+
{% assign locales = site.data.locales[page.lang].news %}
77
{% else %}
8-
{% assign locales = site.data.locales.news['en'] %}
8+
{% assign locales = site.data.locales['en'].news %}
99
{% endif %}
1010

1111
<div id="content-wrapper">

‎_layouts/news_feed.rss

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
{% assign locales = site.data.locales.feed[page.lang] %}
3-
{% if site.data.locales.translated_by[page.lang] %}
4-
{% assign translated_by = site.data.locales.translated_by[page.lang] %}
2+
{% assign locales = site.data.locales[page.lang].feed %}
3+
{% if site.data.locales[page.lang].translated_by %}
4+
{% assign translated_by = site.data.locales[page.lang].translated_by %}
55
{% else %}
6-
{% assign translated_by = site.data.locales.translated_by['en'] %}
6+
{% assign translated_by = site.data.locales['en'].translated_by %}
77
{% endif %}
88
<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
99
<channel>

‎_layouts/news_post.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
layout: default
33
---
44

5-
{% if site.data.locales.translated_by[page.lang] %}
6-
{% assign translated_by = site.data.locales.translated_by[page.lang] %}
5+
{% if site.data.locales[page.lang].translated_by %}
6+
{% assign translated_by = site.data.locales[page.lang].translated_by %}
77
{% else %}
8-
{% assign translated_by = site.data.locales.translated_by['en'] %}
8+
{% assign translated_by = site.data.locales['en'].translated_by %}
99
{% endif %}
1010

1111
<div id="content-wrapper">
@@ -23,10 +23,10 @@
2323
<div id="sidebar-wrapper">
2424
<div id="sidebar">
2525
<div class="navigation">
26-
{% if site.data.locales.news[page.lang] %}
27-
{% assign news = site.data.locales.news[page.lang] %}
26+
{% if site.data.locales[page.lang].news %}
27+
{% assign news = site.data.locales[page.lang].news %}
2828
{% else %}
29-
{% assign news = site.data.locales.news['en'] %}
29+
{% assign news = site.data.locales['en'].news %}
3030
{% endif %}
3131

3232
<h3><strong>{{ news.recent_news }}</strong></h3>
@@ -38,10 +38,10 @@ <h3><strong>{{ news.recent_news }}</strong></h3>
3838
</ul>
3939
</div>
4040

41-
{% if site.data.locales.sidebar[page.lang] %}
42-
{% assign sidebar = site.data.locales.sidebar[page.lang] %}
41+
{% if site.data.locales[page.lang].sidebar %}
42+
{% assign sidebar = site.data.locales[page.lang].sidebar %}
4343
{% else %}
44-
{% assign sidebar = site.data.locales.sidebar['en'] %}
44+
{% assign sidebar = site.data.locales['en'].sidebar %}
4545
{% endif %}
4646

4747
<h3>{{ sidebar.syndicate.text }}</h3>

‎_plugins/news.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ def initialize(site,base,layout,lang,posts)
1212
@dir = File.join(@lang,news_dir)
1313
@name = 'index.html'
1414

15-
@locales = @site.data['locales']['news'][@lang] ||
16-
@site.data['locales']['news']['en']
15+
@locales = @site.data['locales'][@lang]['news'] ||
16+
@site.data['locales']['en']['news']
1717

18-
@month_names = @site.data['locales']['month_names'][@lang] ||
19-
@site.data['locales']['month_names']['en']
18+
@month_names = @site.data['locales'][@lang]['month_names'] ||
19+
@site.data['locales']['en']['month_names']
2020
@month_names = ['None'] + @month_names
2121

2222
process(@name)

‎_plugins/posted_by.rb

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module Jekyll
22

33
# Generates a localized "Posted by ... on ..." text from a date,
44
# using the page +lang+ variable and a +strftime+ format string
5-
# read from the site data (+locales+: +posted_by+: +lang+).
5+
# read from the site data (+locales+: +lang+: +posted_by+).
66
# Example format string: <tt>"Posted by AUTHOR on %-d %b %Y"</tt>
77
# (literal +AUTHOR+ is replaced by the specified author).
88
#
@@ -17,9 +17,8 @@ def posted_by(date, author = nil)
1717
date = date.is_a?(String) ? Time.parse(date) : date
1818

1919
lang = @context.environments.first['page']['lang'] || 'en'
20-
21-
locales = @context.registers[:site].data['locales']['posted_by']
22-
posted_by = locales[lang] || locales['en']
20+
posted_by = @context.registers[:site].data['locales'][lang]['posted_by'] ||
21+
@context.registers[:site].data['locales']['en']['posted_by']
2322

2423
if author.nil? || author.empty? || author == 'Unknown Author'
2524
posted_by = "%Y-%m-%d"

0 commit comments

Comments
 (0)