Skip to content

Commit

Permalink
Merge pull request #3 from fblacklight-organization/main
Browse files Browse the repository at this point in the history
Update french translation
  • Loading branch information
aottr authored Apr 7, 2024
2 parents 798d844 + 2702184 commit 8a3ca15
Show file tree
Hide file tree
Showing 6 changed files with 170 additions and 132 deletions.
12 changes: 6 additions & 6 deletions core/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Meta:

USERNAME_REGEX_FIELD = forms.RegexField(
required=True,
label='Username',
label=_('Username'),
max_length=50,
regex=r'^[a-zA-Z0-9-_@]+$',
error_messages={
Expand Down Expand Up @@ -55,20 +55,20 @@ def clean(self):

if password != password_confirm:
raise forms.ValidationError(
"Password and Confirm Password do not match."
_("Password and Confirm Password do not match.")
)
if len(password) < 10:
raise forms.ValidationError(
"Password must be at least 10 characters long."
_("Password must be at least 10 characters long.")
)

if PawUser.objects.filter(username=cleaned_data.get("username")).exists():
raise forms.ValidationError(
"An account with this username already exists."
_("An account with this username already exists.")
)
if PawUser.objects.filter(email=cleaned_data.get("email")).exists():
raise forms.ValidationError(
"An account with this email already exists."
_("An account with this email already exists.")
)
return cleaned_data

Expand All @@ -85,7 +85,7 @@ def clean(self):

if PawUser.objects.filter(username=cleaned_data.get("username")).exists():
raise forms.ValidationError(
"An account with this username already exists"
_("An account with this username already exists")
)

return cleaned_data
Binary file modified paw/locale/de/LC_MESSAGES/django.mo
Binary file not shown.
62 changes: 39 additions & 23 deletions paw/locale/de/LC_MESSAGES/django.po
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-03-25 11:47+0000\n"
"POT-Creation-Date: 2024-04-07 16:31+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -18,19 +18,41 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: core/forms.py:27 core/forms.py:35 paw/templates/core/account_finish.html:33
#: paw/templates/core/login.html:24 paw/templates/core/register.html:24
msgid "Username"
msgstr "Benutzername"

#: core/forms.py:31
msgid "Please enter your name"
msgid "Please enter a username"
msgstr "Gib bitte deinen Namen an"

#: core/forms.py:32
msgid ""
"Alphanumeric characters and underscores and dashes only (a-z, 0-9, _, -, @)"
msgstr "Nur Alphanumerische Zeichen, Unterstriche und Striche (a-z, 0-9, _, -, @)"
"Username can only have alphanumeric characters and underscores and dashes (a-"
"z, 0-9, _, -, @)"
msgstr ""
"Nur Alphanumerische Zeichen, Unterstriche und Striche (a-z, 0-9, _, -, @)"

#: core/forms.py:35 paw/templates/core/account_finish.html:29
#: paw/templates/core/login.html:24 paw/templates/core/register.html:20
msgid "Username"
msgstr "Benutzername"
#: core/forms.py:58
msgid "Password and Confirm Password do not match."
msgstr ""

#: core/forms.py:62
msgid "Password must be at least 10 characters long."
msgstr ""

#: core/forms.py:67
msgid "An account with this username already exists."
msgstr ""

#: core/forms.py:71
msgid "An account with this email already exists."
msgstr ""

#: core/forms.py:88
msgid "An account with this username already exists"
msgstr ""

#: core/models.py:30
msgid "Google SSO User"
Expand Down Expand Up @@ -73,7 +95,7 @@ msgstr "Account einrichten"
msgid "Done"
msgstr "Fertig"

#: paw/templates/core/account_finish.html:34
#: paw/templates/core/account_finish.html:38
#: paw/templates/core/settings.html:55
msgid "Save"
msgstr "Speichern"
Expand All @@ -86,7 +108,7 @@ msgstr "Anmelden"
msgid "Register Account"
msgstr "Account erstellen"

#: paw/templates/core/login.html:30 paw/templates/core/register.html:32
#: paw/templates/core/login.html:30 paw/templates/core/register.html:36
msgid "Password"
msgstr "Passwort"

Expand All @@ -98,19 +120,15 @@ msgstr "Passwort zurücksetzen"
msgid "Log in with Google"
msgstr "Mit Google anmelden"

#: paw/templates/core/register.html:26
#, fuzzy
#| msgid "Mail Address"
#: paw/templates/core/register.html:30
msgid "Email Address"
msgstr "Mail Adresse"

#: paw/templates/core/register.html:38
#: paw/templates/core/register.html:42
msgid "Confirm Password"
msgstr "Passwort bestätigen"

#: paw/templates/core/register.html:43
#, fuzzy
#| msgid "Register Account"
#: paw/templates/core/register.html:47
msgid "Register"
msgstr "Account erstellen"

Expand Down Expand Up @@ -166,15 +184,15 @@ msgstr "Abmelden"
msgid "Unassigned"
msgstr "Nicht zugewiesen"

#: paw/templates/partials/ticket_priority_badge.html:3 ticketing/models.py:45
#: paw/templates/partials/ticket_priority_badge.html:4 ticketing/models.py:45
msgid "Low"
msgstr "Niedrig"

#: paw/templates/partials/ticket_priority_badge.html:5 ticketing/models.py:46
#: paw/templates/partials/ticket_priority_badge.html:6 ticketing/models.py:46
msgid "Medium"
msgstr "Mittel"

#: paw/templates/partials/ticket_priority_badge.html:7 ticketing/models.py:47
#: paw/templates/partials/ticket_priority_badge.html:8 ticketing/models.py:47
msgid "High"
msgstr "Hoch"

Expand Down Expand Up @@ -329,10 +347,8 @@ msgid "View"
msgstr "Anzeigen"

#: paw/templates/ticketing/tickets_history.html:20
#, fuzzy
#| msgid "Closed"
msgid "Closed on"
msgstr "Geschlossen"
msgstr "Geschlossen am"

#: status/templates/status/incident_list.html:11
msgid "Some services might not be fully operational"
Expand Down
51 changes: 35 additions & 16 deletions paw/locale/en/LC_MESSAGES/django.po
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-03-25 11:47+0000\n"
"POT-Creation-Date: 2024-04-07 16:31+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -18,18 +18,39 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: core/forms.py:27 core/forms.py:35 paw/templates/core/account_finish.html:33
#: paw/templates/core/login.html:24 paw/templates/core/register.html:24
msgid "Username"
msgstr ""

#: core/forms.py:31
msgid "Please enter your name"
msgid "Please enter a username"
msgstr ""

#: core/forms.py:32
msgid ""
"Alphanumeric characters and underscores and dashes only (a-z, 0-9, _, -, @)"
"Username can only have alphanumeric characters and underscores and dashes (a-"
"z, 0-9, _, -, @)"
msgstr ""

#: core/forms.py:35 paw/templates/core/account_finish.html:29
#: paw/templates/core/login.html:24 paw/templates/core/register.html:20
msgid "Username"
#: core/forms.py:58
msgid "Password and Confirm Password do not match."
msgstr ""

#: core/forms.py:62
msgid "Password must be at least 10 characters long."
msgstr ""

#: core/forms.py:67
msgid "An account with this username already exists."
msgstr ""

#: core/forms.py:71
msgid "An account with this email already exists."
msgstr ""

#: core/forms.py:88
msgid "An account with this username already exists"
msgstr ""

#: core/models.py:30
Expand Down Expand Up @@ -73,7 +94,7 @@ msgstr ""
msgid "Done"
msgstr ""

#: paw/templates/core/account_finish.html:34
#: paw/templates/core/account_finish.html:38
#: paw/templates/core/settings.html:55
msgid "Save"
msgstr ""
Expand All @@ -86,7 +107,7 @@ msgstr ""
msgid "Register Account"
msgstr ""

#: paw/templates/core/login.html:30 paw/templates/core/register.html:32
#: paw/templates/core/login.html:30 paw/templates/core/register.html:36
msgid "Password"
msgstr ""

Expand All @@ -98,21 +119,19 @@ msgstr ""
msgid "Log in with Google"
msgstr ""

#: paw/templates/core/register.html:26
#: paw/templates/core/register.html:30
msgid "Email Address"
msgstr ""

#: paw/templates/core/register.html:38
#: paw/templates/core/register.html:42
msgid "Confirm Password"
msgstr ""

#: paw/templates/core/register.html:43
#: paw/templates/core/register.html:47
msgid "Register"
msgstr ""

#: paw/templates/core/settings.html:7 paw/templates/dashboard_base.html:85
#, fuzzy
#| msgid "SettingsHeading"
msgid "Settings"
msgstr "Settings"

Expand Down Expand Up @@ -164,15 +183,15 @@ msgstr ""
msgid "Unassigned"
msgstr ""

#: paw/templates/partials/ticket_priority_badge.html:3 ticketing/models.py:45
#: paw/templates/partials/ticket_priority_badge.html:4 ticketing/models.py:45
msgid "Low"
msgstr ""

#: paw/templates/partials/ticket_priority_badge.html:5 ticketing/models.py:46
#: paw/templates/partials/ticket_priority_badge.html:6 ticketing/models.py:46
msgid "Medium"
msgstr ""

#: paw/templates/partials/ticket_priority_badge.html:7 ticketing/models.py:47
#: paw/templates/partials/ticket_priority_badge.html:8 ticketing/models.py:47
msgid "High"
msgstr ""

Expand Down
Binary file modified paw/locale/fr/LC_MESSAGES/django.mo
Binary file not shown.
Loading

0 comments on commit 8a3ca15

Please sign in to comment.