From 15273eb536c0047d51529ebb62bf900cb37e6a27 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 23:08:47 +0000 Subject: [PATCH 1/2] Update dagger to v2.55 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 20a5cb8cfc..5ca84812c3 100644 --- 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 From f92ffbe0d37265051d02e3fa892da16a2c194107 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 10 Jan 2025 15:54:31 +0100 Subject: [PATCH 2/2] Fix import of en-US translations. --- tools/localazy/generateLocalazyConfig.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/localazy/generateLocalazyConfig.py b/tools/localazy/generateLocalazyConfig.py index 72769b67ed..bddaf6bc45 100755 --- 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)