fix(plugin): fix handling of files with dotted suffixes, thx to @gnaegi

closes issue #258
ultrabug · Sep 8, 2023 · 00df9ae · 00df9ae
1 parent 4d3d338
commit 00df9ae
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 1 deletion.
diff --git a/mkdocs_static_i18n/folder.py b/mkdocs_static_i18n/folder.py
@@ -33,17 +33,20 @@ def create_i18n_file(
 
     file_dest_path = Path(file.dest_path)
     file_locale = default_language
+    file_localization = None
 
     for language in all_languages:
         if is_relative_to(file.src_path, language):
             file_locale = language
+            file_localization = language
             break
         else:
             # maybe the language folder is present BUT not configured in the plugin.languages yet
             # so we use the locale regex to guess that it's a localization folder
             maybe_file_locale = PurePath(file.src_path).parts[0]
             if RE_LOCALE.match(maybe_file_locale):
                 file_locale = maybe_file_locale
+                file_localization = maybe_file_locale
                 break
 
     # README.html should be renamed to index.html
@@ -83,6 +86,7 @@ def create_i18n_file(
     file.alternates = {current_language: file}
     file.locale = file_locale
     file.locale_alternate_of = current_language
+    file.localization = file_localization
 
     log.debug(f"reconfigure {file} from locale {file_locale}")
 

diff --git a/mkdocs_static_i18n/reconfigure.py b/mkdocs_static_i18n/reconfigure.py
@@ -565,6 +565,7 @@ def reconfigure_files(
                             # files when multiple languages are configured
                             if (
                                 len(self.all_languages) > 1
+                                and i18n_file.localization is not None
                                 and i18n_dest_uris[i18n_file.dest_uri].locale == i18n_file.locale
                             ):
                                 raise Exception(

diff --git a/mkdocs_static_i18n/suffix.py b/mkdocs_static_i18n/suffix.py
@@ -33,6 +33,7 @@ def create_i18n_file(
 
     file_dest_path = Path(file.dest_path)
     file_locale = default_language
+    file_localization = None
     locale_site_dir = current_language if current_language != default_language else ""
 
     try:
@@ -47,12 +48,14 @@ def create_i18n_file(
             file_dest_path = Path(f"{file_dest_path_no_suffix}{file_dest_path.suffix}")
             # file name suffixed by locale, remove it
             file.name = Path(file.name).stem
+            # store file localization
+            file_localization = file_locale
         else:
             file_locale = default_language
     except IndexError:
         pass
 
-    if config.use_directory_urls:
+    if config.use_directory_urls and file_localization:
         if file_dest_path.parent != Path("."):
             parent_dest_path_no_suffix = file_dest_path.parent.with_suffix("")
             file_dest_path = parent_dest_path_no_suffix / file_dest_path.name
@@ -88,6 +91,7 @@ def create_i18n_file(
     file.alternates = {current_language: file}
     file.locale = file_locale
     file.locale_alternate_of = current_language
+    file.localization = file_localization
 
     log.debug(f"reconfigure {file} from locale {file_locale}")
 

diff --git a/tests/docs_folder_structure/en/topic2/release_notes_17.1.md b/tests/docs_folder_structure/en/topic2/release_notes_17.1.md
diff --git a/tests/docs_folder_structure/en/topic2/release_notes_17.2.md b/tests/docs_folder_structure/en/topic2/release_notes_17.2.md
diff --git a/tests/docs_folder_structure/fr/topic2/release_notes_17.1.md b/tests/docs_folder_structure/fr/topic2/release_notes_17.1.md
diff --git a/tests/docs_folder_structure/fr/topic2/release_notes_17.2.md b/tests/docs_folder_structure/fr/topic2/release_notes_17.2.md
diff --git a/tests/docs_suffix_structure/topic2/release_notes_17.1.md b/tests/docs_suffix_structure/topic2/release_notes_17.1.md
diff --git a/tests/docs_suffix_structure/topic2/release_notes_17.2.md b/tests/docs_suffix_structure/topic2/release_notes_17.2.md
diff --git a/tests/structures/control/en_fr/docs/fr/topic2/release_notes_17.1.md b/tests/structures/control/en_fr/docs/fr/topic2/release_notes_17.1.md
diff --git a/tests/structures/control/en_fr/docs/fr/topic2/release_notes_17.2.md b/tests/structures/control/en_fr/docs/fr/topic2/release_notes_17.2.md
diff --git a/tests/structures/control/en_fr/docs/topic2/release_notes_17.1.md b/tests/structures/control/en_fr/docs/topic2/release_notes_17.1.md
diff --git a/tests/structures/control/en_fr/docs/topic2/release_notes_17.2.md b/tests/structures/control/en_fr/docs/topic2/release_notes_17.2.md
diff --git a/tests/structures/control/en_only/docs/topic2/release_notes_17.1.md b/tests/structures/control/en_only/docs/topic2/release_notes_17.1.md
diff --git a/tests/structures/control/en_only/docs/topic2/release_notes_17.2.md b/tests/structures/control/en_only/docs/topic2/release_notes_17.2.md
diff --git a/tests/structures/control/fr_only/docs/topic2/release_notes_17.1.md b/tests/structures/control/fr_only/docs/topic2/release_notes_17.1.md
diff --git a/tests/structures/control/fr_only/docs/topic2/release_notes_17.2.md b/tests/structures/control/fr_only/docs/topic2/release_notes_17.2.md
diff --git a/tests/structures/control/fr_with_default/docs/topic2/release_notes_17.1.md b/tests/structures/control/fr_with_default/docs/topic2/release_notes_17.1.md
diff --git a/tests/structures/control/fr_with_default/docs/topic2/release_notes_17.2.md b/tests/structures/control/fr_with_default/docs/topic2/release_notes_17.2.md