From d6d855093f24c6c3f608d005189385959a7efbf7 Mon Sep 17 00:00:00 2001 From: DokuWiki Translation <> Date: Fri, 2 Aug 2013 00:30:58 +0200 Subject: translation update --- inc/lang/zh-tw/lang.php | 4 ++-- lib/plugins/acl/lang/zh-tw/lang.php | 7 +++---- lib/plugins/authad/lang/zh-tw/settings.php | 5 +++-- lib/plugins/authldap/lang/zh-tw/settings.php | 5 +++-- lib/plugins/authmysql/lang/zh-tw/settings.php | 5 +++-- lib/plugins/authpgsql/lang/zh-tw/settings.php | 5 +++-- lib/plugins/plugin/lang/zh-tw/lang.php | 8 ++++---- lib/plugins/popularity/lang/zh-tw/lang.php | 8 ++++---- lib/plugins/revert/lang/zh-tw/lang.php | 8 ++++---- lib/plugins/usermanager/lang/zh-tw/lang.php | 8 ++++---- 10 files changed, 33 insertions(+), 30 deletions(-) diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php index 0a3dbf51f..73b1bbcae 100644 --- a/inc/lang/zh-tw/lang.php +++ b/inc/lang/zh-tw/lang.php @@ -1,8 +1,8 @@ * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html diff --git a/lib/plugins/acl/lang/zh-tw/lang.php b/lib/plugins/acl/lang/zh-tw/lang.php index ff2c6a184..2173c9cf2 100644 --- a/lib/plugins/acl/lang/zh-tw/lang.php +++ b/lib/plugins/acl/lang/zh-tw/lang.php @@ -1,13 +1,12 @@ - * @author Li-Jiun Huang + * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San - * @author Li-Jiun Huang * @author Cheng-Wei Chien * @author Danny Lin * @author Shuo-Ting Jian diff --git a/lib/plugins/authad/lang/zh-tw/settings.php b/lib/plugins/authad/lang/zh-tw/settings.php index c46e5f96f..bd5d9413a 100644 --- a/lib/plugins/authad/lang/zh-tw/settings.php +++ b/lib/plugins/authad/lang/zh-tw/settings.php @@ -1,7 +1,8 @@ @my.domain.org'; diff --git a/lib/plugins/authldap/lang/zh-tw/settings.php b/lib/plugins/authldap/lang/zh-tw/settings.php index e93190516..d2513eeff 100644 --- a/lib/plugins/authldap/lang/zh-tw/settings.php +++ b/lib/plugins/authldap/lang/zh-tw/settings.php @@ -1,7 +1,8 @@ localhost) 或完整的 URL (ldap://server.tld:389)'; diff --git a/lib/plugins/authmysql/lang/zh-tw/settings.php b/lib/plugins/authmysql/lang/zh-tw/settings.php index 95d068150..3fbee151c 100644 --- a/lib/plugins/authmysql/lang/zh-tw/settings.php +++ b/lib/plugins/authmysql/lang/zh-tw/settings.php @@ -1,7 +1,8 @@ + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * + * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San - * @author Li-Jiun Huang * @author Cheng-Wei Chien * @author Danny Lin * @author Shuo-Ting Jian diff --git a/lib/plugins/popularity/lang/zh-tw/lang.php b/lib/plugins/popularity/lang/zh-tw/lang.php index b34efe995..bc7ceb11b 100644 --- a/lib/plugins/popularity/lang/zh-tw/lang.php +++ b/lib/plugins/popularity/lang/zh-tw/lang.php @@ -1,11 +1,11 @@ + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * + * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San - * @author Li-Jiun Huang * @author Cheng-Wei Chien * @author Danny Lin * @author Shuo-Ting Jian diff --git a/lib/plugins/revert/lang/zh-tw/lang.php b/lib/plugins/revert/lang/zh-tw/lang.php index 88a77f7a1..dc83d8c29 100644 --- a/lib/plugins/revert/lang/zh-tw/lang.php +++ b/lib/plugins/revert/lang/zh-tw/lang.php @@ -1,11 +1,11 @@ + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * + * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San - * @author Li-Jiun Huang * @author Cheng-Wei Chien * @author Danny Lin * @author Shuo-Ting Jian diff --git a/lib/plugins/usermanager/lang/zh-tw/lang.php b/lib/plugins/usermanager/lang/zh-tw/lang.php index 980d974cc..aa70e67c0 100644 --- a/lib/plugins/usermanager/lang/zh-tw/lang.php +++ b/lib/plugins/usermanager/lang/zh-tw/lang.php @@ -1,12 +1,12 @@ - * @author Li-Jiun Huang + * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San - * @author Li-Jiun Huang * @author Cheng-Wei Chien * @author Danny Lin * @author Shuo-Ting Jian -- cgit v1.2.3 From 8ae55d68448098e1830dc09f9e658fb534aa0dc6 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 2 Aug 2013 09:39:49 +0200 Subject: Revert "translation update" This reverts commit d6d855093f24c6c3f608d005189385959a7efbf7. I guess it was a bit too early to think straight :-/ --- inc/lang/zh-tw/lang.php | 4 ++-- lib/plugins/acl/lang/zh-tw/lang.php | 7 ++++--- lib/plugins/authad/lang/zh-tw/settings.php | 5 ++--- lib/plugins/authldap/lang/zh-tw/settings.php | 5 ++--- lib/plugins/authmysql/lang/zh-tw/settings.php | 5 ++--- lib/plugins/authpgsql/lang/zh-tw/settings.php | 5 ++--- lib/plugins/plugin/lang/zh-tw/lang.php | 8 ++++---- lib/plugins/popularity/lang/zh-tw/lang.php | 8 ++++---- lib/plugins/revert/lang/zh-tw/lang.php | 8 ++++---- lib/plugins/usermanager/lang/zh-tw/lang.php | 8 ++++---- 10 files changed, 30 insertions(+), 33 deletions(-) diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php index 73b1bbcae..0a3dbf51f 100644 --- a/inc/lang/zh-tw/lang.php +++ b/inc/lang/zh-tw/lang.php @@ -1,8 +1,8 @@ * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html diff --git a/lib/plugins/acl/lang/zh-tw/lang.php b/lib/plugins/acl/lang/zh-tw/lang.php index 2173c9cf2..ff2c6a184 100644 --- a/lib/plugins/acl/lang/zh-tw/lang.php +++ b/lib/plugins/acl/lang/zh-tw/lang.php @@ -1,12 +1,13 @@ - * @author Li-Jiun Huang + * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San + * @author Li-Jiun Huang * @author Cheng-Wei Chien * @author Danny Lin * @author Shuo-Ting Jian diff --git a/lib/plugins/authad/lang/zh-tw/settings.php b/lib/plugins/authad/lang/zh-tw/settings.php index bd5d9413a..c46e5f96f 100644 --- a/lib/plugins/authad/lang/zh-tw/settings.php +++ b/lib/plugins/authad/lang/zh-tw/settings.php @@ -1,8 +1,7 @@ @my.domain.org'; diff --git a/lib/plugins/authldap/lang/zh-tw/settings.php b/lib/plugins/authldap/lang/zh-tw/settings.php index d2513eeff..e93190516 100644 --- a/lib/plugins/authldap/lang/zh-tw/settings.php +++ b/lib/plugins/authldap/lang/zh-tw/settings.php @@ -1,8 +1,7 @@ localhost) 或完整的 URL (ldap://server.tld:389)'; diff --git a/lib/plugins/authmysql/lang/zh-tw/settings.php b/lib/plugins/authmysql/lang/zh-tw/settings.php index 3fbee151c..95d068150 100644 --- a/lib/plugins/authmysql/lang/zh-tw/settings.php +++ b/lib/plugins/authmysql/lang/zh-tw/settings.php @@ -1,8 +1,7 @@ + * Chinese Traditional language file + * + * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San + * @author Li-Jiun Huang * @author Cheng-Wei Chien * @author Danny Lin * @author Shuo-Ting Jian diff --git a/lib/plugins/popularity/lang/zh-tw/lang.php b/lib/plugins/popularity/lang/zh-tw/lang.php index bc7ceb11b..b34efe995 100644 --- a/lib/plugins/popularity/lang/zh-tw/lang.php +++ b/lib/plugins/popularity/lang/zh-tw/lang.php @@ -1,11 +1,11 @@ + * Chinese Traditional language file + * + * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San + * @author Li-Jiun Huang * @author Cheng-Wei Chien * @author Danny Lin * @author Shuo-Ting Jian diff --git a/lib/plugins/revert/lang/zh-tw/lang.php b/lib/plugins/revert/lang/zh-tw/lang.php index dc83d8c29..88a77f7a1 100644 --- a/lib/plugins/revert/lang/zh-tw/lang.php +++ b/lib/plugins/revert/lang/zh-tw/lang.php @@ -1,11 +1,11 @@ + * Chinese Traditional language file + * + * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San + * @author Li-Jiun Huang * @author Cheng-Wei Chien * @author Danny Lin * @author Shuo-Ting Jian diff --git a/lib/plugins/usermanager/lang/zh-tw/lang.php b/lib/plugins/usermanager/lang/zh-tw/lang.php index aa70e67c0..980d974cc 100644 --- a/lib/plugins/usermanager/lang/zh-tw/lang.php +++ b/lib/plugins/usermanager/lang/zh-tw/lang.php @@ -1,12 +1,12 @@ - * @author Li-Jiun Huang + * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San + * @author Li-Jiun Huang * @author Cheng-Wei Chien * @author Danny Lin * @author Shuo-Ting Jian -- cgit v1.2.3 From 8331f1f44822f6bac623baab10d76fdf6e64b3f7 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 2 Aug 2013 11:10:31 +0200 Subject: FS#2802 correctly fix tar tests When the DokuWiki install was in a deep namespace, the used path name could land in the >100 char limit and trigger ustar format where the filename and directory name are split. This would fail the test. --- _test/tests/inc/tar.test.php | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/_test/tests/inc/tar.test.php b/_test/tests/inc/tar.test.php index 50664cfc3..9801ca1e0 100644 --- a/_test/tests/inc/tar.test.php +++ b/_test/tests/inc/tar.test.php @@ -25,11 +25,17 @@ class Tar_TestCase extends DokuWikiTest { $this->assertTrue(strpos($data, 'testcontent2') !== false, 'Content in TAR'); $this->assertTrue(strpos($data, 'testcontent3') !== false, 'Content in TAR'); - $this->assertTrue(strpos($data, "$tdir/testdata1.txt") !== false, 'Path in TAR'); + // fullpath might be too long to be stored as full path FS#2802 + $this->assertTrue(strpos($data, "$tdir") !== false, 'Path in TAR'); + $this->assertTrue(strpos($data, "testdata1.txt") !== false, 'File in TAR'); + $this->assertTrue(strpos($data, 'noway/testdata2.txt') !== false, 'Path in TAR'); $this->assertTrue(strpos($data, 'another/testdata3.txt') !== false, 'Path in TAR'); - $this->assertTrue(strpos($data, "$tdir/foobar/testdata2.txt") === false, 'Path not in TAR'); + // fullpath might be too long to be stored as full path FS#2802 + $this->assertTrue(strpos($data, "$tdir/foobar") === false, 'Path not in TAR'); + $this->assertTrue(strpos($data, "foobar.txt") === false, 'File not in TAR'); + $this->assertTrue(strpos($data, "foobar") === false, 'Path not in TAR'); } @@ -59,11 +65,17 @@ class Tar_TestCase extends DokuWikiTest { $this->assertTrue(strpos($data, 'testcontent2') !== false, 'Content in TAR'); $this->assertTrue(strpos($data, 'testcontent3') !== false, 'Content in TAR'); - $this->assertTrue(strpos($data, "$tdir/testdata1.txt") !== false, 'Path in TAR'); + // fullpath might be too long to be stored as full path FS#2802 + $this->assertTrue(strpos($data, "$tdir") !== false, 'Path in TAR'); + $this->assertTrue(strpos($data, "testdata1.txt") !== false, 'File in TAR'); + $this->assertTrue(strpos($data, 'noway/testdata2.txt') !== false, 'Path in TAR'); $this->assertTrue(strpos($data, 'another/testdata3.txt') !== false, 'Path in TAR'); - $this->assertTrue(strpos($data, "$tdir/foobar/testdata2.txt") === false, 'Path not in TAR'); + // fullpath might be too long to be stored as full path FS#2802 + $this->assertTrue(strpos($data, "$tdir/foobar") === false, 'Path not in TAR'); + $this->assertTrue(strpos($data, "foobar.txt") === false, 'File not in TAR'); + $this->assertTrue(strpos($data, "foobar") === false, 'Path not in TAR'); @unlink($tmp); -- cgit v1.2.3 From 363c0a9eb7c11cf712293630c861febb907ce17f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 2 Aug 2013 10:49:52 +0100 Subject: small fix for pagetools in RTL languages --- lib/tpl/dokuwiki/css/pagetools.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css index 7ce7de3cf..98e4ff1fc 100644 --- a/lib/tpl/dokuwiki/css/pagetools.css +++ b/lib/tpl/dokuwiki/css/pagetools.css @@ -175,7 +175,7 @@ background-position: right -135px; } [dir=rtl] #dokuwiki__pagetools ul li a.edit { - background-position: left 0; + background-position: left -90px; } [dir=rtl] #dokuwiki__pagetools ul li a.edit:hover, [dir=rtl] #dokuwiki__pagetools ul li a.edit:active, -- cgit v1.2.3