vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Implement parent-child language precedence in get_all_translations

Browse source
This commit is contained in:
David (aider) 2024-09-21 01:34:35 +02:00 • committed by David
parent 9c902722fe
commit 8e80ae7980
No known key found for this signature in database
GPG key ID: AB15A6AF1101390D
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
frappe/translate.py
View file

@ -1,13 +1,12 @@
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# License: MIT. See LICENSE
"""
frappe.translate
~~~~~~~~~~~~~~~~
frappe.translate
~~~~~~~~~~~~~~~~
Translation tools for frappe
Translation tools for frappe
"""
import functools
import io
import itertools
@ -136,7 +135,7 @@ def get_messages_for_boot():
def get_all_translations(lang: str) -> dict[str, str]:
"""Load and return the entire translations dictionary for a language from apps + user translations.
:param lang: Language Code, e.g. `hi`
:param lang: Language Code, e.g. `hi` or `es-CO`
"""
if not lang:
return {}
@ -144,8 +143,18 @@ def get_all_translations(lang: str) -> dict[str, str]:
def _merge_translations():
from frappe.geo.country_info import get_translated_countries
all_translations = get_translations_from_apps(lang).copy()
parent_lang = get_parent_language(lang)
# Get translations for parent language
all_translations = get_translations_from_apps(parent_lang).copy() if parent_lang else {}
# Update with child language translations (overriding parent translations)
all_translations.update(get_translations_from_apps(lang))
with suppress(Exception):
# Get translations for parent language
all_translations.update(get_user_translations(parent_lang) if parent_lang else {})
# Update with child language translations (overriding parent translations)
all_translations.update(get_user_translations(lang))
all_translations.update(get_translated_countries())
@ -155,7 +164,7 @@ def get_all_translations(lang: str) -> dict[str, str]:
return frappe.cache.hget(MERGED_TRANSLATION_KEY, lang, generator=_merge_translations)
except Exception:
# People mistakenly call translation function on global variables
# where locals are not initalized, translations dont make much sense there
# where locals are not initialized, translations don't make much sense there
frappe.logger().error("Unable to load translations", exc_info=True)
return {}