Merge pull request #2601 from getnikola/archive-improvements

Kwpolska · web-flow · commit 6076df5e9171 · 2016-12-25T19:35:32.000+02:00
Improving friendly archive names.
diff --git a/nikola/data/themes/base/messages/messages_en.py b/nikola/data/themes/base/messages/messages_en.py
@@ -41,4 +41,6 @@
     "Write your post here.": "Write your post here.",
     "old posts, page %d": "old posts, page %d",
     "page %d": "page %d",
+    "{month} {day}, {year}": "{month} {day}, {year}",
+    "{month} {year}": "{month} {year}",
 }
diff --git a/nikola/plugins/task/archive.py b/nikola/plugins/task/archive.py
@@ -97,10 +97,20 @@ def get_classification_friendly_name(self, classification, lang, only_last_compo
         elif len(classification) == 1:
             return classification[0]
         elif len(classification) == 2:
-            return nikola.utils.LocaleBorg().get_month_name(int(classification[1]), lang)
+            month = nikola.utils.LocaleBorg().get_month_name(int(classification[1]), lang)
+            if only_last_component:
+                return month
+            else:
+                year = classification[0]
+                return self.site.MESSAGES[lang]['{month} {year}'].format(year=year, month=month)
         else:
-            # Fallback
-            return '/'.join(classification)
+            day = int(classification[2])
+            if only_last_component:
+                return str(day)
+            else:
+                year = classification[0]
+                month = nikola.utils.LocaleBorg().get_month_name(int(classification[1]), lang)
+                return self.site.MESSAGES[lang]['{month} {day}, {year}'].format(year=year, month=month, day=day)
 
     def get_path(self, classification, lang, dest_type='page'):
         """A path handler for the given classification."""
diff --git a/translations/nikola.messages/en.po b/translations/nikola.messages/en.po
@@ -146,3 +146,11 @@ msgstr "Posts by %s"
 
 msgid "Toggle navigation"
 msgstr "Toggle navigation"
+
+#. Used to format months per year
+msgid "{month} {year}"
+msgstr "{month} {year}"
+
+#. Used to format a date
+msgid "{month} {day}, {year}"
+msgstr "{month} {day}, {year}"

Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,6 @@`
`41`	`41`	`"Write your post here.": "Write your post here.",`
`42`	`42`	`"old posts, page %d": "old posts, page %d",`
`43`	`43`	`"page %d": "page %d",`
	`44`	`+ "{month} {day}, {year}": "{month} {day}, {year}",`
	`45`	`+ "{month} {year}": "{month} {year}",`
`44`	`46`	`}`