Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Faults - localization fix #102

Merged
merged 2 commits into from
Oct 25, 2024
Merged

Faults - localization fix #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7b4662
Faults - localization fix
berk76 Oct 9, 2024
e3d0f60
Faults - localization fix
berk76 Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions svjis/articles/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,13 +321,15 @@ 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')
.exclude(is_active=False)
.distinct()
.order_by('last_name'),
required=False,
label=_("Resolver"),
)

class Meta:
Expand Down
42 changes: 22 additions & 20 deletions svjis/articles/locale/cs/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-10 10:18+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -19,6 +19,19 @@ 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 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
msgid "Header"
Expand Down Expand Up @@ -211,14 +224,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
Expand Down Expand Up @@ -313,7 +318,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
Expand Down Expand Up @@ -480,8 +485,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"

Expand Down Expand Up @@ -530,7 +535,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ář"

Expand Down Expand Up @@ -614,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"
Expand Down Expand Up @@ -899,7 +900,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"
Expand All @@ -914,11 +916,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"
Expand Down
39 changes: 20 additions & 19 deletions svjis/articles/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-10 10:18+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -18,6 +18,19 @@ 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 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
msgid "Header"
Expand Down Expand Up @@ -210,14 +223,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
Expand Down Expand Up @@ -312,7 +317,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
Expand Down Expand Up @@ -479,8 +484,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"

Expand Down Expand Up @@ -529,7 +534,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"

Expand Down Expand Up @@ -611,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"
Expand Down Expand Up @@ -909,11 +910,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"
Expand Down