Merge remote-tracking branch 'upstream/develop' into develop

daedric7 · Jan 10, 2025 · f927a17 · f927a17
2 parents d78ee8f + bcec2ef
commit f927a17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -53,7 +53,7 @@ telephoto = "0.14.0"
 dependencyAnalysis = "2.6.1"
 
 # DI
-dagger = "2.54"
+dagger = "2.55"
 anvil = "0.4.0"
 
 # Auto service

diff --git a/tools/localazy/generateLocalazyConfig.py b/tools/localazy/generateLocalazyConfig.py
@@ -52,7 +52,7 @@ def convertModuleToPath(name):
         "includeKeys": list(map(lambda i: "REGEX:" + i, entry["includeRegex"])),
         "excludeKeys": list(map(lambda i: "REGEX:" + i, excludeRegex)),
         "conditions": [
-            "equals: ${languageCode}, en | equals: ${file}, content.json"
+            "equals: ${langAndroidResNoScript}, en | equals: ${file}, content.json"
         ]
     }
     # print(action)
@@ -64,7 +64,7 @@ def convertModuleToPath(name):
             "includeKeys": list(map(lambda i: "REGEX:" + i, entry["includeRegex"])),
             "excludeKeys": list(map(lambda i: "REGEX:" + i, excludeRegex)),
             "conditions": [
-                "!equals: ${languageCode}, en | equals: ${file}, content.json"
+                "!equals: ${langAndroidResNoScript}, en | equals: ${file}, content.json"
             ]
         }
         allActions.append(actionTranslation)
@@ -75,7 +75,7 @@ def convertModuleToPath(name):
     "output": "libraries/ui-strings/src/main/res/values/localazy.xml",
     "excludeKeys": list(map(lambda i: "REGEX:" + i, allRegexToExcludeFromMainModule + regexToAlwaysExclude)),
     "conditions": [
-        "equals: ${languageCode}, en | equals: ${file}, content.json"
+        "equals: ${langAndroidResNoScript}, en | equals: ${file}, content.json"
     ]
 }
 # print(mainAction)
@@ -87,7 +87,7 @@ def convertModuleToPath(name):
         "output": "libraries/ui-strings/src/main/res/values-${langAndroidResNoScript}/translations.xml",
         "excludeKeys": list(map(lambda i: "REGEX:" + i, allRegexToExcludeFromMainModule + regexToAlwaysExclude)),
         "conditions": [
-            "!equals: ${languageCode}, en | equals: ${file}, content.json"
+            "!equals: ${langAndroidResNoScript}, en | equals: ${file}, content.json"
         ]
     }
     allActions.append(mainActionTranslation)