From f0a0ea04e142be9ec67104ffbe6bb6a3e4f55b34 Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Wed, 13 Jun 2012 09:46:00 +0000
Subject: [PATCH] added tmp_vars for login + password_reset as replacement for
hardcoded language non-neutral expressions
---
interface/web/login/lib/lang/de.lng | 4 ++++
interface/web/login/lib/lang/en.lng | 4 ++++
interface/web/login/templates/index.htm | 2 +-
interface/web/login/templates/password_reset.htm | 8 ++++----
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/interface/web/login/lib/lang/de.lng b/interface/web/login/lib/lang/de.lng
index c92654e557..e036c499ed 100644
--- a/interface/web/login/lib/lang/de.lng
+++ b/interface/web/login/lib/lang/de.lng
@@ -14,10 +14,14 @@ $wb['pw_reset_mail_title'] = 'Ihr Passwort wurde zurückgesetzt.';
$wb['user_regex_error'] = 'Benutzername beinhaltet nicht erlaubte Zeichen oder ist länger als 64 Zeichen.';
$wb['pw_error_length'] = 'Die Passwortlänge ist > 64 Zeichen.';
+$wb['login_txt'] = "Login";
$wb['username_txt'] = 'Benutzername';
$wb['password_txt'] = 'Passwort';
$wb['login_button_txt'] = 'Login';
$wb['pw_lost_txt'] = "Passwort vergessen";
+$wb['pw_reset_txt'] = "Passwort zurücksetzen";
+$wb['pw_button_txt'] = "Passwort zusenden";
+$wb['email_txt'] = "E-Mail";
$wb['error_maintenance_mode'] = 'Diese ISPConfig-Installation wird gerade gewartet. Wir sind in Kürze wieder für Sie da. Vielen Dank für Ihre Geduld.';
?>
diff --git a/interface/web/login/lib/lang/en.lng b/interface/web/login/lib/lang/en.lng
index 1460a6e3f7..be171463a0 100644
--- a/interface/web/login/lib/lang/en.lng
+++ b/interface/web/login/lib/lang/en.lng
@@ -14,10 +14,14 @@ $wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel password has been reset
$wb['user_regex_error'] = 'Username contains unallowed characters or is longer than 64 characters.';
$wb['pw_error_length'] = 'The password length is > 64 characters.';
+$wb['login_txt'] = "Login";
$wb['username_txt'] = "Username";
$wb['password_txt'] = "Password";
$wb['login_button_txt'] = "Login";
$wb['pw_lost_txt'] = "Password lost";
+$wb['pw_reset_txt'] = "Password reset";
+$wb['pw_button_txt'] = "Resend password";
+$wb['email_txt'] = "Email";
$wb['error_maintenance_mode'] = 'This ISPConfig installation is currently under maintenance. We should be back shortly. Thank you for your patience.';
?>
\ No newline at end of file
diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
index 8e3e783d18..40e4a78599 100644
--- a/interface/web/login/templates/index.htm
+++ b/interface/web/login/templates/index.htm
@@ -11,7 +11,7 @@
</tmpl_if>
<div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Login</legend>
+ <fieldset class="inlineLabels"><legend>{tmpl_var name='login_txt'}Login</legend>
<div class="ctrlHolder">
<label for="username">{tmpl_var name='username_txt'}</label>
<input name="username" id="username" value="" size="30" maxlength="255" type="text" class="textInput" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
diff --git a/interface/web/login/templates/password_reset.htm b/interface/web/login/templates/password_reset.htm
index d47210ad49..25d0897b69 100644
--- a/interface/web/login/templates/password_reset.htm
+++ b/interface/web/login/templates/password_reset.htm
@@ -11,13 +11,13 @@
</tmpl_if>
<div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Password reset</legend>
+ <fieldset class="inlineLabels"><legend>{tmpl_var name='pw_reset_txt'}</legend>
<div class="ctrlHolder">
- <label for="email"><em>*</em> E-Mail</label>
+ <label for="email"><em>*</em> {tmpl_var name='email_txt'}</label>
<input name="email" id="email" value="" size="30" maxlength="255" type="text" class="textInput" />
</div>
<div class="ctrlHolder">
- <label for="username"><em>*</em> Username</label>
+ <label for="username"><em>*</em> {tmpl_var name='username_txt'}</label>
<input name="username" id="username" value="" size="30" maxlength="255" type="text" class="textInput" />
</div>
</fieldset>
@@ -26,7 +26,7 @@
<input type="hidden" name="s_pg" value="index" />
<div class="buttonHolder buttons">
- <button class="positive" type="button" value="{tmpl_var name="add_new_record_txt"}" onClick="submitForm('pageForm','login/password_reset.php');"><span>Resend password</span></button>
+ <button class="positive" type="button" value="{tmpl_var name="add_new_record_txt"}" onClick="submitForm('pageForm','login/password_reset.php');"><span>{tmpl_var name='pw_button_txt'}</span></button>
</div>
</div>
--
GitLab