From 857cdd5aeac4004a269e4d82256a5eca2f799baa Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 17:41:11 +0000 Subject: [PATCH 1/6] Enlsigh is the base - always translated! Fixes #2257 --- InvenTree/templates/InvenTree/settings/user.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index d1baf1ba6e..867c8ef733 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -224,7 +224,7 @@ {% if lang_translated %} {% blocktrans %}{{ lang_translated }}% translated{% endblocktrans %} {% else %} - {% trans 'No translations available' %} + {% if lang_code == 'en' %}-{% else %}{% trans 'No translations available' %}{% endif %} {% endif %} {% endfor %} From cea466973a4886721a790610a2d4d88929f0675b Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 19:55:02 +0000 Subject: [PATCH 2/6] Check if language has enough translations Fixes #2257 --- InvenTree/templates/InvenTree/settings/user.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index 867c8ef733..2692d11c02 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -216,9 +216,12 @@ {% get_current_language as LANGUAGE_CODE %} {% get_available_languages as LANGUAGES %} {% get_language_info_list for LANGUAGES as languages %} + {% define 'alllang' in request.GET as ALL_LANG %} {% for language in languages %} {% define language.code as lang_code %} {% define locale_stats|keyvalue:lang_code as lang_translated %} + {% define lang_translated > 10 or lang_code == 'en' as use_lang %} + {% if ALL_LANG or use_lang %} + {% endif %} {% endfor %}
+

{% trans "Some languages are have a low translation percentage." %} + {% if ALL_LANG %} + {% trans "Show only sufficent" %} + {% else %} + {% trans "Show them too" %} + {% endif %} +

From dccc832779e9741f711880c945fbdfb30c2c5a15 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 20:41:29 +0000 Subject: [PATCH 3/6] fix logic --- InvenTree/templates/InvenTree/settings/user.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index 2692d11c02..81c9af885e 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -216,7 +216,7 @@ {% get_current_language as LANGUAGE_CODE %} {% get_available_languages as LANGUAGES %} {% get_language_info_list for LANGUAGES as languages %} - {% define 'alllang' in request.GET as ALL_LANG %} + {% if 'alllang' in request.GET %}{% define True as ALL_LANG %}{% endif %} {% for language in languages %} {% define language.code as lang_code %} {% define locale_stats|keyvalue:lang_code as lang_translated %} From 45b7bc0c5128a2dee7a5e8476ce8e1b261909983 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 20:41:52 +0000 Subject: [PATCH 4/6] always show the current language --- InvenTree/templates/InvenTree/settings/user.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index 81c9af885e..4e882b5e19 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -220,7 +220,7 @@ {% for language in languages %} {% define language.code as lang_code %} {% define locale_stats|keyvalue:lang_code as lang_translated %} - {% define lang_translated > 10 or lang_code == 'en' as use_lang %} + {% if lang_translated > 10 or lang_code == 'en' or lang_code == LANGUAGE_CODE %}{% define True as use_lang %}{% else %}{% define False as use_lang %}{% endif %} {% if ALL_LANG or use_lang %}