summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <gohr@cosmocode.de>2011-11-07 14:49:29 +0100
committerAndreas Gohr <gohr@cosmocode.de>2011-11-07 14:53:08 +0100
commitb2117c6969fc31aa958f6019fd1e4e258f555db7 (patch)
tree5e67dd9b85b451699e7378d43b77126b4625a220
parent9565908d97917c579e2ecb44a0b44a133df598fe (diff)
downloadrpg-b2117c6969fc31aa958f6019fd1e4e258f555db7.tar.gz
rpg-b2117c6969fc31aa958f6019fd1e4e258f555db7.tar.bz2
translatable AD expiry warning and link to update profile page
-rw-r--r--inc/auth/ad.class.php5
-rw-r--r--inc/lang/de/lang.php1
-rw-r--r--inc/lang/en/lang.php1
3 files changed, 5 insertions, 2 deletions
diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php
index 678a32047..cb59c5a48 100644
--- a/inc/auth/ad.class.php
+++ b/inc/auth/ad.class.php
@@ -26,7 +26,7 @@
* $conf['auth']['ad']['use_ssl'] = 1;
* $conf['auth']['ad']['use_tls'] = 1;
* $conf['auth']['ad']['debug'] = 1;
- * // warn user about expiring password in this mayn days in advance:
+ * // warn user about expiring password this many days in advance:
* $conf['auth']['ad']['expirywarn'] = 5;
*
* // get additional information to the userinfo array
@@ -148,6 +148,7 @@ class auth_ad extends auth_basic {
*/
function getUserData($user){
global $conf;
+ global $lang;
if(!$this->_init()) return false;
if($user == '') return array();
@@ -205,7 +206,7 @@ class auth_ad extends auth_basic {
// if this is the current user, warn him
if( ($_SERVER['REMOTE_USER'] == $user) && ($timeleft <= $this->cnf['expirywarn'])){
- msg('Your password will expire in '.$timeleft.' days. You should change it.');
+ msg(sprintf($lang['authpwdexpire'],$timeleft));
}
}
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index eef2f6632..8fdffd66e 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -268,6 +268,7 @@ $lang['subscr_style_digest'] = 'Zusammenfassung der Änderungen für jede verÃ
$lang['subscr_style_list'] = 'Liste der geänderten Seiten (Alle %.2f Tage)';
$lang['authmodfailed'] = 'Benutzerüberprüfung nicht möglich. Bitte wenden Sie sich an den Systembetreuer.';
$lang['authtempfail'] = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wenden Sie sich an den Systembetreuer.';
+$lang['authpwdexpire'] = 'Ihr Passwort läuft in %d Tag(en) ab. Sie sollten es <a href="?do=profile">ändern</a>.';
$lang['i_chooselang'] = 'Wählen Sie Ihre Sprache';
$lang['i_installer'] = 'DokuWiki Installation';
$lang['i_wikiname'] = 'Wiki-Name';
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 89a7c4d40..9250d119a 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -275,6 +275,7 @@ $lang['subscr_style_list'] = 'list of changed pages since last email (e
/* auth.class language support */
$lang['authmodfailed'] = 'Bad user authentication configuration. Please inform your Wiki Admin.';
$lang['authtempfail'] = 'User authentication is temporarily unavailable. If this situation persists, please inform your Wiki Admin.';
+$lang['authpwdexpire'] = 'Your password will expire in %d days. You should <a href="?do=profile">change it</a>.';
/* installer strings */
$lang['i_chooselang'] = 'Choose your language';