From 253d4b48ec708eb42033862dc15c8576f44a48ed Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Wed, 1 Oct 2014 15:32:05 +0200 Subject: more PHPDocs, unused var, small bit code reformatting --- lib/plugins/authplain/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/auth.php b/lib/plugins/authplain/auth.php index b3ca988b9..1ea75b100 100644 --- a/lib/plugins/authplain/auth.php +++ b/lib/plugins/authplain/auth.php @@ -77,7 +77,7 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { * @author Andreas Gohr * @param string $user * @param bool $requireGroups (optional) ignored by this plugin, grps info always supplied - * @return array|bool + * @return array|false */ public function getUserData($user, $requireGroups=true) { if($this->users === null) $this->_loadUserData(); -- cgit v1.2.3 From 7e8500eea1e53b1de0e0f70400664afa442cd08d Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 2 Oct 2014 14:55:24 +0200 Subject: PHPDocs and some improvements --- lib/plugins/authplain/_test/escaping.test.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/_test/escaping.test.php b/lib/plugins/authplain/_test/escaping.test.php index cd5294157..5cf631508 100644 --- a/lib/plugins/authplain/_test/escaping.test.php +++ b/lib/plugins/authplain/_test/escaping.test.php @@ -12,10 +12,11 @@ * @group plugins */ class helper_plugin_authplain_escaping_test extends DokuWikiTest { - + protected $pluginsEnabled = array('authplain'); + /** @var auth_plugin_authplain */ protected $auth; - + protected function reloadUsers() { /* auth caches data loaded from file, but recreated object forces reload */ $this->auth = new auth_plugin_authplain(); -- cgit v1.2.3 From 79e79377626799a77c11aa7849cb9c64305590c8 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 7 Jan 2015 10:47:45 +0100 Subject: Remove error supression for file_exists() In an older version of PHP a file_exists() call would issue a warning when the file did not exist. This was fixed in later PHP releases. Since we require PHP 5.3 now, there's no need to supress any error here anymore. This might even give a minor performance boost. --- lib/plugins/authplain/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/auth.php b/lib/plugins/authplain/auth.php index fd2d0b249..b31c02fc8 100644 --- a/lib/plugins/authplain/auth.php +++ b/lib/plugins/authplain/auth.php @@ -325,7 +325,7 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { $this->users = array(); - if(!@file_exists($config_cascade['plainauth.users']['default'])) return; + if(!file_exists($config_cascade['plainauth.users']['default'])) return; $lines = file($config_cascade['plainauth.users']['default']); foreach($lines as $line) { -- cgit v1.2.3 From 276820f70d7e96ee375735c1a15bdc0a8331a5a7 Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Sat, 10 Jan 2015 14:47:51 +0000 Subject: Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- lib/plugins/authplain/_test/escaping.test.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/_test/escaping.test.php b/lib/plugins/authplain/_test/escaping.test.php index 9df96389a..e1eade8d4 100644 --- a/lib/plugins/authplain/_test/escaping.test.php +++ b/lib/plugins/authplain/_test/escaping.test.php @@ -106,6 +106,9 @@ class helper_plugin_authplain_escaping_test extends DokuWikiTest { class auth_plugin_authplainharness extends auth_plugin_authplain { + /** + * @param boolean $bool + */ public function setPregsplit_safe($bool) { $this->_pregsplit_safe = $bool; } @@ -114,6 +117,9 @@ class auth_plugin_authplainharness extends auth_plugin_authplain { return $this->_pregsplit_safe; } + /** + * @param string $line + */ public function splitUserData($line){ return $this->_splitUserData($line); } -- cgit v1.2.3 From f8095446e4d8d2bca535087d6e9dbcd20106d21d Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 1 Apr 2015 19:48:03 +0100 Subject: add more plugin groups to authplain test --- lib/plugins/authplain/_test/escaping.test.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/_test/escaping.test.php b/lib/plugins/authplain/_test/escaping.test.php index e1eade8d4..7139aa99b 100644 --- a/lib/plugins/authplain/_test/escaping.test.php +++ b/lib/plugins/authplain/_test/escaping.test.php @@ -9,7 +9,9 @@ * authplain won't get unexpectedly surprised.) * * @group plugin_authplain + * @group auth_plugins * @group plugins + * @group bundled_plugins */ class helper_plugin_authplain_escaping_test extends DokuWikiTest { -- cgit v1.2.3 From db9faf025cf129d15a086a803e8056e977975d76 Mon Sep 17 00:00:00 2001 From: Patrick Brown Date: Wed, 6 May 2015 01:30:59 -0400 Subject: Report more meaningful errors when an auth backend fails. closes #1093 --- lib/plugins/authplain/auth.php | 33 +++++++++++++++---------- lib/plugins/authplain/lang/af/lang.php | 6 +++++ lib/plugins/authplain/lang/ar/lang.php | 6 +++++ lib/plugins/authplain/lang/az/lang.php | 6 +++++ lib/plugins/authplain/lang/bg/lang.php | 6 +++++ lib/plugins/authplain/lang/bn/lang.php | 6 +++++ lib/plugins/authplain/lang/ca-valencia/lang.php | 6 +++++ lib/plugins/authplain/lang/ca/lang.php | 6 +++++ lib/plugins/authplain/lang/cs/lang.php | 6 +++++ lib/plugins/authplain/lang/da/lang.php | 6 +++++ lib/plugins/authplain/lang/de-informal/lang.php | 6 +++++ lib/plugins/authplain/lang/de/lang.php | 6 +++++ lib/plugins/authplain/lang/el/lang.php | 6 +++++ lib/plugins/authplain/lang/en/lang.php | 8 ++++++ lib/plugins/authplain/lang/eo/lang.php | 6 +++++ lib/plugins/authplain/lang/es/lang.php | 6 +++++ lib/plugins/authplain/lang/et/lang.php | 6 +++++ lib/plugins/authplain/lang/eu/lang.php | 6 +++++ lib/plugins/authplain/lang/fa/lang.php | 6 +++++ lib/plugins/authplain/lang/fi/lang.php | 6 +++++ lib/plugins/authplain/lang/fo/lang.php | 6 +++++ lib/plugins/authplain/lang/fr/lang.php | 6 +++++ lib/plugins/authplain/lang/gl/lang.php | 6 +++++ lib/plugins/authplain/lang/he/lang.php | 6 +++++ lib/plugins/authplain/lang/hr/lang.php | 6 +++++ lib/plugins/authplain/lang/hu/lang.php | 6 +++++ lib/plugins/authplain/lang/ia/lang.php | 6 +++++ lib/plugins/authplain/lang/id-ni/lang.php | 6 +++++ lib/plugins/authplain/lang/id/lang.php | 6 +++++ lib/plugins/authplain/lang/is/lang.php | 6 +++++ lib/plugins/authplain/lang/it/lang.php | 6 +++++ lib/plugins/authplain/lang/ja/lang.php | 6 +++++ lib/plugins/authplain/lang/ka/lang.php | 6 +++++ lib/plugins/authplain/lang/kk/lang.php | 6 +++++ lib/plugins/authplain/lang/km/lang.php | 6 +++++ lib/plugins/authplain/lang/ko/lang.php | 6 +++++ lib/plugins/authplain/lang/ku/lang.php | 6 +++++ lib/plugins/authplain/lang/la/lang.php | 6 +++++ lib/plugins/authplain/lang/lb/lang.php | 6 +++++ lib/plugins/authplain/lang/lt/lang.php | 6 +++++ lib/plugins/authplain/lang/lv/lang.php | 6 +++++ lib/plugins/authplain/lang/mg/lang.php | 6 +++++ lib/plugins/authplain/lang/mk/lang.php | 6 +++++ lib/plugins/authplain/lang/mr/lang.php | 6 +++++ lib/plugins/authplain/lang/ms/lang.php | 6 +++++ lib/plugins/authplain/lang/ne/lang.php | 6 +++++ lib/plugins/authplain/lang/nl/lang.php | 6 +++++ lib/plugins/authplain/lang/no/lang.php | 6 +++++ lib/plugins/authplain/lang/pl/lang.php | 6 +++++ lib/plugins/authplain/lang/pt-br/lang.php | 6 +++++ lib/plugins/authplain/lang/pt/lang.php | 6 +++++ lib/plugins/authplain/lang/ro/lang.php | 6 +++++ lib/plugins/authplain/lang/ru/lang.php | 6 +++++ lib/plugins/authplain/lang/sk/lang.php | 6 +++++ lib/plugins/authplain/lang/sl/lang.php | 6 +++++ lib/plugins/authplain/lang/sq/lang.php | 6 +++++ lib/plugins/authplain/lang/sr/lang.php | 6 +++++ lib/plugins/authplain/lang/sv/lang.php | 6 +++++ lib/plugins/authplain/lang/th/lang.php | 6 +++++ lib/plugins/authplain/lang/tr/lang.php | 6 +++++ lib/plugins/authplain/lang/uk/lang.php | 6 +++++ lib/plugins/authplain/lang/vi/lang.php | 6 +++++ lib/plugins/authplain/lang/zh-tw/lang.php | 6 +++++ lib/plugins/authplain/lang/zh/lang.php | 6 +++++ 64 files changed, 400 insertions(+), 13 deletions(-) create mode 100644 lib/plugins/authplain/lang/af/lang.php create mode 100644 lib/plugins/authplain/lang/ar/lang.php create mode 100644 lib/plugins/authplain/lang/az/lang.php create mode 100644 lib/plugins/authplain/lang/bg/lang.php create mode 100644 lib/plugins/authplain/lang/bn/lang.php create mode 100644 lib/plugins/authplain/lang/ca-valencia/lang.php create mode 100644 lib/plugins/authplain/lang/ca/lang.php create mode 100644 lib/plugins/authplain/lang/cs/lang.php create mode 100644 lib/plugins/authplain/lang/da/lang.php create mode 100644 lib/plugins/authplain/lang/de-informal/lang.php create mode 100644 lib/plugins/authplain/lang/de/lang.php create mode 100644 lib/plugins/authplain/lang/el/lang.php create mode 100644 lib/plugins/authplain/lang/en/lang.php create mode 100644 lib/plugins/authplain/lang/eo/lang.php create mode 100644 lib/plugins/authplain/lang/es/lang.php create mode 100644 lib/plugins/authplain/lang/et/lang.php create mode 100644 lib/plugins/authplain/lang/eu/lang.php create mode 100644 lib/plugins/authplain/lang/fa/lang.php create mode 100644 lib/plugins/authplain/lang/fi/lang.php create mode 100644 lib/plugins/authplain/lang/fo/lang.php create mode 100644 lib/plugins/authplain/lang/fr/lang.php create mode 100644 lib/plugins/authplain/lang/gl/lang.php create mode 100644 lib/plugins/authplain/lang/he/lang.php create mode 100644 lib/plugins/authplain/lang/hr/lang.php create mode 100644 lib/plugins/authplain/lang/hu/lang.php create mode 100644 lib/plugins/authplain/lang/ia/lang.php create mode 100644 lib/plugins/authplain/lang/id-ni/lang.php create mode 100644 lib/plugins/authplain/lang/id/lang.php create mode 100644 lib/plugins/authplain/lang/is/lang.php create mode 100644 lib/plugins/authplain/lang/it/lang.php create mode 100644 lib/plugins/authplain/lang/ja/lang.php create mode 100644 lib/plugins/authplain/lang/ka/lang.php create mode 100644 lib/plugins/authplain/lang/kk/lang.php create mode 100644 lib/plugins/authplain/lang/km/lang.php create mode 100644 lib/plugins/authplain/lang/ko/lang.php create mode 100644 lib/plugins/authplain/lang/ku/lang.php create mode 100644 lib/plugins/authplain/lang/la/lang.php create mode 100644 lib/plugins/authplain/lang/lb/lang.php create mode 100644 lib/plugins/authplain/lang/lt/lang.php create mode 100644 lib/plugins/authplain/lang/lv/lang.php create mode 100644 lib/plugins/authplain/lang/mg/lang.php create mode 100644 lib/plugins/authplain/lang/mk/lang.php create mode 100644 lib/plugins/authplain/lang/mr/lang.php create mode 100644 lib/plugins/authplain/lang/ms/lang.php create mode 100644 lib/plugins/authplain/lang/ne/lang.php create mode 100644 lib/plugins/authplain/lang/nl/lang.php create mode 100644 lib/plugins/authplain/lang/no/lang.php create mode 100644 lib/plugins/authplain/lang/pl/lang.php create mode 100644 lib/plugins/authplain/lang/pt-br/lang.php create mode 100644 lib/plugins/authplain/lang/pt/lang.php create mode 100644 lib/plugins/authplain/lang/ro/lang.php create mode 100644 lib/plugins/authplain/lang/ru/lang.php create mode 100644 lib/plugins/authplain/lang/sk/lang.php create mode 100644 lib/plugins/authplain/lang/sl/lang.php create mode 100644 lib/plugins/authplain/lang/sq/lang.php create mode 100644 lib/plugins/authplain/lang/sr/lang.php create mode 100644 lib/plugins/authplain/lang/sv/lang.php create mode 100644 lib/plugins/authplain/lang/th/lang.php create mode 100644 lib/plugins/authplain/lang/tr/lang.php create mode 100644 lib/plugins/authplain/lang/uk/lang.php create mode 100644 lib/plugins/authplain/lang/vi/lang.php create mode 100644 lib/plugins/authplain/lang/zh-tw/lang.php create mode 100644 lib/plugins/authplain/lang/zh/lang.php (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/auth.php b/lib/plugins/authplain/auth.php index b31c02fc8..bd46c61a7 100644 --- a/lib/plugins/authplain/auth.php +++ b/lib/plugins/authplain/auth.php @@ -134,7 +134,10 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { global $config_cascade; // user mustn't already exist - if($this->getUserData($user) !== false) return false; + if($this->getUserData($user) !== false) { + msg($this->getLang('userexists'), -1); + return false; + } $pass = auth_cryptPassword($pwd); @@ -144,16 +147,13 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { // prepare user line $userline = $this->_createUserLine($user, $pass, $name, $mail, $grps); - if(io_saveFile($config_cascade['plainauth.users']['default'], $userline, true)) { - $this->users[$user] = compact('pass', 'name', 'mail', 'grps'); - return $pwd; + if(!io_saveFile($config_cascade['plainauth.users']['default'], $userline, true)) { + msg($this->getLang('writefail'), -1); + return null; } - msg( - 'The '.$config_cascade['plainauth.users']['default']. - ' file is not writable. Please inform the Wiki-Admin', -1 - ); - return null; + $this->users[$user] = compact('pass', 'name', 'mail', 'grps'); + return $pwd; } /** @@ -169,7 +169,10 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { global $config_cascade; // sanity checks, user must already exist and there must be something to change - if(($userinfo = $this->getUserData($user)) === false) return false; + if(($userinfo = $this->getUserData($user)) === false) { + msg($this->getLang('usernotexists'), -1); + return false; + } if(!is_array($changes) || !count($changes)) return true; // update userinfo with new data, remembering to encrypt any password @@ -186,13 +189,14 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { $userline = $this->_createUserLine($newuser, $userinfo['pass'], $userinfo['name'], $userinfo['mail'], $userinfo['grps']); if(!$this->deleteUsers(array($user))) { - msg('Unable to modify user data. Please inform the Wiki-Admin', -1); + msg($this->getLang('writefail'), -1); return false; } if(!io_saveFile($config_cascade['plainauth.users']['default'], $userline, true)) { msg('There was an error modifying your user data. You should register again.', -1); // FIXME, user has been deleted but not recreated, should force a logout and redirect to login page + // Should replace the delete/save hybrid modify with an atomic io_replaceInFile $ACT = 'register'; return false; } @@ -223,7 +227,10 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { if(empty($deleted)) return 0; $pattern = '/^('.join('|', $deleted).'):/'; - io_deleteFromFile($config_cascade['plainauth.users']['default'], $pattern, true); + if (!io_deleteFromFile($config_cascade['plainauth.users']['default'], $pattern, true)) { + msg($this->getLang('writefail'), -1); + return 0; + } // reload the user list and count the difference $count = count($this->users); @@ -407,4 +414,4 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { $this->_pattern[$item] = '/'.str_replace('/', '\/', $pattern).'/i'; // allow regex characters } } -} \ No newline at end of file +} diff --git a/lib/plugins/authplain/lang/af/lang.php b/lib/plugins/authplain/lang/af/lang.php new file mode 100644 index 000000000..29742cfd2 --- /dev/null +++ b/lib/plugins/authplain/lang/af/lang.php @@ -0,0 +1,6 @@ + Date: Thu, 7 May 2015 14:27:00 -0400 Subject: Use io_replaceInFile for updating auth --- lib/plugins/authplain/auth.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/auth.php b/lib/plugins/authplain/auth.php index b31c02fc8..35cf7a802 100644 --- a/lib/plugins/authplain/auth.php +++ b/lib/plugins/authplain/auth.php @@ -185,14 +185,9 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { $userline = $this->_createUserLine($newuser, $userinfo['pass'], $userinfo['name'], $userinfo['mail'], $userinfo['grps']); - if(!$this->deleteUsers(array($user))) { - msg('Unable to modify user data. Please inform the Wiki-Admin', -1); - return false; - } - - if(!io_saveFile($config_cascade['plainauth.users']['default'], $userline, true)) { - msg('There was an error modifying your user data. You should register again.', -1); - // FIXME, user has been deleted but not recreated, should force a logout and redirect to login page + if(!io_replaceInFile($config_cascade['plainauth.users']['default'], '/^'.$user.':/', $userline, true)) { + msg('There was an error modifying your user data. You may need to register again.', -1); + // FIXME, io functions should be fail-safe so existing data isn't lost $ACT = 'register'; return false; } -- cgit v1.2.3 From 2e206e75efe39d8e8d038606d2f4998d7a5e440a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 26 Jul 2015 16:29:31 +0100 Subject: updated dates in various info.txt files --- lib/plugins/authplain/plugin.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/plugin.info.txt b/lib/plugins/authplain/plugin.info.txt index 2659ac7ad..c09dbcb34 100644 --- a/lib/plugins/authplain/plugin.info.txt +++ b/lib/plugins/authplain/plugin.info.txt @@ -1,7 +1,7 @@ base authplain author Andreas Gohr email andi@splitbrain.org -date 2014-07-01 +date 2015-07-18 name Plain Auth Plugin desc Provides user authentication against DokuWiki's local password storage url http://www.dokuwiki.org/plugin:authplain -- cgit v1.2.3 From bc8a3531ce749ec8e8c126fb04d84a30a091dd73 Mon Sep 17 00:00:00 2001 From: Hideaki SAWADA Date: Wed, 29 Jul 2015 08:31:11 +0200 Subject: translation update --- lib/plugins/authplain/lang/ja/lang.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/lang/ja/lang.php b/lib/plugins/authplain/lang/ja/lang.php index aad08a8bd..6aa0be79c 100644 --- a/lib/plugins/authplain/lang/ja/lang.php +++ b/lib/plugins/authplain/lang/ja/lang.php @@ -1,6 +1,10 @@ */ -$lang['userexists'] = 'このユーザー名は既に存在しています。'; +$lang['userexists'] = 'このユーザー名は既に存在しています。'; +$lang['usernotexists'] = 'このユーザーは未登録です。'; +$lang['writefail'] = 'ユーザーデータを変更できません。管理者に問い合わせてください。'; -- cgit v1.2.3 From a0d2e3e98fe4e16dc1fa3ddaa4622a3373eb75ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carbain=20Fr=C3=A9d=C3=A9ric?= Date: Wed, 29 Jul 2015 17:01:36 +0200 Subject: translation update --- lib/plugins/authplain/lang/fr/lang.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/lang/fr/lang.php b/lib/plugins/authplain/lang/fr/lang.php index 9316836e4..9df04bba6 100644 --- a/lib/plugins/authplain/lang/fr/lang.php +++ b/lib/plugins/authplain/lang/fr/lang.php @@ -1,6 +1,9 @@ */ -$lang['userexists'] = 'Désolé, ce nom d\'utilisateur est déjà pris.'; +$lang['userexists'] = 'Désolé, ce nom d\'utilisateur est déjà pris.'; +$lang['usernotexists'] = 'Désolé, cet utilisateur n\'existe pas.'; -- cgit v1.2.3 From dbfd2a2c7bb8cab263b1e64c75a85ea93d6e0b60 Mon Sep 17 00:00:00 2001 From: Kiril Date: Wed, 29 Jul 2015 18:31:07 +0200 Subject: translation update --- lib/plugins/authplain/lang/bg/lang.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/lang/bg/lang.php b/lib/plugins/authplain/lang/bg/lang.php index 5b8e6bc37..62e62dc13 100644 --- a/lib/plugins/authplain/lang/bg/lang.php +++ b/lib/plugins/authplain/lang/bg/lang.php @@ -1,6 +1,9 @@ */ -$lang['userexists'] = 'Вече съществува потребител с избраното име.'; +$lang['userexists'] = 'Вече съществува потребител с избраното име.'; +$lang['usernotexists'] = 'За съжаление потребителят не съществува.'; -- cgit v1.2.3 From a4fb25f78eda9f7ef1442a800ed0956a9a4e4101 Mon Sep 17 00:00:00 2001 From: hung nguyen Date: Thu, 30 Jul 2015 03:05:29 +0200 Subject: translation update --- lib/plugins/authplain/lang/vi/lang.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/lang/vi/lang.php b/lib/plugins/authplain/lang/vi/lang.php index 7ecb0a27c..f384949b7 100644 --- a/lib/plugins/authplain/lang/vi/lang.php +++ b/lib/plugins/authplain/lang/vi/lang.php @@ -1,6 +1,7 @@ Date: Thu, 30 Jul 2015 10:11:08 +0200 Subject: translation update --- lib/plugins/authplain/lang/nl/lang.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/lang/nl/lang.php b/lib/plugins/authplain/lang/nl/lang.php index 1a5397234..56ba2ab90 100644 --- a/lib/plugins/authplain/lang/nl/lang.php +++ b/lib/plugins/authplain/lang/nl/lang.php @@ -1,6 +1,10 @@ */ -$lang['userexists'] = 'Er bestaat al een gebruiker met deze loginnaam.'; +$lang['userexists'] = 'Er bestaat al een gebruiker met deze loginnaam.'; +$lang['usernotexists'] = 'Sorry, deze gebruiker bestaat niet.'; +$lang['writefail'] = 'Onmogelijk om de gebruikers data te wijzigen. Gelieve de Wiki-Admin te informeren.'; -- cgit v1.2.3 From 6d47ad6be813e87dc731b9eb0348508dd9cab941 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 30 Jul 2015 13:45:23 +0200 Subject: Revert "Translation update (vi)" --- lib/plugins/authplain/lang/vi/lang.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/lang/vi/lang.php b/lib/plugins/authplain/lang/vi/lang.php index f384949b7..7ecb0a27c 100644 --- a/lib/plugins/authplain/lang/vi/lang.php +++ b/lib/plugins/authplain/lang/vi/lang.php @@ -1,7 +1,6 @@ Date: Thu, 30 Jul 2015 14:51:33 +0200 Subject: translation update --- lib/plugins/authplain/lang/pt/lang.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/lang/pt/lang.php b/lib/plugins/authplain/lang/pt/lang.php index c49649d4e..26d4180c5 100644 --- a/lib/plugins/authplain/lang/pt/lang.php +++ b/lib/plugins/authplain/lang/pt/lang.php @@ -1,6 +1,9 @@ */ -$lang['userexists'] = 'Este utilizador já está inscrito. Por favor escolha outro nome de utilizador.'; +$lang['userexists'] = 'Este utilizador já está inscrito. Por favor escolha outro nome de utilizador.'; +$lang['usernotexists'] = 'Desculpe, esse login não existe.'; -- cgit v1.2.3 From 7e9637146fa03b75eb1e5fc1e7d34d9c3d10ba4e Mon Sep 17 00:00:00 2001 From: "controlonline.net" Date: Thu, 30 Jul 2015 15:45:54 +0200 Subject: translation update --- lib/plugins/authplain/lang/ca/lang.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/lang/ca/lang.php b/lib/plugins/authplain/lang/ca/lang.php index 5a675639d..8cbada1b9 100644 --- a/lib/plugins/authplain/lang/ca/lang.php +++ b/lib/plugins/authplain/lang/ca/lang.php @@ -1,6 +1,7 @@ Date: Thu, 30 Jul 2015 15:47:11 +0200 Subject: translation update --- lib/plugins/authplain/lang/ko/lang.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/lang/ko/lang.php b/lib/plugins/authplain/lang/ko/lang.php index de5a7c02f..50669822e 100644 --- a/lib/plugins/authplain/lang/ko/lang.php +++ b/lib/plugins/authplain/lang/ko/lang.php @@ -1,6 +1,10 @@ */ -$lang['userexists'] = '죄송하지만 같은 이름을 사용하는 사용자가 있습니다.'; +$lang['userexists'] = '죄송하지만 같은 이름을 사용하는 사용자가 있습니다.'; +$lang['usernotexists'] = '죄송하지만 해당 사용자가 존재하지 않습니다.'; +$lang['writefail'] = '사용자 데이터를 수정할 수 없습니다. 위키 관리자에게 문의하시기 바랍니다'; -- cgit v1.2.3 From eba74aed310c86e7714ef36a4e31c20476b7f5e6 Mon Sep 17 00:00:00 2001 From: Nicolas Friedli Date: Thu, 30 Jul 2015 17:21:11 +0200 Subject: translation update --- lib/plugins/authplain/lang/fr/lang.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/lang/fr/lang.php b/lib/plugins/authplain/lang/fr/lang.php index 9df04bba6..362e03bff 100644 --- a/lib/plugins/authplain/lang/fr/lang.php +++ b/lib/plugins/authplain/lang/fr/lang.php @@ -4,6 +4,8 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Carbain Frédéric + * @author Nicolas Friedli */ $lang['userexists'] = 'Désolé, ce nom d\'utilisateur est déjà pris.'; $lang['usernotexists'] = 'Désolé, cet utilisateur n\'existe pas.'; +$lang['writefail'] = 'Impossible de modifier les données utilisateur. Merci d\'en informer l\'administrateur du wiki.'; -- cgit v1.2.3 From 7b68a313ff0e92802cd196d03c5ebed2728f2691 Mon Sep 17 00:00:00 2001 From: Mete Cuma Date: Thu, 30 Jul 2015 22:30:56 +0200 Subject: translation update --- lib/plugins/authplain/lang/tr/lang.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/lang/tr/lang.php b/lib/plugins/authplain/lang/tr/lang.php index d7064e8bf..6111085c2 100644 --- a/lib/plugins/authplain/lang/tr/lang.php +++ b/lib/plugins/authplain/lang/tr/lang.php @@ -1,6 +1,7 @@ Date: Wed, 5 Aug 2015 14:01:17 +0200 Subject: translation update --- lib/plugins/authplain/lang/zh/lang.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/lang/zh/lang.php b/lib/plugins/authplain/lang/zh/lang.php index 03542fe72..3dcebd28d 100644 --- a/lib/plugins/authplain/lang/zh/lang.php +++ b/lib/plugins/authplain/lang/zh/lang.php @@ -1,6 +1,10 @@ */ -$lang['userexists'] = '对不起,该用户名已经存在。'; +$lang['userexists'] = '对不起,该用户名已经存在。'; +$lang['usernotexists'] = '抱歉,该用户不存在'; +$lang['writefail'] = '无法修改用户数据。请联系维基管理员'; -- cgit v1.2.3 From dde14d5d482920ad26d3bb76876fd3842b85f687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederico=20Gon=C3=A7alves=20Guimar=C3=A3es?= Date: Wed, 5 Aug 2015 22:31:11 +0200 Subject: translation update --- lib/plugins/authplain/lang/pt-br/lang.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/lang/pt-br/lang.php b/lib/plugins/authplain/lang/pt-br/lang.php index 3a9b67218..654ec2b80 100644 --- a/lib/plugins/authplain/lang/pt-br/lang.php +++ b/lib/plugins/authplain/lang/pt-br/lang.php @@ -1,6 +1,10 @@ */ -$lang['userexists'] = 'Desculpe, mas já existe um usuário com esse nome.'; +$lang['userexists'] = 'Desculpe, mas já existe um usuário com esse nome.'; +$lang['usernotexists'] = 'Desculpe, mas esse usuário não existe.'; +$lang['writefail'] = 'Não foi possível modificar os dados do usuário. Por favor, informe ao administrador do Wiki.'; -- cgit v1.2.3 From 937959a1cc835709ee811f78c86d1fc28f07b74e Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 6 Aug 2015 10:51:11 +0200 Subject: translation update --- lib/plugins/authplain/lang/de/lang.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/lang/de/lang.php b/lib/plugins/authplain/lang/de/lang.php index f1d484947..b0cff0068 100644 --- a/lib/plugins/authplain/lang/de/lang.php +++ b/lib/plugins/authplain/lang/de/lang.php @@ -1,6 +1,10 @@ */ -$lang['userexists'] = 'Der Benutzername existiert leider schon.'; +$lang['userexists'] = 'Der Benutzername existiert leider schon.'; +$lang['usernotexists'] = 'Dieser Benutzer existiert nicht.'; +$lang['writefail'] = 'Kann Benutzerdaten nicht ändern. Bitte informieren Sie den Wiki-Administratoren'; -- cgit v1.2.3 From 5435cf9e106ef04804ac90ffcb2ed3d88e0229fb Mon Sep 17 00:00:00 2001 From: Domingo Redal Date: Fri, 7 Aug 2015 18:41:44 +0200 Subject: translation update --- lib/plugins/authplain/lang/es/lang.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authplain') diff --git a/lib/plugins/authplain/lang/es/lang.php b/lib/plugins/authplain/lang/es/lang.php index 8f03e79cb..8ef567a16 100644 --- a/lib/plugins/authplain/lang/es/lang.php +++ b/lib/plugins/authplain/lang/es/lang.php @@ -1,6 +1,10 @@ */ -$lang['userexists'] = 'Lo siento, ya existe un usuario con este nombre.'; +$lang['userexists'] = 'Lo siento, ya existe un usuario con este nombre.'; +$lang['usernotexists'] = 'Lo sentimos, no existe ese usuario.'; +$lang['writefail'] = 'No es posible modificar los datos del usuario. Por favor, informa al Administrador del Wiki'; -- cgit v1.2.3