From b41c5b59d329adf84f734d3a25b869efebdf9660 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 8 Apr 2021 12:39:23 +0530 Subject: [PATCH] feat: Use navigator.language for initial guess --- frappe/templates/base.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/templates/base.html b/frappe/templates/base.html index d653006dcc..a00592f743 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -116,8 +116,11 @@ frappe.call("frappe.translate.get_all_languages", { with_language_name: true }).then(res => { - let languages = res.message; - languages.forEach(language_doc => { + let language_list = res.message; + let language = frappe.get_cookie('preferred_language'); + let language_codes = []; + language_list.forEach(language_doc => { + language_codes.push(language_doc.language_code) $("#language-switcher") .append( $("") @@ -126,7 +129,7 @@ ); }); $("#language-switcher").removeClass('hide'); - const language = frappe.get_cookie('preferred_language') || 'en'; + language = language || language_codes.includes(navigator.language) ? navigator.language : 'en'; $("#language-switcher").val(language); document.documentElement.lang = language; $("#language-switcher").change((e) => {