diff options
| author | Anika Henke <anika@selfthinker.org> | 2013-07-21 18:52:40 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2013-07-21 18:52:40 +0100 |
| commit | 8c7670b52dc523860f442a628ae7d226988e96d7 (patch) | |
| tree | d99053d878efb0829f99a35bb77cb02c1ae3c524 /lib/plugins/usermanager | |
| parent | 20beef63b4694afdc3d6c434c3d27c982b6a986b (diff) | |
| parent | fbd8067eeeb9f424981aad8b283e17f734c738c3 (diff) | |
| download | rpg-8c7670b52dc523860f442a628ae7d226988e96d7.tar.gz rpg-8c7670b52dc523860f442a628ae7d226988e96d7.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into loggedin-class
Diffstat (limited to 'lib/plugins/usermanager')
| -rw-r--r-- | lib/plugins/usermanager/admin.php | 4 | ||||
| -rw-r--r-- | lib/plugins/usermanager/lang/de-informal/lang.php | 1 | ||||
| -rw-r--r-- | lib/plugins/usermanager/lang/ko/lang.php | 4 | ||||
| -rw-r--r-- | lib/plugins/usermanager/lang/sv/lang.php | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 01f4a4cdb..445836a50 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -355,7 +355,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { if ($this->_auth->canDo('modPass')){ if (empty($pass)){ if($INPUT->has('usernotify')){ - $pass = auth_pwgen(); + $pass = auth_pwgen($user); } else { msg($this->lang['add_fail'], -1); return false; @@ -496,7 +496,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { // generate password if left empty and notification is on if($INPUT->has('usernotify') && empty($newpass)){ - $newpass = auth_pwgen(); + $newpass = auth_pwgen($olduser); } if (!empty($newpass) && $this->_auth->canDo('modPass')) diff --git a/lib/plugins/usermanager/lang/de-informal/lang.php b/lib/plugins/usermanager/lang/de-informal/lang.php index 07390854f..791cfa74f 100644 --- a/lib/plugins/usermanager/lang/de-informal/lang.php +++ b/lib/plugins/usermanager/lang/de-informal/lang.php @@ -9,6 +9,7 @@ * @author Christian Wichmann <nospam@zone0.de> * @author Pierre Corell <info@joomla-praxis.de> * @author Frank Loizzi <contact@software.bacal.de> + * @author Volker Bödker <volker@boedker.de> */ $lang['menu'] = 'Benutzerverwaltung'; $lang['noauth'] = '(Benutzeranmeldung ist nicht verfügbar)'; diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php index f8c400d19..57bfbc4a2 100644 --- a/lib/plugins/usermanager/lang/ko/lang.php +++ b/lib/plugins/usermanager/lang/ko/lang.php @@ -23,8 +23,8 @@ $lang['value'] = '값'; $lang['add'] = '추가'; $lang['delete'] = '삭제'; $lang['delete_selected'] = '선택 삭제'; -$lang['edit'] = '수정'; -$lang['edit_prompt'] = '이 사용자 수정'; +$lang['edit'] = '편집'; +$lang['edit_prompt'] = '이 사용자 편집'; $lang['modify'] = '바뀜 저장'; $lang['search'] = '찾기'; $lang['search_prompt'] = '찾기 실행'; diff --git a/lib/plugins/usermanager/lang/sv/lang.php b/lib/plugins/usermanager/lang/sv/lang.php index bd747927e..f8b530d90 100644 --- a/lib/plugins/usermanager/lang/sv/lang.php +++ b/lib/plugins/usermanager/lang/sv/lang.php @@ -15,6 +15,7 @@ * @author Peter Åström <eaustreum@gmail.com> * @author Håkan Sandell <hakan.sandell@home.se> * @author mikael@mallander.net + * @author Smorkster Andersson smorkster@gmail.com */ $lang['menu'] = 'Hantera användare'; $lang['noauth'] = '(användarautentisering ej tillgänlig)'; |