From ea0c133d5e7fd63594a19410ac15e2af93571733 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 29 Sep 2022 09:06:17 +0000 Subject: [PATCH] Revert "Merge branch 'dev/translations' into 'main'" This reverts merge request !14 --- css/main.scss | 2 +- 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 | 44 +++++++++++++++++++ translationfiles/de/email-recovery.po | 2 +- translationfiles/templates/email-recovery.pot | 2 +- 17 files changed, 95 insertions(+), 95 deletions(-) create mode 100644 l10n/ca.js create mode 100644 l10n/ca.json delete mode 100644 l10n/es.js delete mode 100644 l10n/es.json delete mode 100644 l10n/fr.js delete mode 100644 l10n/fr.json delete mode 100644 l10n/it.js delete mode 100644 l10n/it.json create mode 100644 translationfiles/ca/email-recovery.po diff --git a/css/main.scss b/css/main.scss index 7b4b45f..ad8cb35 100644 --- a/css/main.scss +++ b/css/main.scss @@ -25,7 +25,7 @@ #recoveryEmail, #recoveryButton { flex-shrink: 1; - width: fit-content; + width: 200px; min-width: 150px; } } diff --git a/l10n/ca.js b/l10n/ca.js new file mode 100644 index 0000000..74591fb --- /dev/null +++ b/l10n/ca.js @@ -0,0 +1,10 @@ +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 new file mode 100644 index 0000000..6a8a27e --- /dev/null +++ b/l10n/ca.json @@ -0,0 +1,8 @@ +{ "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 a7cfdd0..f1195cc 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -1,10 +1,10 @@ OC.L10N.register( - "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);"); + "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;"); diff --git a/l10n/de.json b/l10n/de.json index f3feb38..867c7cb 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -1,10 +1,8 @@ -{ - "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;" +{ "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;" } \ No newline at end of file diff --git a/l10n/en.js b/l10n/en.js index 221150a..837fc25 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", - "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);"); + "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);"); diff --git a/l10n/en.json b/l10n/en.json index eb9d648..6109661 100644 --- a/l10n/en.json +++ b/l10n/en.json @@ -2,10 +2,10 @@ "translations": { "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", + "ErrorRecoveryEmailSameAsUserEmail": "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 deleted file mode 100644 index da1c64b..0000000 --- a/l10n/es.js +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 48da649..0000000 --- a/l10n/es.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index fb16e06..0000000 --- a/l10n/fr.js +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index ff495b9..0000000 --- a/l10n/fr.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index fb4701e..0000000 --- a/l10n/it.js +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index ef9600a..0000000 --- a/l10n/it.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 4aafec3..f79b347 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' => 'Error! User email address cannot be saved as recovery email address!']); + $response->setData(['message' => 'ErrorRecoveryEmailSameAsUserEmail']); } $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 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