Merge branch 'develop' into julioromano/poll_history_entry_point

This commit is contained in:
Benoit Marty
2023-12-14 17:34:49 +01:00
committed by GitHub
54 changed files with 220 additions and 153 deletions
+1
View File
@@ -117,6 +117,7 @@
"screen_room_notification_settings_.*",
"screen_notification_settings_edit_failed_updating_default_mode",
"screen_polls_history_title",
"screen_notification_settings_mentions_only_disclaimer",
"screen_start_chat_error_starting_chat"
]
},
+4 -4
View File
@@ -47,7 +47,7 @@ for entry in config["modules"]:
"includeKeys": list(map(lambda i: "REGEX:" + i, entry["includeRegex"])),
"excludeKeys": list(map(lambda i: "REGEX:" + i, excludeRegex)),
"conditions": [
"equals: ${languageCode}, en"
"equals: ${languageCode}, en | equals: ${file}, content.json"
]
}
# print(action)
@@ -59,7 +59,7 @@ for entry in config["modules"]:
"includeKeys": list(map(lambda i: "REGEX:" + i, entry["includeRegex"])),
"excludeKeys": list(map(lambda i: "REGEX:" + i, excludeRegex)),
"conditions": [
"!equals: ${languageCode}, en"
"!equals: ${languageCode}, en | equals: ${file}, content.json"
]
}
allActions.append(actionTranslation)
@@ -70,7 +70,7 @@ mainAction = baseAction | {
"output": "libraries/ui-strings/src/main/res/values/localazy.xml",
"excludeKeys": list(map(lambda i: "REGEX:" + i, allRegexToExcludeFromMainModule + regexToAlwaysExclude)),
"conditions": [
"equals: ${languageCode}, en"
"equals: ${languageCode}, en | equals: ${file}, content.json"
]
}
# print(mainAction)
@@ -82,7 +82,7 @@ if allFiles:
"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: ${languageCode}, en | equals: ${file}, content.json"
]
}
allActions.append(mainActionTranslation)