From b7b466256a421ac9cf7b2d30d8f208fd3931a397 Mon Sep 17 00:00:00 2001 From: Jaroslav Beran Date: Wed, 9 Oct 2024 22:28:45 +0200 Subject: [PATCH 1/2] Faults - localization fix --- svjis/articles/forms.py | 2 + .../articles/locale/cs/LC_MESSAGES/django.po | 37 +++++++++++-------- .../articles/locale/en/LC_MESSAGES/django.po | 34 +++++++++-------- 3 files changed, 42 insertions(+), 31 deletions(-) diff --git a/svjis/articles/forms.py b/svjis/articles/forms.py index d44d5ca..efe3ed9 100644 --- a/svjis/articles/forms.py +++ b/svjis/articles/forms.py @@ -321,6 +321,7 @@ class FaultReportForm(forms.ModelForm): queryset=models.BuildingEntrance.objects.all().order_by('description'), required=False, help_text=_(SELECT_ENTRANCE_TEXT), + label=_("Entrance"), ) assigned_to_user = AssignedUserChoiceField( queryset=User.objects.filter(groups__permissions__codename='svjis_fault_resolver') @@ -328,6 +329,7 @@ class FaultReportForm(forms.ModelForm): .distinct() .order_by('last_name'), required=False, + label=_("Assign"), ) class Meta: diff --git a/svjis/articles/locale/cs/LC_MESSAGES/django.po b/svjis/articles/locale/cs/LC_MESSAGES/django.po index 807b17e..456b0ae 100644 --- a/svjis/articles/locale/cs/LC_MESSAGES/django.po +++ b/svjis/articles/locale/cs/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-07-25 10:45+0200\n" +"POT-Creation-Date: 2024-10-09 22:23+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,6 +19,18 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n " "<= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n" +#: articles/forms.py:324 articles/models.py:332 articles/models.py:360 +#: articles/templates/admin_building_unit.html:37 +#: articles/templates/admin_building_unit.html:62 +#: articles/templates/admin_entrance_edit.html:13 +#: articles/templates/fault.html:46 articles/templates/faults_list.html:20 +msgid "Entrance" +msgstr "Vchod" + +#: articles/forms.py:332 +msgid "Assign" +msgstr "Přiřadit" + #: articles/models.py:14 articles/models.py:130 articles/models.py:440 #: articles/templates/redaction_useful_link.html:13 msgid "Header" @@ -211,14 +223,6 @@ msgstr "Budova" msgid "Type" msgstr "Typ" -#: articles/models.py:332 articles/models.py:360 -#: articles/templates/admin_building_unit.html:37 -#: articles/templates/admin_building_unit.html:62 -#: articles/templates/admin_entrance_edit.html:13 -#: articles/templates/fault.html:46 articles/templates/faults_list.html:20 -msgid "Entrance" -msgstr "Vchod" - #: articles/models.py:334 articles/templates/admin_building_unit.html:63 #: articles/templates/admin_user_ownes_edit.html:13 #: articles/templates/personal_my_units.html:13 @@ -313,7 +317,7 @@ msgstr "Smazat" #: articles/templates/admin_preferences_edit.html:27 #: articles/templates/admin_user_edit.html:94 #: articles/templates/advert_edit.html:41 -#: articles/templates/faults_create.html:26 +#: articles/templates/faults_create.html:31 #: articles/templates/faults_edit.html:34 #: articles/templates/personal_settings_edit.html:58 #: articles/templates/personal_settings_password.html:26 @@ -480,8 +484,8 @@ msgid "Member of" msgstr "Je členem" #: articles/templates/advert_edit.html:7 articles/templates/adverts_list.html:8 -#: articles/utils.py:80 articles/views_adverts.py:63 -#: articles/views_adverts.py:85 +#: articles/utils.py:80 articles/views_adverts.py:71 +#: articles/views_adverts.py:93 msgid "Adverts" msgstr "Inzeráty" @@ -530,7 +534,7 @@ msgstr "Přestat sledovat diskuzi" msgid "Start watching discussion" msgstr "Začít sledovat diskuzi" -#: articles/templates/article.html:66 articles/templates/fault.html:134 +#: articles/templates/article.html:67 articles/templates/fault.html:135 msgid "Insert comment" msgstr "Vložit komentář" @@ -899,7 +903,8 @@ msgstr "Nesprávné uživatelské jméno nebo heslo." #: articles/views.py:264 msgid "In case you lost your password use Lost Password link" msgstr "" -"V případě, že jste zapomněli Vaše přihlašovací údaje, použijte volbu 'Zapomenuté heslo'." +"V případě, že jste zapomněli Vaše přihlašovací údaje, použijte volbu " +"'Zapomenuté heslo'." #: articles/views_admin.py:60 msgid "Users" @@ -914,11 +919,11 @@ msgstr "Skupiny" msgid "Saved" msgstr "Uloženo" -#: articles/views_adverts.py:15 articles/views_adverts.py:49 +#: articles/views_adverts.py:17 articles/views_adverts.py:57 msgid "All" msgstr "Vše" -#: articles/views_adverts.py:34 articles/views_adverts.py:53 +#: articles/views_adverts.py:41 articles/views_adverts.py:61 #: articles/views_faults.py:28 msgid "Mine" msgstr "Moje" diff --git a/svjis/articles/locale/en/LC_MESSAGES/django.po b/svjis/articles/locale/en/LC_MESSAGES/django.po index 98b87f5..614dd45 100644 --- a/svjis/articles/locale/en/LC_MESSAGES/django.po +++ b/svjis/articles/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-07-25 10:45+0200\n" +"POT-Creation-Date: 2024-10-09 22:23+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,18 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: articles/forms.py:324 articles/models.py:332 articles/models.py:360 +#: articles/templates/admin_building_unit.html:37 +#: articles/templates/admin_building_unit.html:62 +#: articles/templates/admin_entrance_edit.html:13 +#: articles/templates/fault.html:46 articles/templates/faults_list.html:20 +msgid "Entrance" +msgstr "Entrance" + +#: articles/forms.py:332 +msgid "Assign" +msgstr "Assign" + #: articles/models.py:14 articles/models.py:130 articles/models.py:440 #: articles/templates/redaction_useful_link.html:13 msgid "Header" @@ -210,14 +222,6 @@ msgstr "Building" msgid "Type" msgstr "Type" -#: articles/models.py:332 articles/models.py:360 -#: articles/templates/admin_building_unit.html:37 -#: articles/templates/admin_building_unit.html:62 -#: articles/templates/admin_entrance_edit.html:13 -#: articles/templates/fault.html:46 articles/templates/faults_list.html:20 -msgid "Entrance" -msgstr "Entrance" - #: articles/models.py:334 articles/templates/admin_building_unit.html:63 #: articles/templates/admin_user_ownes_edit.html:13 #: articles/templates/personal_my_units.html:13 @@ -312,7 +316,7 @@ msgstr "Delete" #: articles/templates/admin_preferences_edit.html:27 #: articles/templates/admin_user_edit.html:94 #: articles/templates/advert_edit.html:41 -#: articles/templates/faults_create.html:26 +#: articles/templates/faults_create.html:31 #: articles/templates/faults_edit.html:34 #: articles/templates/personal_settings_edit.html:58 #: articles/templates/personal_settings_password.html:26 @@ -479,8 +483,8 @@ msgid "Member of" msgstr "Member of" #: articles/templates/advert_edit.html:7 articles/templates/adverts_list.html:8 -#: articles/utils.py:80 articles/views_adverts.py:63 -#: articles/views_adverts.py:85 +#: articles/utils.py:80 articles/views_adverts.py:71 +#: articles/views_adverts.py:93 msgid "Adverts" msgstr "Adverts" @@ -529,7 +533,7 @@ msgstr "Stop watching discussion" msgid "Start watching discussion" msgstr "Start watching discussion" -#: articles/templates/article.html:66 articles/templates/fault.html:134 +#: articles/templates/article.html:67 articles/templates/fault.html:135 msgid "Insert comment" msgstr "Insert comment" @@ -909,11 +913,11 @@ msgstr "Groups" msgid "Saved" msgstr "Saved" -#: articles/views_adverts.py:15 articles/views_adverts.py:49 +#: articles/views_adverts.py:17 articles/views_adverts.py:57 msgid "All" msgstr "All" -#: articles/views_adverts.py:34 articles/views_adverts.py:53 +#: articles/views_adverts.py:41 articles/views_adverts.py:61 #: articles/views_faults.py:28 msgid "Mine" msgstr "Mine" From e3d0f60aea46dc36215e346ccb8ad9b25b87f509 Mon Sep 17 00:00:00 2001 From: Jaroslav Beran Date: Thu, 10 Oct 2024 10:21:06 +0200 Subject: [PATCH 2/2] Faults - localization fix --- svjis/articles/forms.py | 2 +- svjis/articles/locale/cs/LC_MESSAGES/django.po | 13 +++++-------- svjis/articles/locale/en/LC_MESSAGES/django.po | 13 +++++-------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/svjis/articles/forms.py b/svjis/articles/forms.py index efe3ed9..0555cc8 100644 --- a/svjis/articles/forms.py +++ b/svjis/articles/forms.py @@ -329,7 +329,7 @@ class FaultReportForm(forms.ModelForm): .distinct() .order_by('last_name'), required=False, - label=_("Assign"), + label=_("Resolver"), ) class Meta: diff --git a/svjis/articles/locale/cs/LC_MESSAGES/django.po b/svjis/articles/locale/cs/LC_MESSAGES/django.po index 456b0ae..9b25000 100644 --- a/svjis/articles/locale/cs/LC_MESSAGES/django.po +++ b/svjis/articles/locale/cs/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-09 22:23+0200\n" +"POT-Creation-Date: 2024-10-10 10:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,9 +27,10 @@ msgstr "" msgid "Entrance" msgstr "Vchod" -#: articles/forms.py:332 -msgid "Assign" -msgstr "Přiřadit" +#: articles/forms.py:332 articles/templates/fault.html:38 +#: articles/templates/faults_list.html:22 +msgid "Resolver" +msgstr "Řešitel" #: articles/models.py:14 articles/models.py:130 articles/models.py:440 #: articles/templates/redaction_useful_link.html:13 @@ -618,10 +619,6 @@ msgstr "Datum" msgid "Creator" msgstr "Zadavatel" -#: articles/templates/fault.html:38 articles/templates/faults_list.html:22 -msgid "Resolver" -msgstr "Řešitel" - #: articles/templates/fault.html:72 #: articles/templates/redaction_survey_results.html:39 msgid "Time" diff --git a/svjis/articles/locale/en/LC_MESSAGES/django.po b/svjis/articles/locale/en/LC_MESSAGES/django.po index 614dd45..be61439 100644 --- a/svjis/articles/locale/en/LC_MESSAGES/django.po +++ b/svjis/articles/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-09 22:23+0200\n" +"POT-Creation-Date: 2024-10-10 10:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,9 +26,10 @@ msgstr "" msgid "Entrance" msgstr "Entrance" -#: articles/forms.py:332 -msgid "Assign" -msgstr "Assign" +#: articles/forms.py:332 articles/templates/fault.html:38 +#: articles/templates/faults_list.html:22 +msgid "Resolver" +msgstr "Resolver" #: articles/models.py:14 articles/models.py:130 articles/models.py:440 #: articles/templates/redaction_useful_link.html:13 @@ -615,10 +616,6 @@ msgstr "Date" msgid "Creator" msgstr "Creator" -#: articles/templates/fault.html:38 articles/templates/faults_list.html:22 -msgid "Resolver" -msgstr "Resolver" - #: articles/templates/fault.html:72 #: articles/templates/redaction_survey_results.html:39 msgid "Time"