Merge tag 'upstream/6.3.0'

Upstream version 6.3.0

2 files changed, 16 insertions, 2 deletions

diff --git a/tests/data/translated_titles/conf.py b/tests/data/translated_titles/conf.py
index b445ba9..edfce3e 100644
--- a/tests/data/translated_titles/conf.py
+++ b/tests/data/translated_titles/conf.py
@@ -47,9 +47,23 @@ DEFAULT_LANG = "en"
 TRANSLATIONS = {
     "en": "",
     # Example for another language:
-    "es": "./es",
+    "pl": "./pl",
 }
 
+# What will translated input files be named like?
+
+# If you have a page something.rst, then something.rst.pl will be considered
+# its Polish translation.
+#     (in the above example: path == "something", lang == "pl", ext == "rst")
+# this pattern is also used for metadata:
+#     something.meta -> something.meta.pl
+
+TRANSLATIONS_PATTERN = "{path}.{ext}.{lang}"
+
+# If you don't want your Polish files to be considered Perl code, use this:
+# TRANSLATIONS_PATTERN = "{path}.{lang}.{ext}"
+#     Note that this pattern will become the default in v7.0.0.
+
 # Links for the sidebar / navigation bar.
 # You should provide a key-value pair for each used language.
 SIDEBAR_LINKS = {
@@ -57,7 +71,7 @@ SIDEBAR_LINKS = {
         ('/archive.html', 'Archives'),
         ('/categories/index.html', 'Tags'),
     ),
-    "es": ()
+    "pl": ()
 }
 
 
diff --git a/tests/data/translated_titles/stories/1.txt.es b/tests/data/translated_titles/stories/1.txt.pl
index a888c1f..a888c1f 100644
--- a/tests/data/translated_titles/stories/1.txt.es
+++ b/tests/data/translated_titles/stories/1.txt.pl