From 52501b2b51cf378b2856accf5a3208bb4f98a162 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 29 Aug 2024 12:07:12 +1000 Subject: [PATCH] chore: fix generateLocales script for python < 3.11 --- tools/localization/generateLocales.py | 16 +++++++++++++--- .../generateLocalizedStringsAnalysis.py | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tools/localization/generateLocales.py b/tools/localization/generateLocales.py index 142b3e16b..00d10cee5 100755 --- a/tools/localization/generateLocales.py +++ b/tools/localization/generateLocales.py @@ -136,9 +136,19 @@ if problems: console.warn(message) if found_old_dynamic_variables: - console.warn( - f"Old dynamic variables were found in the locales. Please update the locales to use the new dynamic variables. {f"See above for details{' (before the problems table).'if args.print_problems else '.'}" if args.print_old_dynamic_variables else 'Run the script with --print-old-dynamic-variables to see the old dynamic variables.'}" - ) + warning_message = ( + "Old dynamic variables were found in the locales. Please update the locales to use the new dynamic variables. " +) + if args.print_old_dynamic_variables: + if args.print_problems: + warning_message += "See above for details (before the problems table)." + else: + warning_message += "See above for details." + else: + warning_message += "Run the script with --print-old-dynamic-variables to see the old dynamic variables." + console.warn(warning_message) + + console.debug("Locales generation complete") diff --git a/tools/localization/generateLocalizedStringsAnalysis.py b/tools/localization/generateLocalizedStringsAnalysis.py index 197f3b735..1804db5ee 100755 --- a/tools/localization/generateLocalizedStringsAnalysis.py +++ b/tools/localization/generateLocalizedStringsAnalysis.py @@ -111,7 +111,7 @@ console.info("Scanning for localized strings...") files_to_ignore = ["./ts/localization/locales.ts"] ignore_patterns = [re.compile(re.escape(pattern)) for pattern in files_to_ignore] -console.debug(f"Ignoring files: {", ".join(files_to_ignore)}") +console.debug(f"Ignoring files: {', '.join(files_to_ignore)}") def should_ignore_file(path):