Improve mozl10n code, update requirements (#45)

Author: flodolo

.github/requirements.txt

@@ -1,6 +1,6 @@
-compare-locales==9.0.*
-jsonschema==4.23.*
-lxml==5.3.*
-moz-l10n==0.6.0
-polib==1.2.0
-requests==2.32.3
+compare-locales~=9.0.0
+jsonschema~=4.23.0
+lxml~=5.3.0
+moz-l10n~=0.6.1
+polib~=1.2.0
+requests~=2.32.0

l10n/android_l10n.py

@@ -63,20 +63,23 @@ def extractStringsToml(self):
         if not locales:
             print("No locales defined in the project configuration.")
 
+        all_files = [
+            (ref_path, tgt_path)
+            for (ref_path, tgt_path), _ in project_config_paths.all().items()
+        ]
         for locale in locales:
             print(f"Extracting strings for locale: {locale}.")
-            file_list = [
-                (
-                    os.path.abspath(
-                        tgt_path.format(android_locale=get_android_locale(locale))
-                    ),
-                    os.path.abspath(ref_path.format(android_locale=None)),
+            locale_files = [
+                (os.path.abspath(ref_path), os.path.abspath(tgt_path))
+                for (ref_path, raw_tgt_path) in all_files
+                if os.path.exists(
+                    tgt_path := project_config_paths.format_target_path(
+                        raw_tgt_path, locale
+                    )
                 )
-                for (ref_path, tgt_path), locales in project_config_paths.all().items()
-                if locale in locales
             ]
 
-            for l10n_file, ref_file in file_list:
+            for ref_file, l10n_file in locale_files:
                 # Ignore missing files in locale
                 if not os.path.exists(l10n_file):
                     # print(f"Ignored missing file for {locale}: {l10n_file}")

l10n/exceptions/focus_android.json

@@ -1,10 +1,6 @@
 {
   "HTML": {
-    "locales": {
-      "it": [
-        "app/src/main/res/values/strings.xml:your_rights_content5"
-      ]
-    },
+    "locales": {},
     "strings": []
   },
   "ellipsis": {

l10n/fluent_l10n.py

@@ -119,18 +119,23 @@ def extractStringsToml(self):
 
         read_references = []
 
+        all_files = [
+            (ref_path, tgt_path)
+            for (ref_path, tgt_path), _ in project_config_paths.all().items()
+        ]
         for locale in locales:
             print(f"Extracting strings for locale: {locale}.")
-            file_list = [
-                (
-                    os.path.abspath(tgt_path.format(locale=locale)),
-                    os.path.abspath(ref_path.format(locale=None)),
+            locale_files = [
+                (os.path.abspath(ref_path), os.path.abspath(tgt_path))
+                for (ref_path, raw_tgt_path) in all_files
+                if os.path.exists(
+                    tgt_path := project_config_paths.format_target_path(
+                        raw_tgt_path, locale
+                    )
                 )
-                for (ref_path, tgt_path), locales in project_config_paths.all().items()
-                if locale in locales
             ]
 
-            for l10n_file, ref_file in file_list:
+            for ref_file, l10n_file in locale_files:
                 # Ignore missing files in locale
                 if not os.path.exists(l10n_file):
                     # print(f"Ignored missing file for {locale}: {l10n_file}")