From e06974ac0896bf48ce10969df3d7ed70f611fecb Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 23 Sep 2022 10:45:50 +0530 Subject: [PATCH 1/5] added translations --- l10n/ca.js | 10 ---------- l10n/ca.json | 8 -------- l10n/de.js | 18 +++++++++--------- l10n/de.json | 16 +++++++++------- l10n/en.js | 18 +++++++++--------- l10n/en.json | 8 ++++---- l10n/es.js | 10 ++++++++++ l10n/es.json | 10 ++++++++++ l10n/fr.js | 10 ++++++++++ l10n/fr.json | 10 ++++++++++ l10n/it.js | 10 ++++++++++ l10n/it.json | 10 ++++++++++ lib/Controller/EmailRecoveryController.php | 2 +- translationfiles/ca/email-recovery.po | 2 +- translationfiles/de/email-recovery.po | 2 +- translationfiles/templates/email-recovery.pot | 2 +- 16 files changed, 95 insertions(+), 51 deletions(-) delete mode 100644 l10n/ca.js delete mode 100644 l10n/ca.json create mode 100644 l10n/es.js create mode 100644 l10n/es.json create mode 100644 l10n/fr.js create mode 100644 l10n/fr.json create mode 100644 l10n/it.js create mode 100644 l10n/it.json diff --git a/l10n/ca.js b/l10n/ca.js deleted file mode 100644 index 74591fb..0000000 --- a/l10n/ca.js +++ /dev/null @@ -1,10 +0,0 @@ -OC.L10N.register( - "email-recovery", - { - "Email Recovery" : "Recuperació de correu electrònic", - "Email Recovery App" : "Aplicació de recuperació de correu electrònic", - "Recovery Email" : "Correu electrònic de recuperació", - "Recovery Email " : "Correu electrònic de recuperació ", - "Changes saved" : "S'han guardat els canvis" -}, -"nplurals=2; plural=n != 1;"); diff --git a/l10n/ca.json b/l10n/ca.json deleted file mode 100644 index 6a8a27e..0000000 --- a/l10n/ca.json +++ /dev/null @@ -1,8 +0,0 @@ -{ "translations": { - "Email Recovery" : "Recuperació de correu electrònic", - "Email Recovery App" : "Aplicació de recuperació de correu electrònic", - "Recovery Email" : "Correu electrònic de recuperació", - "Recovery Email " : "Correu electrònic de recuperació ", - "Changes saved" : "S'han guardat els canvis" -},"pluralForm" :"nplurals=2; plural=n != 1;" -} \ No newline at end of file diff --git a/l10n/de.js b/l10n/de.js index f1195cc..a7cfdd0 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -1,10 +1,10 @@ OC.L10N.register( - "email-recovery", - { - "Email Recovery" : "E-Mail-Wiederherstellung", - "Email Recovery App" : "E-Mail-Wiederherstellungsapp", - "Recovery Email" : "Wiederherstellungs-E-Mail", - "Recovery Email " : "Wiederherstellungs-E-Mail ", - "Changes saved" : "Änderungen gespeichert" -}, -"nplurals=2; plural=n != 1;"); + "email-recovery", + { + "Recovery Email": "Wiederherstellung E-Mail", + "Changes saved": "Gespeicherte Änderungen", + "Error! User email address cannot be saved as recovery email address!": "Fehler! Die Benutzer-E-Mail-Adresse kann nicht als Wiederherstellungs-E-Mail-Adresse gespeichert werden!", + "Change Recovery Email": "Wiederherstellungs-E-Mail ändern", + "Invalid Recovery Email!": "Ungültige Wiederherstellungs-E-Mail!" + }, + "nplurals=2; plural=(n != 1);"); diff --git a/l10n/de.json b/l10n/de.json index 867c7cb..f3feb38 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -1,8 +1,10 @@ -{ "translations": { - "Email Recovery" : "E-Mail-Wiederherstellung", - "Email Recovery App" : "E-Mail-Wiederherstellungsapp", - "Recovery Email" : "Wiederherstellungs-E-Mail", - "Recovery Email " : "Wiederherstellungs-E-Mail ", - "Changes saved" : "Änderungen gespeichert" -},"pluralForm" :"nplurals=2; plural=n != 1;" +{ + "translations": { + "Recovery Email": "Wiederherstellung E-Mail", + "Changes saved": "Gespeicherte Änderungen", + "Error! User email address cannot be saved as recovery email address!": "Fehler! Die Benutzer-E-Mail-Adresse kann nicht als Wiederherstellungs-E-Mail-Adresse gespeichert werden!", + "Change Recovery Email": "Wiederherstellungs-E-Mail ändern", + "Invalid Recovery Email!": "Ungültige Wiederherstellungs-E-Mail!" + }, + "pluralForm": "nplurals=2; plural=n != 1;" } \ No newline at end of file diff --git a/l10n/en.js b/l10n/en.js index 837fc25..221150a 100644 --- a/l10n/en.js +++ b/l10n/en.js @@ -1,10 +1,10 @@ OC.L10N.register( - "email-recovery", - { - "Recovery Email" : "Recovery Email", - "Changes saved": "Changes saved", - "ErrorRecoveryEmailSameAsUserEmail": "Error! User email address cannot be saved as recovery email address!", - "Change Recovery Email": "Change Recovery Email", - "Invalid Recovery Email!": "Invalid Recovery Email!" -}, -"nplurals=2; plural=(n != 1);"); + "email-recovery", + { + "Recovery Email": "Recovery Email", + "Changes saved": "Changes saved", + "Error! User email address cannot be saved as recovery email address!": "Error! User email address cannot be saved as recovery email address!", + "Change Recovery Email": "Change Recovery Email", + "Invalid Recovery Email!": "Invalid Recovery Email!" + }, + "nplurals=2; plural=(n != 1);"); diff --git a/l10n/en.json b/l10n/en.json index 6109661..eb9d648 100644 --- a/l10n/en.json +++ b/l10n/en.json @@ -2,10 +2,10 @@ "translations": { "Recovery Email": "Recovery Email", "Changes saved": "Changes saved", - "ErrorRecoveryEmailSameAsUserEmail": "Error! User email address cannot be saved as recovery email address!", - "Change Recovery Email": "Change Recovery Email", + "Error! User email address cannot be saved as recovery email address!": "Error! User email address cannot be saved as recovery email address!", + "Change Recovery Email": "Change Recovery Email", "Invalid Recovery Email!": "Invalid Recovery Email!", "Error setting recovery email": "Error setting recovery mail" - }, + }, "pluralForm": "nplurals=2; plural=(n != 1);" -} +} \ No newline at end of file diff --git a/l10n/es.js b/l10n/es.js new file mode 100644 index 0000000..da1c64b --- /dev/null +++ b/l10n/es.js @@ -0,0 +1,10 @@ +OC.L10N.register( + "email-recovery", + { + "Recovery Email": "Correo electrónico de recuperación", + "Changes saved": "Cambios guardados", + "Error! User email address cannot be saved as recovery email address!": "¡Error! La dirección de correo electrónico del usuario no se puede guardar como dirección de correo electrónico de recuperación.", + "Change Recovery Email": "Cambiar el correo electrónico de recuperación", + "Invalid Recovery Email!": "¡Email de recuperación inválido!" + }, + "nplurals=2; plural=n != 1;"); diff --git a/l10n/es.json b/l10n/es.json new file mode 100644 index 0000000..48da649 --- /dev/null +++ b/l10n/es.json @@ -0,0 +1,10 @@ +{ + "translations": { + "Recovery Email": "Correo electrónico de recuperación", + "Changes saved": "Cambios guardados", + "Error! User email address cannot be saved as recovery email address!": "¡Error! La dirección de correo electrónico del usuario no se puede guardar como dirección de correo electrónico de recuperación.", + "Change Recovery Email": "Cambiar el correo electrónico de recuperación", + "Invalid Recovery Email!": "¡Email de recuperación inválido!" + }, + "pluralForm": "nplurals=2; plural=n != 1;" +} \ No newline at end of file diff --git a/l10n/fr.js b/l10n/fr.js new file mode 100644 index 0000000..fb16e06 --- /dev/null +++ b/l10n/fr.js @@ -0,0 +1,10 @@ +OC.L10N.register( + "email-recovery", + { + "Recovery Email": "Courriel de récupération", + "Changes saved": "Changements enregistrés", + "Error! User email address cannot be saved as recovery email address!": "Erreur ! L'adresse e-mail de l'utilisateur ne peut pas être enregistrée comme adresse e-mail de récupération !", + "Change Recovery Email": "Courriel de récupération des changements", + "Invalid Recovery Email!": "Courriel de récupération invalide !" + }, + "nplurals=2; plural=n != 1;"); diff --git a/l10n/fr.json b/l10n/fr.json new file mode 100644 index 0000000..ff495b9 --- /dev/null +++ b/l10n/fr.json @@ -0,0 +1,10 @@ +{ + "translations": { + "Recovery Email": "Courriel de récupération", + "Changes saved": "Changements enregistrés", + "Error! User email address cannot be saved as recovery email address!": "Erreur ! L'adresse e-mail de l'utilisateur ne peut pas être enregistrée comme adresse e-mail de récupération !", + "Change Recovery Email": "Courriel de récupération des changements", + "Invalid Recovery Email!": "Courriel de récupération invalide !" + }, + "pluralForm": "nplurals=2; plural=n != 1;" +} \ No newline at end of file diff --git a/l10n/it.js b/l10n/it.js new file mode 100644 index 0000000..fb4701e --- /dev/null +++ b/l10n/it.js @@ -0,0 +1,10 @@ +OC.L10N.register( + "email-recovery", + { + "Recovery Email": "Recupero e-mail", + "Changes saved": "Modifiche salvate", + "Error! User email address cannot be saved as recovery email address!": "Errore! L'indirizzo e-mail dell'utente non può essere salvato come indirizzo e-mail di recupero!", + "Change Recovery Email": "Modifica dell'e-mail di recupero", + "Invalid Recovery Email!": "Email di recupero non valida!" + }, + "nplurals=2; plural=n != 1;"); diff --git a/l10n/it.json b/l10n/it.json new file mode 100644 index 0000000..ef9600a --- /dev/null +++ b/l10n/it.json @@ -0,0 +1,10 @@ +{ + "translations": { + "Recovery Email": "Recupero e-mail", + "Changes saved": "Modifiche salvate", + "Error! User email address cannot be saved as recovery email address!": "Errore! L'indirizzo e-mail dell'utente non può essere salvato come indirizzo e-mail di recupero!", + "Change Recovery Email": "Modifica dell'e-mail di recupero", + "Invalid Recovery Email!": "Email di recupero non valida!" + }, + "pluralForm": "nplurals=2; plural=n != 1;" +} \ No newline at end of file diff --git a/lib/Controller/EmailRecoveryController.php b/lib/Controller/EmailRecoveryController.php index f79b347..4aafec3 100644 --- a/lib/Controller/EmailRecoveryController.php +++ b/lib/Controller/EmailRecoveryController.php @@ -96,7 +96,7 @@ class EmailRecoveryController extends Controller } if ($e instanceof SameRecoveryEmailAsEmailException) { $response->setStatus(400); - $response->setData(['message' => 'ErrorRecoveryEmailSameAsUserEmail']); + $response->setData(['message' => 'Error! User email address cannot be saved as recovery email address!']); } $this->logger->error("Error setting recovery email for user $userId" . $e->getMessage()); diff --git a/translationfiles/ca/email-recovery.po b/translationfiles/ca/email-recovery.po index 3422461..91a8570 100644 --- a/translationfiles/ca/email-recovery.po +++ b/translationfiles/ca/email-recovery.po @@ -40,5 +40,5 @@ msgid "Changes saved" msgstr "S'han guardat els canvis" #: /home/nivesh/Desktop/repos/email-recovery/src/main.html:26 -msgid "ErrorRecoveryEmailSameAsUserEmail" +msgid "Error! User email address cannot be saved as recovery email address!" msgstr "" diff --git a/translationfiles/de/email-recovery.po b/translationfiles/de/email-recovery.po index d875a59..9f8b4c1 100644 --- a/translationfiles/de/email-recovery.po +++ b/translationfiles/de/email-recovery.po @@ -40,5 +40,5 @@ msgid "Changes saved" msgstr "Änderungen gespeichert" #: /home/nivesh/Desktop/repos/email-recovery/src/main.html:26 -msgid "ErrorRecoveryEmailSameAsUserEmail" +msgid "Error! User email address cannot be saved as recovery email address!" msgstr "" diff --git a/translationfiles/templates/email-recovery.pot b/translationfiles/templates/email-recovery.pot index 760164b..c452f1a 100644 --- a/translationfiles/templates/email-recovery.pot +++ b/translationfiles/templates/email-recovery.pot @@ -38,5 +38,5 @@ msgid "Changes saved" msgstr "" #: /home/nivesh/Desktop/repos/email-recovery/src/main.html:26 -msgid "ErrorRecoveryEmailSameAsUserEmail" +msgid "Error! User email address cannot be saved as recovery email address!" msgstr "" -- GitLab From 1cbfff9c4b1fd07966cd042f6e038d71781e1a98 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 23 Sep 2022 10:51:24 +0530 Subject: [PATCH 2/5] removed ca translations files --- translationfiles/ca/email-recovery.po | 44 --------------------------- 1 file changed, 44 deletions(-) delete mode 100644 translationfiles/ca/email-recovery.po diff --git a/translationfiles/ca/email-recovery.po b/translationfiles/ca/email-recovery.po deleted file mode 100644 index 91a8570..0000000 --- a/translationfiles/ca/email-recovery.po +++ /dev/null @@ -1,44 +0,0 @@ -# BASE TRANSLATION FILE. -# Copyright (C) 2022 MURENA -# This file is distributed under the same license as the Nextcloud package. -# dev@murena.io -# -msgid "" -msgstr "" -"Project-Id-Version: Nextcloud 3.14159\n" -"Report-Msgid-Bugs-To: translations\\@example.com\n" -"POT-Creation-Date: 2022-05-06 19:52+0530\n" -"PO-Revision-Date: 2022-05-06 14:30+0000\n" -"Last-Translator: Nivesh Krishna \n" -"Language-Team: Catalan \n" -"Language: ca\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.11.2\n" - -#: /home/nivesh/Desktop/repos/email-recovery/specialAppInfoFakeDummyForL10nScript.php:2 -msgid "Email Recovery" -msgstr "Recuperació de correu electrònic" - -#: /home/nivesh/Desktop/repos/email-recovery/specialAppInfoFakeDummyForL10nScript.php:3 -msgid "Email Recovery App" -msgstr "Aplicació de recuperació de correu electrònic" - -#: /home/nivesh/Desktop/repos/email-recovery/src/main.html:3 -msgid "Recovery Email" -msgstr "Correu electrònic de recuperació" - -#: /home/nivesh/Desktop/repos/email-recovery/src/main.html:7 -msgid "Recovery Email " -msgstr "Correu electrònic de recuperació " - -#: /home/nivesh/Desktop/repos/email-recovery/src/main.html:22 -msgid "Changes saved" -msgstr "S'han guardat els canvis" - -#: /home/nivesh/Desktop/repos/email-recovery/src/main.html:26 -msgid "Error! User email address cannot be saved as recovery email address!" -msgstr "" -- GitLab From b45c0f6031db371f41fac10cb15dd230668b02e0 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 23 Sep 2022 11:08:10 +0530 Subject: [PATCH 3/5] width change of button --- css/main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/main.scss b/css/main.scss index ad8cb35..7b4b45f 100644 --- a/css/main.scss +++ b/css/main.scss @@ -25,7 +25,7 @@ #recoveryEmail, #recoveryButton { flex-shrink: 1; - width: 200px; + width: fit-content; min-width: 150px; } } -- GitLab From 467c38f3a79f770aab73a5cfdbd9ddec74d8a5ae Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 29 Sep 2022 18:18:08 +0530 Subject: [PATCH 4/5] reverted some files --- l10n/ca.js | 11 +++++ l10n/ca.json | 9 ++++ translationfiles/ca/email-recovery.po | 44 +++++++++++++++++++ translationfiles/de/email-recovery.po | 2 +- translationfiles/templates/email-recovery.pot | 2 +- 5 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 l10n/ca.js create mode 100644 l10n/ca.json create mode 100644 translationfiles/ca/email-recovery.po diff --git a/l10n/ca.js b/l10n/ca.js new file mode 100644 index 0000000..1588b30 --- /dev/null +++ b/l10n/ca.js @@ -0,0 +1,11 @@ +OC.L10N.register( + "email-recovery", + { + "Email Recovery" : "Recuperació de correu electrònic", + "Email Recovery App" : "Aplicació de recuperació de correu electrònic", + "Recovery Email" : "Correu electrònic de recuperació", + "Recovery Email " : "Correu electrònic de recuperació ", + "Changes saved" : "S'han guardat els canvis", + "Error! User email address cannot be saved as recovery email address!": "Error! User email address cannot be saved as recovery email address!" +}, +"nplurals=2; plural=n != 1;"); diff --git a/l10n/ca.json b/l10n/ca.json new file mode 100644 index 0000000..4cc973e --- /dev/null +++ b/l10n/ca.json @@ -0,0 +1,9 @@ +{ "translations": { + "Email Recovery" : "Recuperació de correu electrònic", + "Email Recovery App" : "Aplicació de recuperació de correu electrònic", + "Recovery Email" : "Correu electrònic de recuperació", + "Recovery Email " : "Correu electrònic de recuperació ", + "Changes saved" : "S'han guardat els canvis", + "Error! User email address cannot be saved as recovery email address!": "Error! User email address cannot be saved as recovery email address!" +},"pluralForm" :"nplurals=2; plural=n != 1;" +} \ No newline at end of file diff --git a/translationfiles/ca/email-recovery.po b/translationfiles/ca/email-recovery.po new file mode 100644 index 0000000..3422461 --- /dev/null +++ b/translationfiles/ca/email-recovery.po @@ -0,0 +1,44 @@ +# BASE TRANSLATION FILE. +# Copyright (C) 2022 MURENA +# This file is distributed under the same license as the Nextcloud package. +# dev@murena.io +# +msgid "" +msgstr "" +"Project-Id-Version: Nextcloud 3.14159\n" +"Report-Msgid-Bugs-To: translations\\@example.com\n" +"POT-Creation-Date: 2022-05-06 19:52+0530\n" +"PO-Revision-Date: 2022-05-06 14:30+0000\n" +"Last-Translator: Nivesh Krishna \n" +"Language-Team: Catalan \n" +"Language: ca\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.11.2\n" + +#: /home/nivesh/Desktop/repos/email-recovery/specialAppInfoFakeDummyForL10nScript.php:2 +msgid "Email Recovery" +msgstr "Recuperació de correu electrònic" + +#: /home/nivesh/Desktop/repos/email-recovery/specialAppInfoFakeDummyForL10nScript.php:3 +msgid "Email Recovery App" +msgstr "Aplicació de recuperació de correu electrònic" + +#: /home/nivesh/Desktop/repos/email-recovery/src/main.html:3 +msgid "Recovery Email" +msgstr "Correu electrònic de recuperació" + +#: /home/nivesh/Desktop/repos/email-recovery/src/main.html:7 +msgid "Recovery Email " +msgstr "Correu electrònic de recuperació " + +#: /home/nivesh/Desktop/repos/email-recovery/src/main.html:22 +msgid "Changes saved" +msgstr "S'han guardat els canvis" + +#: /home/nivesh/Desktop/repos/email-recovery/src/main.html:26 +msgid "ErrorRecoveryEmailSameAsUserEmail" +msgstr "" diff --git a/translationfiles/de/email-recovery.po b/translationfiles/de/email-recovery.po index 9f8b4c1..d875a59 100644 --- a/translationfiles/de/email-recovery.po +++ b/translationfiles/de/email-recovery.po @@ -40,5 +40,5 @@ msgid "Changes saved" msgstr "Änderungen gespeichert" #: /home/nivesh/Desktop/repos/email-recovery/src/main.html:26 -msgid "Error! User email address cannot be saved as recovery email address!" +msgid "ErrorRecoveryEmailSameAsUserEmail" msgstr "" diff --git a/translationfiles/templates/email-recovery.pot b/translationfiles/templates/email-recovery.pot index c452f1a..760164b 100644 --- a/translationfiles/templates/email-recovery.pot +++ b/translationfiles/templates/email-recovery.pot @@ -38,5 +38,5 @@ msgid "Changes saved" msgstr "" #: /home/nivesh/Desktop/repos/email-recovery/src/main.html:26 -msgid "Error! User email address cannot be saved as recovery email address!" +msgid "ErrorRecoveryEmailSameAsUserEmail" msgstr "" -- GitLab From 65581ee5c2670afb257285969ae67511c29a30ea Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 29 Sep 2022 18:20:12 +0530 Subject: [PATCH 5/5] ca translations --- l10n/ca.js | 2 +- l10n/ca.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n/ca.js b/l10n/ca.js index 1588b30..c3a7f5f 100644 --- a/l10n/ca.js +++ b/l10n/ca.js @@ -6,6 +6,6 @@ OC.L10N.register( "Recovery Email" : "Correu electrònic de recuperació", "Recovery Email " : "Correu electrònic de recuperació ", "Changes saved" : "S'han guardat els canvis", - "Error! User email address cannot be saved as recovery email address!": "Error! User email address cannot be saved as recovery email address!" + "Error! User email address cannot be saved as recovery email address!": "Error! L'adreça electrònica de l'usuari no es pot desar com a adreça electrònica de recuperació!" }, "nplurals=2; plural=n != 1;"); diff --git a/l10n/ca.json b/l10n/ca.json index 4cc973e..83694b3 100644 --- a/l10n/ca.json +++ b/l10n/ca.json @@ -4,6 +4,6 @@ "Recovery Email" : "Correu electrònic de recuperació", "Recovery Email " : "Correu electrònic de recuperació ", "Changes saved" : "S'han guardat els canvis", - "Error! User email address cannot be saved as recovery email address!": "Error! User email address cannot be saved as recovery email address!" + "Error! User email address cannot be saved as recovery email address!": "Error! L'adreça electrònica de l'usuari no es pot desar com a adreça electrònica de recuperació!" },"pluralForm" :"nplurals=2; plural=n != 1;" } \ No newline at end of file -- GitLab