Merge pull request #272 from getnikola/fix-hierarchical-pages

Fixes getnikola/nikola#2956 and getnikola/nikola#3073 for hierarchical pages
getnikola · May 4, 2018 · 3ea746a · 3ea746a
2 parents 3dcdeb7 + 6a59957
commit 3ea746a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/v7/hierarchical_pages/hierarchical_pages.py b/v7/hierarchical_pages/hierarchical_pages.py
@@ -104,11 +104,11 @@ def scan(self):
                              if not any([x.startswith('.')
                                          for x in p.split(os.sep)])]
 
-                for base_path in full_list:
+                for base_path in sorted(full_list):
                     if base_path in seen:
                         continue
-                    else:
-                        seen.add(base_path)
+                    for lang in self.site.config['TRANSLATIONS'].keys():
+                        seen.add(utils.get_translation_candidate(self.site.config, base_path, lang))
                     # Extract path
                     path = utils.os_path_split(os.path.relpath(base_path, dirname))
                     path[-1] = os.path.splitext(path[-1])[0]