diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-03-10 16:24:48 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-03-10 16:24:48 +0100 |
| commit | c9f847f625f0f4094fe46392a06e4f4169f7d44c (patch) | |
| tree | 340adc99aa6ac48603b6019b27058932019d06d2 /inc/lang | |
| parent | 70f8c497b285679b9e4450e496b717ccc409af03 (diff) | |
| parent | 1e5105f90f56d0f57111eff37a535480115920c5 (diff) | |
| download | rpg-c9f847f625f0f4094fe46392a06e4f4169f7d44c.tar.gz rpg-c9f847f625f0f4094fe46392a06e4f4169f7d44c.tar.bz2 | |
Merge branch 'adexpirywarn'
* adexpirywarn:
make sure AD pass expiry message is never shown twice
do not hardcode profile link in AD pass expire message
translatable AD expiry warning and link to update profile page
Don't return any data for non-existant users
do not query AD for empty user name
always check expire time when configured
Check password expiry times in Active Directory backend
Diffstat (limited to 'inc/lang')
| -rw-r--r-- | inc/lang/de/lang.php | 1 | ||||
| -rw-r--r-- | inc/lang/en/lang.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index a4360b2a4..63ffd3008 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -273,6 +273,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 bald ändern.'; $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 e0fe98b86..2ba220e64 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -280,6 +280,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 change it soon.'; /* installer strings */ $lang['i_chooselang'] = 'Choose your language'; |