From 550d672e1e860b432f266856e68847cf23fd1040 Mon Sep 17 00:00:00 2001 From: Alex Ottr Date: Sun, 7 Apr 2024 18:34:22 +0200 Subject: [PATCH 1/5] add translation keys --- core/forms.py | 12 +++--- paw/locale/de/LC_MESSAGES/django.mo | Bin 4189 -> 4174 bytes paw/locale/de/LC_MESSAGES/django.po | 60 ++++++++++++++++++++-------- paw/locale/en/LC_MESSAGES/django.po | 49 ++++++++++++++++------- paw/locale/fr/LC_MESSAGES/django.mo | Bin 1653 -> 1910 bytes paw/locale/fr/LC_MESSAGES/django.po | 49 ++++++++++++++++------- 6 files changed, 120 insertions(+), 50 deletions(-) diff --git a/core/forms.py b/core/forms.py index 54724a2..d489d1f 100644 --- a/core/forms.py +++ b/core/forms.py @@ -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={ @@ -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 @@ -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 diff --git a/paw/locale/de/LC_MESSAGES/django.mo b/paw/locale/de/LC_MESSAGES/django.mo index 084f6f15db424844cc56b8da0ae84c72cfdd4110..357b68667dc243e7d561b6a57f516e6cc598e3b5 100644 GIT binary patch delta 1782 zcmYk+TSyd99LMpqW$UhPt7%r+ZL~5iQ%k$4W!c4~3lSC6Ls!RIT6bZ0(TZSuup0zL zLxd4Mlm%izVE7ag`5IBZ1VurJJ=sIlLq<{G-#A5w`Ojz0&dfRg^FO2Stru4MLte&p zLu(;s5v>!9IgAf7IMJ&8#sqLFW@8;r!p*4Xw_z9~$YD-$3SkQ2ENLL9=z_|=)ns54^eyg7M0i+)ZUMwO8wh2i;fa2Kn+}i8h0^j<<;2aGo}{Z z3Q*1he(%br{+jqEKa^oFD#O>Pfre2pjG{_9hT8iOKguFxOjCv`eGTfpIwUu<0aeNE z$gAccszN7F3pyL3{+jS2KWL@h*np3a!+hqX7k_wtKeKA0d@RNy+=30L_s`*UyoE~O zF{%=SsKka)3x4k1f0yP$1CF3F8bxLJ4fR5hr}dTRq57q$=c-T%uEcq`5jD?oW+-<63;;mT#gntqDp%Rl~4jT;c3)X zbs=joH*h)LL;d-^Lp}c;No2hK+5$f(4KN)wa4~9yHK+vFp-S0;d`qU5*hFZ%^mS`8 zm3}_)w=suVL@Xe9&29XDb6XAPHJV@LP}4sJi>M@231zL7s4XUz5#{R8D2|(C6Y2|B zTS4esQL7-95UQN2Rzg$}>j-VH{{B_nGX4FlEX~9mLVw3;HGa|_tEock36*da zp^BPw+u@$FmaT~}j0QRwwIVx4zA7gy_g3$c>epw55I{ov@g5K9U7Veh`*`88>c zbKc(_YKtV=t(}LH$(8F%F(8qEjn2rW8V0f#o<4>rmG>;3wFDl{kug%mupn zIF5Dr9WKKAsCk}XnK5}Y&7hnUzXe~sK`r_jElhvaJZqn_|^ zaGb`u9OqEioxtTd8hn3E=ULxOFwnwxa3S7DCGbcW;Lpg%{7R=p|G=gAH-@p6I;zBL zunK!n*L{Y|@Ca(&Q>b~r4!%E+c};wUK@=xY6HTEKdWG8Sx2V$ogG#7`1Kk%!O}HHO zq${yE#CD*rOHsC3JdR3e3?n#>d+~<~>aWZyxmpu8qHc`Psg&)gz1|ae2$|a?P$eHi z-FF8&0YIj7^wTbVC#BIEGqaD>h*d?!h=}g72{& zAEFk1j;h2LKzmKhkM|XQ=OA;9~p>wO%zZ$`Z^sGf+vpP!so~#UrRvokyi7Y{typc}xw4olT7nRtjNX7Eza|XOK|7m(_NwiR6J^gIs zQnQ-aL}=2F2>!1MZ9VZ0$h^n-bSV!oOMEj}VwaWS-p=#_TRuKA`s;Od~h0#pc5{%2WeixyVY$o&)sp+NL zQ5enaTQD>m7;Gi9cWS*vM`1*%19zderYAU_Mcdd+^bxIu-Y1_L~;Q-UIhRx|aX| diff --git a/paw/locale/de/LC_MESSAGES/django.po b/paw/locale/de/LC_MESSAGES/django.po index 7f6e7ec..2a0d5b3 100644 --- a/paw/locale/de/LC_MESSAGES/django.po +++ b/paw/locale/de/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-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 \n" "Language-Team: LANGUAGE \n" @@ -18,19 +18,47 @@ 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" +#, fuzzy +#| msgid "Please enter your name" +msgid "Please enter a username" msgstr "Gib bitte deinen Namen an" #: core/forms.py:32 +#, fuzzy +#| msgid "" +#| "Alphanumeric characters and underscores and dashes only (a-z, 0-9, _, -, " +#| "@)" 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" @@ -73,7 +101,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" @@ -86,7 +114,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" @@ -98,17 +126,17 @@ msgstr "Passwort zurücksetzen" msgid "Log in with Google" msgstr "Mit Google anmelden" -#: paw/templates/core/register.html:26 +#: paw/templates/core/register.html:30 #, fuzzy #| msgid "Mail Address" 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 +#: paw/templates/core/register.html:47 #, fuzzy #| msgid "Register Account" msgid "Register" @@ -166,15 +194,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" diff --git a/paw/locale/en/LC_MESSAGES/django.po b/paw/locale/en/LC_MESSAGES/django.po index b633ef0..1fde894 100644 --- a/paw/locale/en/LC_MESSAGES/django.po +++ b/paw/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-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 \n" "Language-Team: LANGUAGE \n" @@ -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 @@ -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 "" @@ -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 "" @@ -98,15 +119,15 @@ 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 "" @@ -164,15 +185,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 "" diff --git a/paw/locale/fr/LC_MESSAGES/django.mo b/paw/locale/fr/LC_MESSAGES/django.mo index 63bf54a7933b24f44dc40083a62052808d7bd0fa..dfa4aff4e979b7949beb0a7b093231660173e878 100644 GIT binary patch delta 813 zcmYk(J7^R^7{KwlM|_?a@ev{x(D>3wRK(VI3__;vzP2x!k{t(%5~JJZm_Gk8lDvQ5t)TZG4Ay>Z=oEWv*Iy ziMI|>0#l--z#WvpRg}c*<^EHY#$K2A-{W4^pHSZLYq|derLmtV@!NO|Yb++IuV$G@ zp%5kT0v^H3$f4R?|*0IStOi!9{InZar^MSq*=rGXpt&PpvtLkupn=b8TI{tq9VUZ`@ zBr~}!$mXo>+hSl{uA|iD)+Jsq6;{VYMB|#HXX7emH>2l1;eHlqlejGT|7@Okn`b&L f#*yVJF7!>4oz^=WqbquwZ>g)rz$aey)55F2+W3oh delta 571 zcmYk(ze~eF7{>88X^d54lxn5^$R=o~g5V%@5ggo{I#gGe3Ti1-(7{aNR+Q4w(M1P` zfP)TQo%{ntTwMe~u%q~W21Jy2kvoXBH z2(K`YHyC1uU>A#f8j9xxOtfStCL!RfeO!~3NE{O1(i_6N!-8yYdC@1 z7~`H>KSpir6jkROXRw1qc#YcFEvn8v<}5XPWU$U@`=|tuXcaD@5|&T}SKRsS*=K#9*djW4K#PgLLlwXu*z#U;)%DsGim z39Cq`)lgTmgFM#Yr4u(%w>n4He^j#@`FStt7X3<5xBtH>#j?7;?`4ZY=0{uYqgJD3 J&BJ!fegT)BFKz$; diff --git a/paw/locale/fr/LC_MESSAGES/django.po b/paw/locale/fr/LC_MESSAGES/django.po index 31064fe..a07a274 100644 --- a/paw/locale/fr/LC_MESSAGES/django.po +++ b/paw/locale/fr/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-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 \n" "Language-Team: LANGUAGE \n" @@ -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 "Les noms d’utilisateurs ne peuvent contenir que des caractères alphanumériques, ainsi que des tirets ou des tirets du bas. (a-z, 0-9, -, _, @)" + +#: core/forms.py:58 +msgid "Password and Confirm Password do not match." 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: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 @@ -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 "Enregistrer" @@ -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 "" @@ -98,17 +119,17 @@ msgstr "" msgid "Log in with Google" msgstr "" -#: paw/templates/core/register.html:26 +#: paw/templates/core/register.html:30 #, fuzzy #| msgid "Mail Address" msgid "Email Address" msgstr "Adresse e-mail" -#: 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 "" @@ -164,15 +185,15 @@ msgstr "Se déconnecter" msgid "Unassigned" msgstr "Non attribué" -#: 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 "" From f1f791c1fceaf4387963258506bca923b7a6cebf Mon Sep 17 00:00:00 2001 From: Alex Ottr Date: Sun, 7 Apr 2024 18:46:24 +0200 Subject: [PATCH 2/5] update i18n keys to exclude fuzzy keys --- paw/locale/de/LC_MESSAGES/django.po | 14 +------------- paw/locale/en/LC_MESSAGES/django.po | 2 -- paw/locale/fr/LC_MESSAGES/django.po | 24 ++++++------------------ 3 files changed, 7 insertions(+), 33 deletions(-) diff --git a/paw/locale/de/LC_MESSAGES/django.po b/paw/locale/de/LC_MESSAGES/django.po index 2a0d5b3..38f2a83 100644 --- a/paw/locale/de/LC_MESSAGES/django.po +++ b/paw/locale/de/LC_MESSAGES/django.po @@ -24,16 +24,10 @@ msgid "Username" msgstr "Benutzername" #: core/forms.py:31 -#, fuzzy -#| msgid "Please enter your name" msgid "Please enter a username" msgstr "Gib bitte deinen Namen an" #: core/forms.py:32 -#, fuzzy -#| msgid "" -#| "Alphanumeric characters and underscores and dashes only (a-z, 0-9, _, -, " -#| "@)" msgid "" "Username can only have alphanumeric characters and underscores and dashes (a-" "z, 0-9, _, -, @)" @@ -127,8 +121,6 @@ msgid "Log in with Google" msgstr "Mit Google anmelden" #: paw/templates/core/register.html:30 -#, fuzzy -#| msgid "Mail Address" msgid "Email Address" msgstr "Mail Adresse" @@ -137,8 +129,6 @@ msgid "Confirm Password" msgstr "Passwort bestätigen" #: paw/templates/core/register.html:47 -#, fuzzy -#| msgid "Register Account" msgid "Register" msgstr "Account erstellen" @@ -357,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" diff --git a/paw/locale/en/LC_MESSAGES/django.po b/paw/locale/en/LC_MESSAGES/django.po index 1fde894..72348dd 100644 --- a/paw/locale/en/LC_MESSAGES/django.po +++ b/paw/locale/en/LC_MESSAGES/django.po @@ -132,8 +132,6 @@ msgid "Register" msgstr "" #: paw/templates/core/settings.html:7 paw/templates/dashboard_base.html:85 -#, fuzzy -#| msgid "SettingsHeading" msgid "Settings" msgstr "Settings" diff --git a/paw/locale/fr/LC_MESSAGES/django.po b/paw/locale/fr/LC_MESSAGES/django.po index a07a274..bf6c62c 100644 --- a/paw/locale/fr/LC_MESSAGES/django.po +++ b/paw/locale/fr/LC_MESSAGES/django.po @@ -305,39 +305,29 @@ msgid "General" msgstr "" #: paw/templates/ticketing/ticket_detail.html:177 -#, fuzzy -#| msgid "Assign to me" msgid "Assign to new category" -msgstr "Me l'attribuer" +msgstr "" #: paw/templates/ticketing/ticket_detail.html:180 #: paw/templates/ticketing/ticket_detail.html:210 -#, fuzzy -#| msgid "Assign to me" msgid "Assign" -msgstr "Me l'attribuer" +msgstr "" #: paw/templates/ticketing/ticket_detail.html:185 -#, fuzzy -#| msgid "Assign to me" msgid "Assignees" -msgstr "Me l'attribuer" +msgstr "" #: paw/templates/ticketing/ticket_detail.html:192 msgid "Assign to me" msgstr "Me l'attribuer" #: paw/templates/ticketing/ticket_detail.html:207 -#, fuzzy -#| msgid "Assign to me" msgid "Assign to new team" -msgstr "Me l'attribuer" +msgstr "" #: paw/templates/ticketing/tickets.html:5 -#, fuzzy -#| msgid "Re-Open Ticket" msgid "Open Tickets" -msgstr "Réouverture du ticket" +msgstr "" #: paw/templates/ticketing/tickets.html:7 #: paw/templates/ticketing/tickets_history.html:7 @@ -362,10 +352,8 @@ msgid "View" msgstr "Ouvrir" #: paw/templates/ticketing/tickets_history.html:20 -#, fuzzy -#| msgid "Closed" msgid "Closed on" -msgstr "Fermé" +msgstr "" #: status/templates/status/incident_list.html:11 msgid "Some services might not be fully operational" From a2dedb1c4c51a8021cebc703c4f86da0bbd26c2c Mon Sep 17 00:00:00 2001 From: Mister Fawx <150787691+MrFawx@users.noreply.github.com> Date: Sun, 7 Apr 2024 18:53:30 +0200 Subject: [PATCH 3/5] Translate missing keys for french i18n --- paw/locale/fr/LC_MESSAGES/django.po | 132 +++++++++++++++------------- 1 file changed, 72 insertions(+), 60 deletions(-) diff --git a/paw/locale/fr/LC_MESSAGES/django.po b/paw/locale/fr/LC_MESSAGES/django.po index bf6c62c..0b927b9 100644 --- a/paw/locale/fr/LC_MESSAGES/django.po +++ b/paw/locale/fr/LC_MESSAGES/django.po @@ -21,11 +21,11 @@ msgstr "" #: 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 "" +msgstr "Nom d'utilisateur" #: core/forms.py:31 msgid "Please enter a username" -msgstr "" +msgstr "Veuillez entrer un nom d'utilisateur" #: core/forms.py:32 msgid "" @@ -35,43 +35,43 @@ msgstr "Les noms d’utilisateurs ne peuvent contenir que des caractères alphan #: core/forms.py:58 msgid "Password and Confirm Password do not match." -msgstr "" +msgstr "Le mot de passe et la confirmation ne correspondent pas." #: core/forms.py:62 msgid "Password must be at least 10 characters long." -msgstr "" +msgstr "Le mot de passe doit être long d'au moins 10 carractères." #: core/forms.py:67 msgid "An account with this username already exists." -msgstr "" +msgstr "Un compte utilisant ce nom d'utilisateur existe déjà." #: core/forms.py:71 msgid "An account with this email already exists." -msgstr "" +msgstr "Un compte utilisant cet e-mail existe déjà." #: core/forms.py:88 msgid "An account with this username already exists" -msgstr "" +msgstr "Un compte utilisant ce nom d'utilisateur existe déjà" #: core/models.py:30 msgid "Google SSO User" -msgstr "" +msgstr "Utilisateur Google SSO" #: paw/settings.py:133 msgid "English" -msgstr "" +msgstr "Anglais" #: paw/settings.py:134 msgid "French" -msgstr "" +msgstr "Français" #: paw/settings.py:135 msgid "German" -msgstr "" +msgstr "Allemand" #: paw/templates/base.html:20 paw/templates/dashboard_base.html:40 msgid "Tickets" -msgstr "" +msgstr "Tickets" #: paw/templates/base.html:21 paw/templates/dashboard_base.html:53 #: paw/templates/ticketing/tickets.html:20 @@ -80,19 +80,19 @@ msgstr "Statut" #: paw/templates/core/account_finish.html:10 paw/templates/core/register.html:6 msgid "Register a new account" -msgstr "" +msgstr "Créer un nouveau compte" #: paw/templates/core/account_finish.html:13 msgid "Authenticate" -msgstr "" +msgstr "Se connecter" #: paw/templates/core/account_finish.html:14 msgid "Set up account" -msgstr "" +msgstr "Configurer le compte" #: paw/templates/core/account_finish.html:15 msgid "Done" -msgstr "" +msgstr "Terminer" #: paw/templates/core/account_finish.html:38 #: paw/templates/core/settings.html:55 @@ -101,23 +101,23 @@ msgstr "Enregistrer" #: paw/templates/core/login.html:7 paw/templates/core/login.html:39 msgid "Log In" -msgstr "" +msgstr "Connexion" #: paw/templates/core/login.html:9 msgid "Register Account" -msgstr "" +msgstr "Inscription" #: paw/templates/core/login.html:30 paw/templates/core/register.html:36 msgid "Password" -msgstr "" +msgstr "Mot de passe" #: paw/templates/core/login.html:35 msgid "Password Reset" -msgstr "" +msgstr "Redéfinir le mot de passe" #: paw/templates/core/login.html:46 msgid "Log in with Google" -msgstr "" +msgstr "Se connecter avec Google" #: paw/templates/core/register.html:30 #, fuzzy @@ -127,11 +127,11 @@ msgstr "Adresse e-mail" #: paw/templates/core/register.html:42 msgid "Confirm Password" -msgstr "" +msgstr "Confirmer le mot de passe" #: paw/templates/core/register.html:47 msgid "Register" -msgstr "" +msgstr "S'enregistrer" #: paw/templates/core/settings.html:7 paw/templates/dashboard_base.html:85 msgid "Settings" @@ -147,11 +147,11 @@ msgstr "Langue" #: paw/templates/core/settings.html:30 msgid "Use Darkmode" -msgstr "" +msgstr "Utiliser le mode sombre" #: paw/templates/core/settings.html:37 msgid "Receive Email Notifications" -msgstr "" +msgstr "Me notifier par e-mail" #: paw/templates/core/settings.html:44 msgid "Profile Picture" @@ -160,7 +160,7 @@ msgstr "Image du profil" #: paw/templates/core/settings.html:49 #: paw/templates/ticketing/ticket_detail.html:152 msgid "Contact" -msgstr "" +msgstr "Contact" #: paw/templates/dashboard_base.html:34 #: paw/templates/ticketing/create_ticket.html:50 @@ -174,7 +174,7 @@ msgstr "Historique" #: paw/templates/dashboard_base.html:79 msgid "Admin" -msgstr "" +msgstr "Admin" #: paw/templates/dashboard_base.html:89 msgid "Logout" @@ -187,15 +187,15 @@ msgstr "Non attribué" #: paw/templates/partials/ticket_priority_badge.html:4 ticketing/models.py:45 msgid "Low" -msgstr "" +msgstr "Bas" #: paw/templates/partials/ticket_priority_badge.html:6 ticketing/models.py:46 msgid "Medium" -msgstr "" +msgstr "Moyen" #: paw/templates/partials/ticket_priority_badge.html:8 ticketing/models.py:47 msgid "High" -msgstr "" +msgstr "Élevé" #: paw/templates/partials/ticket_status_badge.html:4 ticketing/models.py:40 msgid "Open" @@ -233,35 +233,35 @@ msgstr "Description" #: paw/templates/ticketing/create_ticket.html:34 #: paw/templates/ticketing/ticket_detail.html:9 msgid "Attachments" -msgstr "" +msgstr "Pièces jointes" #: paw/templates/ticketing/create_ticket.html:43 msgid "Create as follow-up to a closed ticket" -msgstr "" +msgstr "Créer comme le suivi d'un ticket fermé" #: paw/templates/ticketing/ticket_detail.html:14 msgid "Attachment" -msgstr "" +msgstr "Pièce jointe" #: paw/templates/ticketing/ticket_detail.html:21 msgid "Follow-Up Ticket to" -msgstr "" +msgstr "Suivi du ticket" #: paw/templates/ticketing/ticket_detail.html:28 msgid "Followed-Up by" -msgstr "" +msgstr "Suivi par le ticket" #: paw/templates/ticketing/ticket_detail.html:36 msgid "Activity" -msgstr "" +msgstr "Activité" #: paw/templates/ticketing/ticket_detail.html:61 msgid "Internal" -msgstr "" +msgstr "Interne" #: paw/templates/ticketing/ticket_detail.html:78 msgid "Apply Template" -msgstr "" +msgstr "Appliquer le modèle" #: paw/templates/ticketing/ticket_detail.html:96 msgid "Add Comment" @@ -275,7 +275,7 @@ msgstr "Nouveau ticket" #: paw/templates/ticketing/ticket_detail.html:107 msgid "Make this an internal comment" -msgstr "" +msgstr "Rendre le commentaire interne" #: paw/templates/ticketing/ticket_detail.html:116 msgid "Ticket has been closed" @@ -302,32 +302,42 @@ msgstr "Dernière mise à jour le" #: paw/templates/ticketing/tickets_history.html:42 ticketing/forms.py:81 #: ticketing/forms.py:104 ticketing/models.py:167 ticketing/models.py:180 msgid "General" -msgstr "" +msgstr "Général" #: paw/templates/ticketing/ticket_detail.html:177 +#, fuzzy +#| msgid "Assign to me" msgid "Assign to new category" -msgstr "" +msgstr "Attribuer à une nouvelle catégorie" #: paw/templates/ticketing/ticket_detail.html:180 #: paw/templates/ticketing/ticket_detail.html:210 +#, fuzzy +#| msgid "Assign to me" msgid "Assign" -msgstr "" +msgstr "Attribuer" #: paw/templates/ticketing/ticket_detail.html:185 +#, fuzzy +#| msgid "Assign to me" msgid "Assignees" -msgstr "" +msgstr "Attribué à" #: paw/templates/ticketing/ticket_detail.html:192 msgid "Assign to me" msgstr "Me l'attribuer" #: paw/templates/ticketing/ticket_detail.html:207 +#, fuzzy +#| msgid "Assign to me" msgid "Assign to new team" -msgstr "" +msgstr "Attribuer à une nouvelle équipe" #: paw/templates/ticketing/tickets.html:5 +#, fuzzy +#| msgid "Re-Open Ticket" msgid "Open Tickets" -msgstr "" +msgstr "Réouverture du ticket" #: paw/templates/ticketing/tickets.html:7 #: paw/templates/ticketing/tickets_history.html:7 @@ -352,64 +362,66 @@ msgid "View" msgstr "Ouvrir" #: paw/templates/ticketing/tickets_history.html:20 +#, fuzzy +#| msgid "Closed" msgid "Closed on" -msgstr "" +msgstr "Fermé" #: status/templates/status/incident_list.html:11 msgid "Some services might not be fully operational" -msgstr "" +msgstr "Certains services peuvent ne pas être opérationnels" #: status/templates/status/incident_list.html:16 msgid "All services are operational" -msgstr "" +msgstr "Tous les services sont opérationnels" #: status/templates/status/incident_list.html:21 msgid "Incidents" -msgstr "" +msgstr "Incidents" #: status/templates/status/incident_list.html:29 msgid "Resolved" -msgstr "" +msgstr "Résolu" #: status/templates/status/incident_list.html:31 msgid "Unresolved" -msgstr "" +msgstr "Non-résolu" #: status/templates/status/incident_list.html:37 msgid "No incidents yet." -msgstr "" +msgstr "Encore aucun incident." #: ticketing/forms.py:39 msgid "File size must be under 5MB." -msgstr "" +msgstr "La taille du fichier ne doit pas excéder 5Mo." #: ticketing/forms.py:52 msgid "File type not supported. Supported types are: .jpg, .png, .pdf" -msgstr "" +msgstr "Format du fichier non supporté. Les formats supportés sont: .jpg, .png. .pdf" #: ticketing/forms.py:73 msgid "Please enter a title" -msgstr "" +msgstr "Veuillez entrer un titre" #: ticketing/forms.py:74 msgid "Please describe your issue" -msgstr "" +msgstr "Veuillez décrire votre problème" #: ticketing/forms.py:82 msgid "No Follow-up" -msgstr "" +msgstr "Aucun suivi" #: ticketing/forms.py:99 msgid "No Team" -msgstr "Aucune Team" +msgstr "Aucune équipe" #: ticketing/models.py:31 msgid "" "If a team is selected, new tickets will automatically assigned to this team." -msgstr "" +msgstr "Si une équipe est sélectionnée, les nouveaux tickets lui seront automatiquement attribués." #~ msgid "Comment and close" -#~ msgstr "Commentaire et fermer" +#~ msgstr "Commenter et fermer" #~ msgid "No Category" #~ msgstr "Aucune catégorie" From 41dc8a654028713ead2f909992bbdd8c7b605133 Mon Sep 17 00:00:00 2001 From: Alex Ottr Date: Sun, 7 Apr 2024 19:45:17 +0200 Subject: [PATCH 4/5] remove fuzzy keys and fix Open Tickets key --- paw/locale/fr/LC_MESSAGES/django.po | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/paw/locale/fr/LC_MESSAGES/django.po b/paw/locale/fr/LC_MESSAGES/django.po index 0b927b9..b87fe9d 100644 --- a/paw/locale/fr/LC_MESSAGES/django.po +++ b/paw/locale/fr/LC_MESSAGES/django.po @@ -120,8 +120,6 @@ msgid "Log in with Google" msgstr "Se connecter avec Google" #: paw/templates/core/register.html:30 -#, fuzzy -#| msgid "Mail Address" msgid "Email Address" msgstr "Adresse e-mail" @@ -268,8 +266,6 @@ msgid "Add Comment" msgstr "Ajouter un commentaire" #: paw/templates/ticketing/ticket_detail.html:98 -#, fuzzy -#| msgid "Create Ticket" msgid "Close Ticket" msgstr "Nouveau ticket" @@ -305,21 +301,15 @@ msgid "General" msgstr "Général" #: paw/templates/ticketing/ticket_detail.html:177 -#, fuzzy -#| msgid "Assign to me" msgid "Assign to new category" msgstr "Attribuer à une nouvelle catégorie" #: paw/templates/ticketing/ticket_detail.html:180 #: paw/templates/ticketing/ticket_detail.html:210 -#, fuzzy -#| msgid "Assign to me" msgid "Assign" msgstr "Attribuer" #: paw/templates/ticketing/ticket_detail.html:185 -#, fuzzy -#| msgid "Assign to me" msgid "Assignees" msgstr "Attribué à" @@ -328,16 +318,12 @@ msgid "Assign to me" msgstr "Me l'attribuer" #: paw/templates/ticketing/ticket_detail.html:207 -#, fuzzy -#| msgid "Assign to me" msgid "Assign to new team" msgstr "Attribuer à une nouvelle équipe" #: paw/templates/ticketing/tickets.html:5 -#, fuzzy -#| msgid "Re-Open Ticket" msgid "Open Tickets" -msgstr "Réouverture du ticket" +msgstr "Tickets ouverts" #: paw/templates/ticketing/tickets.html:7 #: paw/templates/ticketing/tickets_history.html:7 @@ -346,8 +332,6 @@ msgstr "pour" #: paw/templates/ticketing/tickets.html:18 #: paw/templates/ticketing/tickets_history.html:18 -#, fuzzy -#| msgid "Assign to me" msgid "Assigned to" msgstr "Me l'attribuer" @@ -362,8 +346,6 @@ msgid "View" msgstr "Ouvrir" #: paw/templates/ticketing/tickets_history.html:20 -#, fuzzy -#| msgid "Closed" msgid "Closed on" msgstr "Fermé" From 643673ab387a3a7d9d844bc46acaff4076fd563b Mon Sep 17 00:00:00 2001 From: Alex Ottr Date: Sun, 7 Apr 2024 19:46:51 +0200 Subject: [PATCH 5/5] compile french i18n --- paw/locale/fr/LC_MESSAGES/django.mo | Bin 1910 -> 5843 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/paw/locale/fr/LC_MESSAGES/django.mo b/paw/locale/fr/LC_MESSAGES/django.mo index dfa4aff4e979b7949beb0a7b093231660173e878..e8bd5ec29841315ea111f0f26df79151e0e79b11 100644 GIT binary patch literal 5843 zcmbW3ZH!!18OINbf{TEFii$6Xg0!VOLkkqkmX=QUrCr!JcXkT}6z|TQoxSbMz0>=$ zWouMILXFWcnjkR|Li`{dqF?-^iJIViP!ggEVxk{F#g_!4MvM>>6XWlHUuLHTKIqMy z`Q3Bwd3~P$bIy73^79`tJol15O#0{BjQIk5_8t83{Okf_E`-m(i{NumpI(Hj|3`Q| zJdaAFa1>VHQFsabB77(OI(#>L489*e1uutBL-qSSd>8y39D%PC<*z}tJCBdNnoFSa zS3>oBE#zl*@b@0L8!{y`1uuqk@CtYzybgAu`hT?Gx1h%VE<7Lp0IJ=Oq563iYMsx+ z{qR+&{&v!d);9q)k2+NSdy4!Dyp+5T)$c~}{qt~!{As9he+lW*{1$3`FBkj=)H?qS z)>5mc1^8%5Q;hhufj*Rp3Y9Sn>VtqWpfSd9~qXFoCkuX{dQU3f2CbP~-QY*7ZHO z13nGq&%eSC!K{T+sw#>^Ew3Ta}RP~)C}pMs}gHV%}%UVydpjQKs3-LGNt z>c0Zj?*#lfyaQHX7v2INho6AIf?EH@EK2RSK+S&?UJLiatKnyg@`s@2^;O7_=5a_D z<~v3C524oa3{*eQL#_J{1z&+5B>yVZ`Y*zXs&@sX$ZUbz;7w5d+y^zU7Q|)d1e85K z2i5L0R6mcvDtrvi!Dpf7brm9$zIQy1ra|e-vsy--hzbkD$hR z4ywQ3K-vFgDE+<;_rS}jycga9<*(CF^Eddr8tr`P|Hlv?0A( zlKini8h+|z6hGrd;hpeM@jeXXZ>CAwQ*c%GC{AuI-i2MHsUp8vP_dTMJY215S2l`1n;Lh*#f`}C%5!ES44j$F{Dj9N z7sqBYXtn)#%}n`iXJh}Avz;_f?25B#&~%aAJ$ta4e@r&I&IVy(j5=Om4uxTh zY1QlVb{WZ-!+vXxzc`T-r&qCnd}k3~?Aorultzc_79&nn?4?QALAedDja;xkD#`qu z%T_&9&2(TFqOg^jWIAa0P23w(nn+ay|WGd63iRX6LFy6_U)b~3}Rowl*& zMQGSXv2BMzi`x3+Y%>!bBH9Sk2>-;XD?edaWQFJar2U4%a$_(!V^xY=@Eb`QIkV_0 zT3#7li>~4Pb!T%e&xMJG`>lMW;=mG8?!2X60boiYrUum>pS|uPnNCUu`NAM9G*vI$2w+%+6OPYWDE_ z*zELo9EKb(z`>C1-Uqyj1 zW@l=1hn6*y+h%4CwEb!rwKnT8gW2iX$<1l+s_q=oPK)d+OYBi&Y#9$EH*jS5!QRYP z1jN4OrK!rE&3c;Fs*5U0FF$Mp*N%~enszxP z(!^)C_NdZ8rmm80<=Ih7%=LT6`cG8fqBdIX*yh%vgTxV*XSMr3o8_mleMBnyF=1T=SU-hHi#_qDkZSM!%OI?IA}yVrEAlt{VpB5#R4s z?F{NvYeEfi*33V-0stAZK zZd}81vuxE3Tig)%K)`NF@u0`G@@$VTx_|;1ZfN5uZViM$xWRE>OB+ZiQ&axVJc=06 z=0$Tat5Mz^h}SHiyTT?Bvd66Rh(AiogUKouBJMx4TmuGDUvx}()ern4(uY3HDDpS+ zmc6OX?KHnwc=Cr7$aGL_H{@Q4t&w8YoZB!HY5%E2%jP~ofDn=$B00`(8(yT_hD=V| zBQBN9Pi1zD*i-F#sD|ArTxs{uaQh$BV7#adN8aA-!yC3oGu`3Br@){??jmNf-^=a7 zeMH5Dn%UsEEph)~0O`C4$NE;sVXm79Bcq|sOZevAP)JkmWpmd69R4ZF+iZxER{a(u zW=1b6E^z7U^v}?9Y{qdEN7>K`(sg(b17mT8dv48hPL%9^!u_<2N$z9)9(!TA3oT_A zm+Xdux#sZSAT*S#urp;-&7(D+oNg*?3!Rm$#W{x!L&Z9RV%vP_!EX$mLX5DE{M7t9AQ>x(O0sj|$VQWs$>AD+q1)y2D+E8xPkVM2~Dt Im!LKO1@{C1Q~&?~ delta 1028 zcmYk)KWGzC90%}U+xRE7O`4>QS{r#Sl@cT_E)If(TB%@auyK-tXYv}Z=I-p>JE1P! z1Q8rON++e_pjDhi2XznvijF$yAdceTB7!aj{eG`E__%kU_uk!mzu$XzA1l8zt6%e} zH9rJr+Ei& z!%q;GEa6yrlFM+FpLrCO0l7F|;AH*}_;hjRJRR<6ZtQUpmK*SIo_(RmYVh)N4rLd;W?{ zcf3HiqFTBf-ARuXX6?Xm__V9)zSs735JW%wM=yAxk(y<96jtP*%z3JzEr%Mrd0Cr4 zEqbBblCxK|E10`zceJY8O%wWB&glxrRU>{?=B=w*=Cv`l+YX}f!SRggXgTj%af-V2 zbY<{yPjn<(R5h(SQu!%Z#g$vM@ASjZ@Z2R~&3Xs$ny9b)0_ms!)o)4NnzkTwk}bcOOCOmTx)ThiFHyM<#O+ OyL45O1!5j8Zu|pK;;1M9