From 16dcc36c26af67a6b7684d3ffd165e3de4c23dd1 Mon Sep 17 00:00:00 2001 From: Hnk Reno Date: Tue, 17 Jun 2014 12:53:56 +0200 Subject: [PATCH 1/4] Fix small grammatical error Information is always singular in English. --- portal/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portal/locales/en.json b/portal/locales/en.json index 94259a2..29ea03a 100644 --- a/portal/locales/en.json +++ b/portal/locales/en.json @@ -1,6 +1,6 @@ { "portal": "YunoHost Portal", - "informations": "Your informations", + "information": "Your information", "username": "Username", "password": "Password", "fullname": "Fullname", @@ -27,7 +27,7 @@ "invalid_domain": "Invalid domain in", "invalid_mailforward": "Invalid mail forward address", "mail_already_used": "Mail address already used:", - "informations_updated": "Informations updated", + "information_updated": "Information updated", "user_saving_fail": "An error occured on user's modification saving", "missing_required_fields": "Required fields are missing", "wrong_username_password": "Wrong username or password", From b5a21535d3b46b28a84f4407cd2c20c6403e4801 Mon Sep 17 00:00:00 2001 From: Hnk Reno Date: Tue, 17 Jun 2014 12:55:32 +0200 Subject: [PATCH 2/4] Update code to reflect change to translations. --- access.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/access.lua b/access.lua index d4b07c5..879b453 100644 --- a/access.lua +++ b/access.lua @@ -464,7 +464,7 @@ function do_edit () end return redirect(portal_url.."password.html") - -- Edit user informations + -- Edit user information elseif string.ends(ngx.var.uri, "edit.html") then if args.givenName and args.sn and args.mail then @@ -561,7 +561,7 @@ function do_edit () cache:delete(user.."-mail|"..v) end set_headers(user) -- Ugly trick to reload cache - flash("win", t("informations_updated")) + flash("win", t("information_updated")) return redirect(portal_url.."info.html") else flash("fail", t("user_saving_fail")) From 9c9e4b109fea569b768497c6be3dc8046b9b096b Mon Sep 17 00:00:00 2001 From: Hnk Reno Date: Tue, 17 Jun 2014 12:56:16 +0200 Subject: [PATCH 3/4] Update files to reflect changes in translation. --- portal/locales/fr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portal/locales/fr.json b/portal/locales/fr.json index 8d14238..fceda87 100644 --- a/portal/locales/fr.json +++ b/portal/locales/fr.json @@ -1,6 +1,6 @@ { "portal": "Portail YunoHost", - "informations": "Vos informations", + "information": "Vos informations", "username": "Nom d'utilisateur", "password": "Mot de passe", "fullname": "Nom complet", @@ -27,7 +27,7 @@ "invalid_domain": "Nom de domaine invalide dans", "invalid_mailforward": "Adresse email de transfert invalide", "mail_already_used": "Adresse déjà utilisée :", - "informations_updated": "Informations mises à jour", + "information_updated": "Informations mises à jour", "user_saving_fail": "Une erreur s'est produite lors de la modification des informations", "missing_required_fields": "Champs requis manquants", "wrong_username_password": "Nom d'utilisateur ou mot de passe incorrect", From 9eff9ae3b67d05b77a8be4de6542d6cba5f56be2 Mon Sep 17 00:00:00 2001 From: Hnk Reno Date: Thu, 19 Jun 2014 16:03:53 +0200 Subject: [PATCH 4/4] Fix small grammatical error --- portal/locales/de.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/portal/locales/de.json b/portal/locales/de.json index 8a4b197..0e32b76 100644 --- a/portal/locales/de.json +++ b/portal/locales/de.json @@ -1,6 +1,6 @@ { "portal": "YunoHost Portal", - "informations": "Deine Informationen", + "information": "Deine Informationen", "username": "Benutzername", "password": "Passwort", "fullname": "Vollständiger Name", @@ -27,7 +27,7 @@ "invalid_domain": "Ungültige Domain in", "invalid_mailforward": "Ungültige E-Mail Weiterleitungsadresse", "mail_already_used": "E-Mail Adresse wird bereits verwendet:", - "informations_updated": "Informationen wurden aktualisiert", + "information_updated": "Informationen wurden aktualisiert", "user_saving_fail": "Beim ändern der Benutzerinformationen ist ein Fehler aufgetreten", "missing_required_fields": "Benötigte Felder fehlen", "wrong_username_password": "Falscher Benutzername oder Passwort", @@ -38,4 +38,4 @@ "footerlink_documentation": "Dokumentation", "footerlink_support": "Support", "footerlink_administration": "Administration" -} \ No newline at end of file +}