From d933e7889698f71911effa074407163c811d4899 Mon Sep 17 00:00:00 2001 From: Neraste Date: Sat, 21 Oct 2017 15:01:51 +0200 Subject: [PATCH] L10n for admin validation messages --- controller/registercontroller.php | 2 +- l10n/de.js | 5 ++++- l10n/de.json | 7 +++++-- l10n/fr.js | 5 ++++- l10n/fr.json | 7 +++++-- l10n/ja.js | 5 ++++- l10n/ja.json | 7 +++++-- templates/email.newuser.disabled_html.php | 2 +- templates/email.newuser.disabled_plaintext.php | 2 +- 9 files changed, 30 insertions(+), 12 deletions(-) diff --git a/controller/registercontroller.php b/controller/registercontroller.php index 7c16c54..9132681 100644 --- a/controller/registercontroller.php +++ b/controller/registercontroller.php @@ -157,7 +157,7 @@ class RegisterController extends Controller { return new TemplateResponse( 'registration', 'message', - array('msg' => "Your account has been successfully created, but it still needs approval from an administrator."), + array('msg' => $this->l10n->t("Your account has been successfully created, but it still needs approval from an administrator.")), 'guest'); } } diff --git a/l10n/de.js b/l10n/de.js index a5f8233..ed79558 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -38,6 +38,9 @@ OC.L10N.register( "Email" : "E-Mail", "Request verification link" : "Bestätigungslink anfragen", "Please re-enter a valid email address" : "Bitte nochmals eine gültige E-Mail-Adresse angeben", - "You will receive an email with a verification link" : "Du wirst eine E-Mail mit einem Bestätigungslink erhalten" + "You will receive an email with a verification link" : "Du wirst eine E-Mail mit einem Bestätigungslink erhalten", + "A new user \"%s\" has created an account on %s and awaits admin approbation" : "Ein neuer Benutzer \"%s\" hat ein Konto auf %s erstellt und erwarte den Administrator Approbation ", + "Your account has been successfully created, but it still needs approval from an administrator." : "Ihr Konto wurde erfolgreich erstellt, aber es muss von einem Administrator genehmigt werden.", + "Require admin approval?" : "Ist der Administrator Approbation erforderlich?" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/de.json b/l10n/de.json index f52c182..7aca01f 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -36,6 +36,9 @@ "Email" : "E-Mail", "Request verification link" : "Bestätigungslink anfragen", "Please re-enter a valid email address" : "Bitte nochmals eine gültige E-Mail-Adresse angeben", - "You will receive an email with a verification link" : "Du wirst eine E-Mail mit einem Bestätigungslink erhalten" + "You will receive an email with a verification link" : "Du wirst eine E-Mail mit einem Bestätigungslink erhalten", + "A new user \"%s\" has created an account on %s and awaits admin approbation" : "Ein neuer Benutzer \"%s\" hat ein Konto auf %s erstellt und erwarte den Administrator Approbation ", + "Your account has been successfully created, but it still needs approval from an administrator." : "Ihr Konto wurde erfolgreich erstellt, aber es muss von einem Administrator genehmigt werden.", + "Require admin approval?" : "Ist der Administrator Approbation erforderlich?" },"pluralForm" :"nplurals=2; plural=(n != 1);" -} \ No newline at end of file +} diff --git a/l10n/fr.js b/l10n/fr.js index bb2a4da..1e36187 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -30,6 +30,9 @@ OC.L10N.register( "Email" : "Adresse courriel", "Request verification link" : "Demander un lien de vérification.", "Please re-enter a valid email address" : "Veuillez indiquer une adresse courriel valide", - "You will receive an email with a verification link" : "Vous allez recevoir un courriel avec un lien de vérification" + "You will receive an email with a verification link" : "Vous allez recevoir un courriel avec un lien de vérification", + "A new user \"%s\" has created an account on %s and awaits admin approbation" : "Un nouvel utilisateur \"%s\" a créé un compte sur %s et attend l'approbation d'un administrateur", + "Your account has been successfully created, but it still needs approval from an administrator." : "Votre compte a bien été créé, il doit maintenant être approuvé par un administrateur.", + "Require admin approval?" : "Nécessite l'approbation d'un administrateur ?" }, "nplurals=2; plural=(n > 1);"); diff --git a/l10n/fr.json b/l10n/fr.json index 89d800a..6328e81 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -28,6 +28,9 @@ "Email" : "Adresse courriel", "Request verification link" : "Demander un lien de vérification.", "Please re-enter a valid email address" : "Veuillez indiquer une adresse courriel valide", - "You will receive an email with a verification link" : "Vous allez recevoir un courriel avec un lien de vérification" + "You will receive an email with a verification link" : "Vous allez recevoir un courriel avec un lien de vérification", + "A new user \"%s\" has created an account on %s and awaits admin approbation" : "Un nouvel utilisateur \"%s\" a créé un compte sur %s et attend l'approbation d'un administrateur", + "Your account has been successfully created, but it still needs approval from an administrator." : "Votre compte a bien été créé, il doit maintenant être approuvé par un administrateur.", + "Require admin approval?" : "Nécessite l'approbation d'un administrateur ?" },"pluralForm" :"nplurals=2; plural=(n > 1);" -} \ No newline at end of file +} diff --git a/l10n/ja.js b/l10n/ja.js index c5a5ff5..80d2cd2 100644 --- a/l10n/ja.js +++ b/l10n/ja.js @@ -30,6 +30,9 @@ OC.L10N.register( "Email" : "メール", "Request verification link" : "確認URLリンクをリクエスト", "Please re-enter a valid email address" : "有効なメールアドレスを再度入力してください。", - "You will receive an email with a verification link" : "確認URLの入ったメールをお送り致します。" + "You will receive an email with a verification link" : "確認URLの入ったメールをお送り致します。", + "A new user \"%s\" has created an account on %s and awaits admin approbation" : "新しいユーザー \"%s\" を アカウント名 \"%s\" として作成しました、今管理者の承認は必要です", + "Your account has been successfully created, but it still needs approval from an administrator." : "アカウントは作成成功しましたけど、管理者の承認は必要です。", + "Require admin approval?" : "管理者の承認は必要ですか" }, "nplurals=1; plural=0;"); diff --git a/l10n/ja.json b/l10n/ja.json index b7b1094..91af2c4 100644 --- a/l10n/ja.json +++ b/l10n/ja.json @@ -28,6 +28,9 @@ "Email" : "メール", "Request verification link" : "確認URLリンクをリクエスト", "Please re-enter a valid email address" : "有効なメールアドレスを再度入力してください。", - "You will receive an email with a verification link" : "確認URLの入ったメールをお送り致します。" + "You will receive an email with a verification link" : "確認URLの入ったメールをお送り致します。", + "A new user \"%s\" has created an account on %s and awaits admin approbation" : "新しいユーザー \"%s\" を アカウント名 \"%s\" として作成しました、今管理者の承認は必要です", + "Your account has been successfully created, but it still needs approval from an administrator." : "アカウントは作成成功しましたけど、管理者の承認は必要です。", + "Require admin approval?" : "管理者の承認は必要ですか" },"pluralForm" :"nplurals=1; plural=0;" -} \ No newline at end of file +} diff --git a/templates/email.newuser.disabled_html.php b/templates/email.newuser.disabled_html.php index ef23ba2..6407ffb 100644 --- a/templates/email.newuser.disabled_html.php +++ b/templates/email.newuser.disabled_html.php @@ -1,2 +1,2 @@ t('A new user "%s" has created an account on %s and awaits admin validation', [$_['user'], $_['sitename']]); +echo $l->t('A new user "%s" has created an account on %s and awaits admin approbation', [$_['user'], $_['sitename']]); diff --git a/templates/email.newuser.disabled_plaintext.php b/templates/email.newuser.disabled_plaintext.php index ef23ba2..6407ffb 100644 --- a/templates/email.newuser.disabled_plaintext.php +++ b/templates/email.newuser.disabled_plaintext.php @@ -1,2 +1,2 @@ t('A new user "%s" has created an account on %s and awaits admin validation', [$_['user'], $_['sitename']]); +echo $l->t('A new user "%s" has created an account on %s and awaits admin approbation', [$_['user'], $_['sitename']]);