Merge tag 'upstream/6.3.0'

Upstream version 6.3.0

1 files changed, 11 insertions, 4 deletions

diff --git a/nikola/plugins/task/indexes.py b/nikola/plugins/task/indexes.py
index 0d20422..3f45161 100644
--- a/nikola/plugins/task/indexes.py
+++ b/nikola/plugins/task/indexes.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright © 2012-2013 Roberto Alsina and others.
+# Copyright © 2012-2014 Roberto Alsina and others.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -57,6 +57,7 @@ class Indexes(Task):
             "hide_untranslated_posts": self.site.config['HIDE_UNTRANSLATED_POSTS'],
             "indexes_title": self.site.config['INDEXES_TITLE'],
             "indexes_pages": self.site.config['INDEXES_PAGES'],
+            "indexes_pages_main": self.site.config['INDEXES_PAGES_MAIN'],
             "blog_title": self.site.config["BLOG_TITLE"],
         }
 
@@ -78,12 +79,18 @@ class Indexes(Task):
             for i, post_list in enumerate(lists):
                 context = {}
                 indexes_title = kw['indexes_title'] or kw['blog_title']
+                if kw["indexes_pages_main"]:
+                    ipages_i = i + 1
+                    ipages_msg = "page %d"
+                else:
+                    ipages_i = i
+                    ipages_msg = "old posts, page %d"
                 if kw["indexes_pages"]:
-                    indexes_pages = kw["indexes_pages"] % i
+                    indexes_pages = kw["indexes_pages"] % ipages_i
                 else:
                     indexes_pages = " (" + \
-                        kw["messages"][lang]["old posts page %d"] % i + ")"
-                if i > 0:
+                        kw["messages"][lang][ipages_msg] % ipages_i + ")"
+                if i > 0 or kw["indexes_pages_main"]:
                     context["title"] = indexes_title + indexes_pages
                 else:
                     context["title"] = indexes_title