From cde6755aff07f6f17cffbf8ff3df3f258630a323 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 9 Aug 2022 14:57:48 +0530 Subject: [PATCH] feat: Multilanguage sites: language selector only will show "enabled" languages and language default always will be System default (#17745) (#17766) * feat: Select only enabled languages for "language selector", and use System Settings lang as default one [skip ci] (cherry picked from commit e5b8a47835d22b7834865324d30d796bb3031dd5) Co-authored-by: Development for People <47140294+developmentforpeople@users.noreply.github.com> --- frappe/translate.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/translate.py b/frappe/translate.py index 884ec127d2..06176e28ba 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -99,8 +99,8 @@ def get_language(lang_list: list = None) -> str: if parent_language in lang_set: return parent_language - # fallback to language set in User or System Settings - return frappe.local.lang + # fallback to language set in System Settings or "en" + return frappe.db.get_default("lang") or "en" @functools.lru_cache @@ -1270,13 +1270,13 @@ def get_translator_url(): @frappe.whitelist(allow_guest=True) def get_all_languages(with_language_name=False): - """Returns all language codes ar, ch etc""" + """Returns all enabled language codes ar, ch etc""" def get_language_codes(): - return frappe.get_all("Language", pluck="name") + return frappe.get_all("Language", filters={"enabled": 1}, pluck="name") def get_all_language_with_name(): - return frappe.db.get_all("Language", ["language_code", "language_name"]) + return frappe.get_all("Language", ["language_code", "language_name"], {"enabled": 1}) if not frappe.db: frappe.connect()