Localize sidebar links on news and archive pages

stomar · stomar · commit f40c2646f1a9 · 2013-03-01T22:35:48.000+01:00
diff --git a/_layouts/news.html b/_layouts/news.html
@@ -40,7 +40,7 @@ <h3><strong>{{ locales.yearly_archives }}</strong></h3>
 
       <ul class="menu">
       {% for year in page.years %}
-      <li><a href="{{ year }}/">{{ year }}</a></li>
+      <li><a href="{{ year[0] }}/">{{ year[1] }}</a></li>
       {% endfor %}
       </ul>
     </div>
diff --git a/_layouts/news_archive_year.html b/_layouts/news_archive_year.html
@@ -40,7 +40,7 @@ <h3><strong>{{ locales.monthly_archives }}</strong></h3>
 
       <ul class="menu">
       {% for month in page.months %}
-      <li><a href="{{ month[0] }}/">{{ month[1] }} {{ page.year }}</a></li>
+      <li><a href="{{ month[0] }}/">{{ month[1] }}</a></li>
       {% endfor %}
       </ul>
     </div>
diff --git a/_plugins/news.rb b/_plugins/news.rb
@@ -76,15 +76,22 @@ def initialize(site,base,lang,year,posts)
         @dir  = File.join(@dir,@year.to_s)
 
         title = locales['yearly_archive_title']
+        month_link_text = locales['monthly_archive_link']
 
         data['title'] = title.gsub('%Y', @year.to_s)
+        data['year']   = @year
 
         months = posts.map { |post| post.date.month }.uniq
 
-        data['year']   = year
+        # hash with url => link_text (including year) elements
         data['months'] = Hash[
           months.map { |month| "%.2d" % month }.zip(
-            months.map { |month| month_names[month] }
+            months.map { |month| month_link_text.gsub(/%Y|%m|%B/, {
+                                   '%Y' => @year.to_s,
+                                   '%m' => "%.2d" % month,
+                                   '%B' => month_names[month]
+                                 })
+            }
           )
         ]
       end
@@ -101,10 +108,19 @@ def initialize(site,base,lang,posts)
         super(site,base,LAYOUT,lang,posts)
 
         title = locales['recent_news']
+        year_link_text = locales['yearly_archive_link']
 
         data['title'] = title
-        data['years'] = posts.map { |post| post.date.year }.uniq.reverse
         data['posts'] = posts.last(MAX_POSTS).reverse
+
+        years = posts.map { |post| post.date.year }.uniq.reverse
+
+        # hash with url => link_text elements
+        data['years'] = Hash[
+          years.map { |year| year.to_s }.zip(
+            years.map { |year| year_link_text.gsub(/%Y/, '%Y' => year.to_s) }
+          )
+        ]
       end
 
     end
