From 8e0ecb0ebdfb0f02f4bedb712a8f4749e1dfb4f9 Mon Sep 17 00:00:00 2001 From: joey Date: Fri, 12 Jan 2007 21:07:07 +0000 Subject: [PATCH 01/16] first pass --- doc/patchqueue/move_page.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/patchqueue/move_page.mdwn b/doc/patchqueue/move_page.mdwn index d7bc33e2a..e3109f062 100644 --- a/doc/patchqueue/move_page.mdwn +++ b/doc/patchqueue/move_page.mdwn @@ -21,6 +21,12 @@ A bunch of obvious shortcomings exist: Anyhow, here's the patch, for whatever good it does. +> Looks like a good start, although I agree about many of the points above, +> and also feel that something needs to be done about rcses that don't +> implement a move operation -- falling back to an add and delete. +> --[[Joey]] + + diff -urx .svn ikiwiki/IkiWiki/CGI.pm ikiwiki-new/IkiWiki/CGI.pm --- ikiwiki/IkiWiki/CGI.pm 2007-01-04 03:52:47.000000000 -0800 +++ ikiwiki-new/IkiWiki/CGI.pm 2007-01-11 18:49:37.000000000 -0800 -- 2.39.5 From a4e63b934128e03bd66de23920e51076faf89a92 Mon Sep 17 00:00:00 2001 From: joey Date: Fri, 12 Jan 2007 21:21:51 +0000 Subject: [PATCH 02/16] web commit by http://ptecza.myopenid.com/: Response --- doc/bugs/Problem_with_editing_page_after_first_SVN_commit.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/bugs/Problem_with_editing_page_after_first_SVN_commit.mdwn b/doc/bugs/Problem_with_editing_page_after_first_SVN_commit.mdwn index 04ecd4417..5819d49d7 100644 --- a/doc/bugs/Problem_with_editing_page_after_first_SVN_commit.mdwn +++ b/doc/bugs/Problem_with_editing_page_after_first_SVN_commit.mdwn @@ -115,3 +115,6 @@ Where is my mistake? >>>>>>> Ugh, root? My permissions setup is simple, ikiwiki runs as a single >>>>>>> user, and that same user can commit to the svn repo and write to >>>>>>> all files. --[[Joey]] + +>>>>>>>> What's your user? Please show me result of `ls -ld dir` for +>>>>>>>> directories above :) --Pawel -- 2.39.5 From 42140a88fd366437faa25f8206f995c3a88e3662 Mon Sep 17 00:00:00 2001 From: joey Date: Fri, 12 Jan 2007 21:22:28 +0000 Subject: [PATCH 03/16] recentchanges currently showing full paths also removed some cruft in discussion page --- doc/index/discussion.mdwn | 56 ++----------------- .../full_paths_in_recentchanges.mdwn | 15 +++++ 2 files changed, 21 insertions(+), 50 deletions(-) create mode 100644 doc/patchqueue/full_paths_in_recentchanges.mdwn diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn index 2e3868429..25723ec55 100644 --- a/doc/index/discussion.mdwn +++ b/doc/index/discussion.mdwn @@ -85,40 +85,6 @@ easily, perl is possible (but I'm not strong in perl). ---- -# OpenID - -I just figured I'd edit something on the page with my OpenID, since you've implemented it! --*[Kyle](http://kitenet.net/~kyle/)*= - -> Kyle, If you like openid, I can switch your personal wiki over to use your openid. --[[Joey]] - ----- - -# ACL - -> Moved to [[todo/ACL]] --[[Joey]] - ----- - -Some questions about the RecentChanges function. -- Ethan - -> (Moved to [[todo/recentchanges]] --[[Joey]]) - ----- - -Also, I'd like to request another template parameter which is just -$config{url}. That way you won't have to hard-code the URL of the wiki into -the template. -- Ethan - -> That's already available in the BASEURL parameter. --[[Joey]] - ----- - -# Canonical feed location? - -Moved to [[todo/canonical_feed_location]] --[[Joey]] - ----- - # asciidoc or txt2tags ? Any plugins or support for using asciidoc or txt2tags as the wiki language and/or exporting to asciidoc or txt2tags? @@ -184,12 +150,6 @@ Any setting for limiting how many kilobytes can be submitted via the "edit" form ---- -# Disable sub-discussion pages? - -Moved to [[bugs]] -- [[Joey]] - ----- - # Access Keys Would anyone else find this a valuable addition. In oddmuse and instiki (the only other @@ -229,16 +189,6 @@ Ok, that's my last 2 cents for a while. --[Mazirian](http://mazirian.com) ---- -# Disable build/install requirement on PerlMagick - -Some installs of PerlMagick require X11. I tried to first disable using "img" by using "--disable-plugin img" -in the Makefile. But still failed. My workaround was to remove "img" from the bundle in IkiWiki/Plugin/goodstuff.pm -before building. What is the recommended way to install ikiwiki without "img" support? --[[JeremyReed]] - -> I've fixed this in svn so plugins in goodstuff can be disabled. --[[Joey]] - ----- - # Documentation for banning users? The [[todo]] page says admins can ban users. Where is this documented? I search the source and found @@ -277,6 +227,12 @@ or the path to the sub-page. I think this is handled by the htmllink() routine. >> user's browser. I hate these pages. So I propose to display a list of >> changed pages in a column, not in a row. --Pawel +>>> Well, it's a simple [[patch|patchqueue/full_paths_in_recentchanges]]. +>>> For a limited time I have that patch running on this wiki. Undecided if +>>> I like it or not; the width is not really a problem due to the design +>>> of the recentchanges page, but all those paths do clutter up the page +>>> somewhat. Comments? --[[Joey]] + ---- # Should not create an existing page diff --git a/doc/patchqueue/full_paths_in_recentchanges.mdwn b/doc/patchqueue/full_paths_in_recentchanges.mdwn new file mode 100644 index 000000000..a42a2726b --- /dev/null +++ b/doc/patchqueue/full_paths_in_recentchanges.mdwn @@ -0,0 +1,15 @@ +For my own refrence --[[Joey]] + + Index: CGI.pm + =================================================================== + --- CGI.pm (revision 2225) + +++ CGI.pm (working copy) + @@ -92,7 +92,7 @@ + delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess; + $change->{pages} = [ + map { + - $_->{link} = htmllink("", "", $_->{page}, 1); + + $_->{link} = htmllink("", "", $_->{page}, 1, 0, pagetitle($_->{page})); + $_; + } @{$change->{pages}} + ]; -- 2.39.5 From e6eab3141fbc1962b5cddc590c2433f5739cd353 Mon Sep 17 00:00:00 2001 From: joey Date: Fri, 12 Jan 2007 21:32:34 +0000 Subject: [PATCH 04/16] docs for page locking --- doc/page_locking.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/page_locking.mdwn diff --git a/doc/page_locking.mdwn b/doc/page_locking.mdwn new file mode 100644 index 000000000..01c687169 --- /dev/null +++ b/doc/page_locking.mdwn @@ -0,0 +1,16 @@ +The administrator of a wiki can choose to lock some pages, which allows +only the admin to edit them using the online interface. This doesn't +prevent anyone who can commit to the underlying revision control system +from editing the pages, however. + +To lock a page, log into the wiki as whatever user is configured as the +admin, and in your Preferences page, you'll find a field listing locked +pages. This is a [[PageSpec]], so you have a fair bit of control over what +kinds of pages to lock. For example, you could choose to lock all pages +created before 2006, or all pages that are linked to from the page named +"locked". More usually though, you'll just list some names of pages to lock. + +One handy thing to do if you're using ikiwiki for your blog is to lock +"* and !*/Discussion". This prevents others from adding to or modifying +posts in your blog, while still letting them comment via the Discussion +pages. -- 2.39.5 From 13d19064b9d107637373b0a25fa65c2311652e6d Mon Sep 17 00:00:00 2001 From: joey Date: Fri, 12 Jan 2007 21:33:24 +0000 Subject: [PATCH 05/16] locking and banning now documented --- doc/index/discussion.mdwn | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn index 25723ec55..0336e8342 100644 --- a/doc/index/discussion.mdwn +++ b/doc/index/discussion.mdwn @@ -5,6 +5,8 @@ Do so here.. Note that for more formal bug reports or todo items, you can also edit the [[bugs]] and [[todo]] pages. +[[toc ]] + # Installation/Setup questions I have just installed ikiwiki and it works - at least I have the example index.mdwn page @@ -189,28 +191,6 @@ Ok, that's my last 2 cents for a while. --[Mazirian](http://mazirian.com) ---- -# Documentation for banning users? - -The [[todo]] page says admins can ban users. Where is this documented? I search the source and found -set\_banned\_users() which led me to the CGI "preferences" form for the admin. Now logged in as an admin (as defined in my setup configuration), -I see the field for this. But no details on how to use it. From the source it appears to be a space-delimited list of usernames. (I didn't test yet.) - -Can you please provide a [[/banned_users]] documentation about "banning" users function linked from the [[Features]] page and maybe [[security]] page and linked from the "preferences" for the admin? -(I don't do this myself as I am unsure about this and still reading the code about banning users.) - ----- - -# Documentation for locking pages? - -The [[features]] page, the [[todo]] page and the [[usage]] manual page say pages can be locked and only the admin can edit locked pages. -Where is locking pages documented? ... A moment later, from searching source I found this is configured via the preferences for the admin -and that links to [[pagespec]]. - -Can you please provide a [[/page_locking]] doc about locking pages linked from the [[features]] page and elsewhere? And have that link to [[pagespec]]? -(I don't do this myself as I am unsure about this and still reading the code about locking pages.) - ----- - # RecentChanges should show path to wiki sub-pages? The RecentChanges only shows the final file name for the recently changes file, -- 2.39.5 From 37b7aff284eddfa29a5069d07c22732face3373e Mon Sep 17 00:00:00 2001 From: joey Date: Fri, 12 Jan 2007 21:36:26 +0000 Subject: [PATCH 06/16] response --- doc/bugs/Problem_with_editing_page_after_first_SVN_commit.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/Problem_with_editing_page_after_first_SVN_commit.mdwn b/doc/bugs/Problem_with_editing_page_after_first_SVN_commit.mdwn index 5819d49d7..b70183ced 100644 --- a/doc/bugs/Problem_with_editing_page_after_first_SVN_commit.mdwn +++ b/doc/bugs/Problem_with_editing_page_after_first_SVN_commit.mdwn @@ -118,3 +118,5 @@ Where is my mistake? >>>>>>>> What's your user? Please show me result of `ls -ld dir` for >>>>>>>> directories above :) --Pawel + +>>>>>>>>> All my directories are 755 joey:joey. --[[Joey]] -- 2.39.5 From 8cb8d7858abfaca3d99239f41d06311ee52eb511 Mon Sep 17 00:00:00 2001 From: joey Date: Sat, 13 Jan 2007 21:32:27 +0000 Subject: [PATCH 07/16] link --- doc/features.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/features.mdwn b/doc/features.mdwn index 966fea98f..b2c810f30 100644 --- a/doc/features.mdwn +++ b/doc/features.mdwn @@ -144,7 +144,8 @@ Thanks to subpages, every page can easily and automatically have a ### Page locking -Wiki admins can lock pages so that only other admins can edit them. +Wiki admins can [[lock_pages|page_locking]] so that only other admins +can edit them. ### [[PageHistory]] -- 2.39.5 From b695d6bdec4bd673a7b43f717258a9922a284d4a Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 14 Jan 2007 04:01:35 +0000 Subject: [PATCH 08/16] add translation --- debian/changelog | 3 +- po/vi.po | 383 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 385 insertions(+), 1 deletion(-) create mode 100644 po/vi.po diff --git a/debian/changelog b/debian/changelog index fa0ab16d4..799c03245 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (1.39) UNRELEASED; urgency=low * Add a Czech translation by Miroslav Kure. * Add a Bulgarian translation by Damyan Ivanov. Closes: #406580 * Add a Gujarati translation by Kartik Mistry. Closes: #406635 + * Add a Vietnamese translation by Clytie Siddall. * Fix encoding issue with use of Locale::Gettext. Seems that the OO interface returns proper utf-8 decoded strings, unlike the traditional interface, so use the OO interface. @@ -14,7 +15,7 @@ ikiwiki (1.39) UNRELEASED; urgency=low pointed elsewhere, so that only modified templates need to be copied into a templatedir. Based on work by JeremyReed. - -- Joey Hess Fri, 12 Jan 2007 15:34:14 -0500 + -- Joey Hess Sat, 13 Jan 2007 16:31:42 -0500 ikiwiki (1.38) unstable; urgency=low diff --git a/po/vi.po b/po/vi.po new file mode 100644 index 000000000..14df544ba --- /dev/null +++ b/po/vi.po @@ -0,0 +1,383 @@ +# Vietnamese translation for Iki Wiki. +# Copyright © 2007 Free Software Foundation, Inc. +# Clytie Siddall , 2007 +# +msgid "" +"" +msgstr "Project-Id-Version: ikiwiki\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-10 15:32-0500\n" +"PO-Revision-Date: 2007-01-13 15:31+1030\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.6fc1\n" + +#.translators: The first parameter is a page name, +#.translators: second is the user who locked it. +#: ../IkiWiki/CGI.pm:51 +#, perl-format +msgid "%s is locked by %s and cannot be edited" +msgstr "%s bị %s khoá nên không thể sửa được" + +#: ../IkiWiki/CGI.pm:141 +msgid "You need to log in first." +msgstr "Trước tiên bạn cần phải đăng nhập." + +#: ../IkiWiki/CGI.pm:259 +msgid "Preferences saved." +msgstr "Tùy thích đã được lưu." + +#: ../IkiWiki/CGI.pm:410 +#: ../IkiWiki/Plugin/inline.pm:162 +#: ../IkiWiki/Render.pm:97 +#: ../IkiWiki/Render.pm:161 +msgid "discussion" +msgstr "thảo luận" + +#: ../IkiWiki/CGI.pm:449 +#, perl-format +msgid "creating %s" +msgstr "đang tạo %s" + +#: ../IkiWiki/CGI.pm:466 +#: ../IkiWiki/CGI.pm:509 +#, perl-format +msgid "editing %s" +msgstr "đang sửa %s" + +#: ../IkiWiki/CGI.pm:626 +msgid "You are banned." +msgstr "Bạn bị cấm ra." + +#: ../IkiWiki/Plugin/aggregate.pm:61 +#, perl-format +msgid "aggregate plugin missing %s parameter" +msgstr "bổ sung tập hợp thiếu tham số %s" + +#: ../IkiWiki/Plugin/aggregate.pm:89 +msgid "new feed" +msgstr "nguồn tin mới" + +#: ../IkiWiki/Plugin/aggregate.pm:103 +msgid "posts" +msgstr "bài" + +#: ../IkiWiki/Plugin/aggregate.pm:105 +msgid "new" +msgstr "mới" + +#: ../IkiWiki/Plugin/aggregate.pm:206 +#, perl-format +msgid "expiring %s (%s days old)" +msgstr "đang mãn hạn %s (cũ %s ngày)" + +#: ../IkiWiki/Plugin/aggregate.pm:213 +#, perl-format +msgid "expiring %s" +msgstr "đang mãn hạn %s" + +#: ../IkiWiki/Plugin/aggregate.pm:236 +#, perl-format +msgid "checking feed %s ..." +msgstr "đang kiểm tra nguồn tin %s ..." + +#: ../IkiWiki/Plugin/aggregate.pm:241 +#, perl-format +msgid "could not find feed at %s" +msgstr "không tìm thấy nguồn tin ở %s" + +#: ../IkiWiki/Plugin/aggregate.pm:250 +msgid "feed crashed XML::Feed!" +msgstr "nguồn tin đã gây ra XML::Feed sụp đổ." + +#: ../IkiWiki/Plugin/aggregate.pm:273 +#, perl-format +msgid "processed ok at " +msgstr "đã xử lý được ở " + +#: ../IkiWiki/Plugin/aggregate.pm:314 +#, perl-format +msgid "creating new page %s" +msgstr "đang tạo trang mới %s" + +#: ../IkiWiki/Plugin/brokenlinks.pm:36 +msgid "There are no broken links!" +msgstr "Không có liên kết bị ngắt nào." + +#: ../IkiWiki/Plugin/fortune.pm:18 +msgid "fortune failed" +msgstr "fortune bị lỗi" + +#: ../IkiWiki/Plugin/googlecalendar.pm:22 +msgid "googlecalendar failed to find url in html" +msgstr "googlecalendar không tìm thấy địa chỉ URL trong mã HTML" + +#: ../IkiWiki/Plugin/inline.pm:37 +msgid "Must specify url to wiki with --url when using --rss or --atom" +msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --rss » hay « --atom »" + +#: ../IkiWiki/Plugin/inline.pm:97 +#, perl-format +msgid "unknown sort type %s" +msgstr "kiểu sắp xếp không rõ %s" + +#: ../IkiWiki/Plugin/inline.pm:370 +msgid "RPC::XML::Client not found, not pinging" +msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" + +#: ../IkiWiki/Plugin/linkmap.pm:99 +msgid "linkmap failed to run dot" +msgstr "linkmap không chạy dot được" + +#: ../IkiWiki/Plugin/mdwn.pm:37 +#, perl-format +msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" +msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » (%s)" + +#: ../IkiWiki/Plugin/mirrorlist.pm:23 +msgid "Mirrors" +msgstr "Nhân bản" + +#: ../IkiWiki/Plugin/mirrorlist.pm:23 +msgid "Mirror" +msgstr "Nhân bản" + +#: ../IkiWiki/Plugin/openid.pm:36 +msgid "What's this?" +msgstr "Cái này là gì?" + +#: ../IkiWiki/Plugin/openid.pm:37 +msgid "Get an OpenID" +msgstr "Lấy OpenID" + +#: ../IkiWiki/Plugin/orphans.pm:41 +msgid "All pages are linked to by other pages." +msgstr "Mọi trang được liên kết với trang khác." + +#: ../IkiWiki/Plugin/passwordauth.pm:104 +msgid "(use FirstnameLastName)" +msgstr "(dùng TênHọ)" + +#: ../IkiWiki/Plugin/passwordauth.pm:144 +msgid "Account creation successful. Now you can Login." +msgstr "Tài khoản đã được tạo. Lúc bây giờ bạn có thể đăng nhập." + +#: ../IkiWiki/Plugin/passwordauth.pm:147 +msgid "Error creating account." +msgstr "Gặp lỗi khi tạo tài khoản." + +#: ../IkiWiki/Plugin/passwordauth.pm:168 +msgid "Failed to send mail" +msgstr "Lỗi gửi thư" + +#: ../IkiWiki/Plugin/passwordauth.pm:170 +msgid "Your password has been emailed to you." +msgstr "Mật khẩu đã được gửi đính kèm thư cho bạn." + +#: ../IkiWiki/Plugin/poll.pm:64 +msgid "vote" +msgstr "bỏ phiếu" + +#: ../IkiWiki/Plugin/poll.pm:72 +msgid "Total votes:" +msgstr "Tổng số phiếu :" + +#: ../IkiWiki/Plugin/polygen.pm:32 +msgid "polygen not installed" +msgstr "chưa cài đặt polygen" + +#: ../IkiWiki/Plugin/polygen.pm:51 +msgid "polygen failed" +msgstr "lỗi polygen" + +#: ../IkiWiki/Plugin/search.pm:34 +#, perl-format +msgid "Must specify %s when using the search plugin" +msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm" + +#: ../IkiWiki/Plugin/search.pm:58 +msgid "cleaning hyperestraier search index" +msgstr "đang làm sạch chỉ mục tìm kiếm hyperestraier" + +#: ../IkiWiki/Plugin/search.pm:64 +msgid "updating hyperestraier search index" +msgstr "đang cập nhật chỉ mục tìm kiếm hyperestraier" + +#: ../IkiWiki/Plugin/shortcut.pm:24 +msgid "shortcut missing name or url parameter" +msgstr "lối tắt thiếu tên hay tham số url" + +#.translators: This is used to display what shortcuts are defined. +#.translators: First parameter is the name of the shortcut, the second +#.translators: is an URL. +#: ../IkiWiki/Plugin/shortcut.pm:33 +#, perl-format +msgid "shortcut %s points to %s" +msgstr "lối tắt %s chỉ tới %s" + +#: ../IkiWiki/Plugin/smiley.pm:22 +msgid "failed to parse any smileys, disabling plugin" +msgstr "lỗi phân tách hình cười nào nên tắt bổ sung" + +#: ../IkiWiki/Plugin/template.pm:19 +msgid "template missing id parameter" +msgstr "mẫu thiếu tham số id" + +#: ../IkiWiki/Plugin/template.pm:26 +#, perl-format +msgid "template %s not found" +msgstr "không tìm thấy mẫu %s" + +#: ../IkiWiki/Plugin/template.pm:45 +msgid "template failed to process:" +msgstr "mẫu không xử lý được:" + +#: ../IkiWiki/Rcs/Stub.pm:66 +msgid "getctime not implemented" +msgstr "chưa thực hiện getctime" + +#: ../IkiWiki/Rcs/svn.pm:206 +msgid "" +"REV is not set, not running from svn post-commit hook, cannot send " +"notifications" +msgstr "Chưa đặt REV, không chạy từ móc sau gài vào nên không thể gửi thông báo" + +#: ../IkiWiki/Render.pm:98 +msgid "Discussion" +msgstr "Thảo luận" + +#: ../IkiWiki/Render.pm:228 +#: ../IkiWiki/Render.pm:248 +#, perl-format +msgid "skipping bad filename %s" +msgstr "đang bỏ qua tên tập tin sai %s" + +#: ../IkiWiki/Render.pm:288 +#, perl-format +msgid "removing old page %s" +msgstr "đang gỡ bỏ trang cũ %s" + +#: ../IkiWiki/Render.pm:307 +#, perl-format +msgid "scanning %s" +msgstr "đang quét %s" + +#: ../IkiWiki/Render.pm:316 +#, perl-format +msgid "rendering %s" +msgstr "đang vẽ %s" + +#: ../IkiWiki/Render.pm:328 +#, perl-format +msgid "rendering %s, which links to %s" +msgstr "đang vẽ %s mà liên kết tới %s" + +#: ../IkiWiki/Render.pm:345 +#, perl-format +msgid "rendering %s, which depends on %s" +msgstr "đang vẽ %s mà phụ thuộc vào %s" + +#: ../IkiWiki/Render.pm:383 +#, perl-format +msgid "rendering %s, to update its backlinks" +msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" + +#: ../IkiWiki/Render.pm:395 +#, perl-format +msgid "removing %s, no longer rendered by %s" +msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" + +#: ../IkiWiki/Render.pm:421 +#, perl-format +msgid "ikiwiki: cannot render %s" +msgstr "ikiwiki: không thể vẽ %s" + +#.translators: The first parameter is a filename, and the second +#.translators: is a (probably not translated) error message. +#: ../IkiWiki/Setup.pm:15 +#, perl-format +msgid "cannot read %s: %s" +msgstr "không thể đọc %s: %s" + +#: ../IkiWiki/Setup/Standard.pm:32 +msgid "generating wrappers.." +msgstr "đang tạo ra các bộ bao bọc.." + +#: ../IkiWiki/Setup/Standard.pm:68 +msgid "rebuilding wiki.." +msgstr "đang xây dựng lại wiki.." + +#: ../IkiWiki/Setup/Standard.pm:71 +msgid "refreshing wiki.." +msgstr "đang làm tươi wiki.." + +#: ../IkiWiki/Setup/Standard.pm:80 +msgid "done" +msgstr "xong" + +#.translators: The three variables are the name of the wiki, +#.translators: A list of one or more pages that were changed, +#.translators: And the name of the user making the change. +#.translators: This is used as the subject of a commit email. +#: ../IkiWiki/UserInfo.pm:139 +#, perl-format +msgid "update of %s's %s by %s" +msgstr "cập nhật %2$s của %1$s bởi %3$s" + +#: ../IkiWiki/Wrapper.pm:16 +#, perl-format +msgid "%s doesn't seem to be executable" +msgstr "có vẻ là %s không phải có khả năng thực hiện" + +#: ../IkiWiki/Wrapper.pm:20 +msgid "cannot create a wrapper that uses a setup file" +msgstr "không thể tạo bộ bao bọc sử dụng tập tin thiết lập" + +#: ../IkiWiki/Wrapper.pm:24 +msgid "wrapper filename not specified" +msgstr "chưa xác định tên tập tin bộ bao bọc" + +#.translators: The first parameter is a filename, and the second is +#.translators: a (probably not translated) error message. +#: ../IkiWiki/Wrapper.pm:64 +#, perl-format +msgid "failed to write %s: %s" +msgstr "lỗi ghi %s: %s" + +#.translators: The parameter is a C filename. +#: ../IkiWiki/Wrapper.pm:100 +#, perl-format +msgid "failed to compile %s" +msgstr "lỗi biên dịch %s" + +#.translators: The parameter is a filename. +#: ../IkiWiki/Wrapper.pm:108 +#, perl-format +msgid "successfully generated %s\n" +msgstr "%s đã được tạo ra\n" + +#: ../ikiwiki.in:13 +msgid "usage: ikiwiki [options] source dest" +msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích" + +#: ../IkiWiki.pm:99 +msgid "Must specify url to wiki with --url when using --cgi" +msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »" + +#: ../IkiWiki.pm:144 +#: ../IkiWiki.pm:145 +msgid "Error" +msgstr "Lỗi" + +#.translators: The first parameter is a +#.translators: preprocessor directive name, +#.translators: the second a page name, the +#.translators: third a number. +#: ../IkiWiki.pm:524 +#, perl-format +msgid "%s preprocessing loop detected on %s at depth %i" +msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -- 2.39.5 From 5608aa078e5a11ff6fbe1adda65a209017b0b630 Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 14 Jan 2007 04:17:53 +0000 Subject: [PATCH 09/16] * In the aggregator, check for and deal with post filenames that are longer than the maximum file length. --- IkiWiki/Plugin/aggregate.pm | 14 ++++++++++++++ debian/changelog | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 964ef4b4b..d11283f0a 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -310,6 +310,20 @@ sub add_page (@) { #{{{ -e pagefile($page.$c)) { $c++ } + + # Make sure that the file name isn't too long. + # NB: This doesn't check for path length limits. + eval q{use POSIX}; + my $max=POSIX::pathconf($config{srcdir}, &POSIX::_PC_NAME_MAX); + if (defined $max && length(htmlpage($page)) >= $max) { + $c=""; + $page="item"; + while (exists $IkiWiki::pagecase{lc $page.$c} || + -e pagefile($page.$c)) { + $c++ + } + } + $guid->{page}=$page; debug(sprintf(gettext("creating new page %s"), $page)); } diff --git a/debian/changelog b/debian/changelog index 799c03245..64614e727 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,10 @@ ikiwiki (1.39) UNRELEASED; urgency=low * Search in default location for templates as a fallback when templatedir is pointed elsewhere, so that only modified templates need to be copied into a templatedir. Based on work by JeremyReed. + * In the aggregator, check for and deal with post filenames that are + longer than the maximum file length. - -- Joey Hess Sat, 13 Jan 2007 16:31:42 -0500 + -- Joey Hess Sat, 13 Jan 2007 23:03:48 -0500 ikiwiki (1.38) unstable; urgency=low -- 2.39.5 From d253cef179bbe1c268a9b4bbf5f08324915b46e3 Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 14 Jan 2007 04:28:50 +0000 Subject: [PATCH 10/16] fix broken format string, manual unfuzzy --- IkiWiki/Plugin/aggregate.pm | 2 +- IkiWiki/Plugin/inline.pm | 1 - po/bg.po | 16 +++--- po/cs.po | 16 +++--- po/es.po | 16 +++--- po/gu.po | 16 +++--- po/pl.po | 16 +++--- po/sv.po | 16 +++--- po/vi.po | 97 +++++++++++++++++++------------------ 9 files changed, 99 insertions(+), 97 deletions(-) diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index d11283f0a..d25ebbb3f 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -270,7 +270,7 @@ sub aggregate () { #{{{ ); } - $feed->{message}=sprintf(gettext("processed ok at "), + $feed->{message}=sprintf(gettext("processed ok at %s"), displaytime($feed->{lastupdate})); $feed->{error}=0; } diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 5857636de..13ff0aa19 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -5,7 +5,6 @@ package IkiWiki::Plugin::inline; use warnings; use strict; use IkiWiki 1.00; -use IkiWiki::Render; # for displaytime use URI; sub import { #{{{ diff --git a/po/bg.po b/po/bg.po index 80dad8320..5aa888562 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-12 15:56-0500\n" +"POT-Creation-Date: 2007-01-13 23:24-0500\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -32,7 +32,7 @@ msgstr "Първо трябва да влезете." msgid "Preferences saved." msgstr "Предпочитанията са запазени." -#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:162 +#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:161 #: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:161 msgid "discussion" msgstr "дискусия" @@ -98,10 +98,10 @@ msgstr "данните от източника предизвикаха греш #: ../IkiWiki/Plugin/aggregate.pm:273 #, perl-format -msgid "processed ok at " -msgstr "е обработен нормално от " +msgid "processed ok at %s" +msgstr "е обработен нормално от %s" -#: ../IkiWiki/Plugin/aggregate.pm:314 +#: ../IkiWiki/Plugin/aggregate.pm:328 #, perl-format msgid "creating new page %s" msgstr "създаване на нова страницa „%s”" @@ -118,18 +118,18 @@ msgstr "грешшка в приставката „fortune”" msgid "googlecalendar failed to find url in html" msgstr "приставката „googlecalendar” не намери URL в HTML-кода" -#: ../IkiWiki/Plugin/inline.pm:37 +#: ../IkiWiki/Plugin/inline.pm:36 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Когато се използва „--rss” или „--atom” трябва да се укаже и " "местоположението на уикито посредством параметъра „--url”" -#: ../IkiWiki/Plugin/inline.pm:97 +#: ../IkiWiki/Plugin/inline.pm:96 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki/Plugin/inline.pm:370 +#: ../IkiWiki/Plugin/inline.pm:369 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" diff --git a/po/cs.po b/po/cs.po index 3c888601b..088497f88 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-12 15:56-0500\n" +"POT-Creation-Date: 2007-01-13 23:24-0500\n" "PO-Revision-Date: 2007-01-07 11:59+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -30,7 +30,7 @@ msgstr "Nejprve se musíte přihlásit." msgid "Preferences saved." msgstr "Nastavení uloženo." -#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:162 +#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:161 #: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:161 msgid "discussion" msgstr "diskuse" @@ -96,10 +96,10 @@ msgstr "zdroj shodil XML::Feed!" #: ../IkiWiki/Plugin/aggregate.pm:273 #, perl-format -msgid "processed ok at " -msgstr "zpracováno ok " +msgid "processed ok at %s" +msgstr "zpracováno ok %s" -#: ../IkiWiki/Plugin/aggregate.pm:314 +#: ../IkiWiki/Plugin/aggregate.pm:328 #, perl-format msgid "creating new page %s" msgstr "vytvářím novou stránku %s" @@ -116,16 +116,16 @@ msgstr "fortune selhal" msgid "googlecalendar failed to find url in html" msgstr "googlecalendar v html nenalezl url" -#: ../IkiWiki/Plugin/inline.pm:37 +#: ../IkiWiki/Plugin/inline.pm:36 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "Při používání --rss nebo --atom musíte pomocí --url zadat url k wiki" -#: ../IkiWiki/Plugin/inline.pm:97 +#: ../IkiWiki/Plugin/inline.pm:96 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki/Plugin/inline.pm:370 +#: ../IkiWiki/Plugin/inline.pm:369 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" diff --git a/po/es.po b/po/es.po index 9aab1be89..b7b427117 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-12 15:56-0500\n" +"POT-Creation-Date: 2007-01-13 23:24-0500\n" "PO-Revision-Date: 2007-01-03 09:37+0100\n" "Last-Translator: Víctor Moral \n" "Language-Team: spanish \n" @@ -31,7 +31,7 @@ msgstr "Antes es necesario identificarse" msgid "Preferences saved." msgstr "Las preferencias se han guardado." -#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:162 +#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:161 #: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:161 msgid "discussion" msgstr "comentarios" @@ -97,10 +97,10 @@ msgstr "¡ la entrada ha provocado un error fatal en XML::Feed!" #: ../IkiWiki/Plugin/aggregate.pm:273 #, perl-format -msgid "processed ok at " -msgstr "proceso completado con éxito a " +msgid "processed ok at %s" +msgstr "proceso completado con éxito a %s" -#: ../IkiWiki/Plugin/aggregate.pm:314 +#: ../IkiWiki/Plugin/aggregate.pm:328 #, perl-format msgid "creating new page %s" msgstr "creando nueva página %s" @@ -118,18 +118,18 @@ msgid "googlecalendar failed to find url in html" msgstr "" "El complemento googlecalendar no ha encontrado un URL en el código HTML" -#: ../IkiWiki/Plugin/inline.pm:37 +#: ../IkiWiki/Plugin/inline.pm:36 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Es obligatorio indicar un url al wiki cuando se usan los parámetros --rss ó " "--atom" -#: ../IkiWiki/Plugin/inline.pm:97 +#: ../IkiWiki/Plugin/inline.pm:96 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki/Plugin/inline.pm:370 +#: ../IkiWiki/Plugin/inline.pm:369 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" diff --git a/po/gu.po b/po/gu.po index fae69ed0f..40ad1dd13 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-12 15:56-0500\n" +"POT-Creation-Date: 2007-01-13 23:24-0500\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -30,7 +30,7 @@ msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશ msgid "Preferences saved." msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." -#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:162 +#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:161 #: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:161 msgid "discussion" msgstr "ચર્ચા" @@ -96,10 +96,10 @@ msgstr "ફીડ ભાંગી પડ્યું XML::Feed!" #: ../IkiWiki/Plugin/aggregate.pm:273 #, perl-format -msgid "processed ok at " -msgstr "આના પર બરાબર છે " +msgid "processed ok at %s" +msgstr "આના પર બરાબર છે %s" -#: ../IkiWiki/Plugin/aggregate.pm:314 +#: ../IkiWiki/Plugin/aggregate.pm:328 #, perl-format msgid "creating new page %s" msgstr "નવું પાનું %s બનાવે છે" @@ -116,16 +116,16 @@ msgstr "ભવિષ્ય નિષ્ફળ" msgid "googlecalendar failed to find url in html" msgstr "ગુગલકેલેન્ડરને htmlમાં યુઆરએલ મળ્યું નહી" -#: ../IkiWiki/Plugin/inline.pm:37 +#: ../IkiWiki/Plugin/inline.pm:36 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "--rss અથવા --atom ઉપયોગ કરતી વખતે વીકીમાં --url ઉપયોગ કરવું જ પડશે" -#: ../IkiWiki/Plugin/inline.pm:97 +#: ../IkiWiki/Plugin/inline.pm:96 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki/Plugin/inline.pm:370 +#: ../IkiWiki/Plugin/inline.pm:369 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" diff --git a/po/pl.po b/po/pl.po index 1e031cbd2..eb6a3c95b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.37\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-12 15:56-0500\n" +"POT-Creation-Date: 2007-01-13 23:24-0500\n" "PO-Revision-Date: 2007-01-05 16:33+100\n" "Last-Translator: Paweł Tęcza \n" "Language-Team: Debian L10n Polish \n" @@ -33,7 +33,7 @@ msgstr "Konieczne jest zalogowanie się." msgid "Preferences saved." msgstr "Ustawienia zostały zapisane." -#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:162 +#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:161 #: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:161 msgid "discussion" msgstr "dyskusja" @@ -99,10 +99,10 @@ msgstr "awaria kanału RSS w module XML::Feed!" #: ../IkiWiki/Plugin/aggregate.pm:273 #, perl-format -msgid "processed ok at " -msgstr "przetworzony kanał RSS w dniu " +msgid "processed ok at %s" +msgstr "przetworzony kanał RSS w dniu %s" -#: ../IkiWiki/Plugin/aggregate.pm:314 +#: ../IkiWiki/Plugin/aggregate.pm:328 #, perl-format msgid "creating new page %s" msgstr "tworzenie nowej strony %s" @@ -121,18 +121,18 @@ msgstr "" "awaria wtyczki googlecalendar z powodu nieodnalezionego adresu URL na " "stronie HTML" -#: ../IkiWiki/Plugin/inline.pm:37 +#: ../IkiWiki/Plugin/inline.pm:36 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Użycie parametru --rss lub --atom wymaga podania adresu URL do wiki za " "pomocą parametru --url" -#: ../IkiWiki/Plugin/inline.pm:97 +#: ../IkiWiki/Plugin/inline.pm:96 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki/Plugin/inline.pm:370 +#: ../IkiWiki/Plugin/inline.pm:369 msgid "RPC::XML::Client not found, not pinging" msgstr "Niezainstalowany moduł RPC::XML::Client, brak możliwości pingowania" diff --git a/po/sv.po b/po/sv.po index 49acaa90f..b65cfb92c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-12 15:56-0500\n" +"POT-Creation-Date: 2007-01-13 23:24-0500\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -30,7 +30,7 @@ msgstr "Du måste logga in först." msgid "Preferences saved." msgstr "Inställningar sparades." -#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:162 +#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:161 #: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:161 msgid "discussion" msgstr "diskussion" @@ -96,10 +96,10 @@ msgstr "kanalen kraschade XML::Feed!" #: ../IkiWiki/Plugin/aggregate.pm:273 #, perl-format -msgid "processed ok at " -msgstr "behandlad ok på " +msgid "processed ok at %s" +msgstr "behandlad ok på %s" -#: ../IkiWiki/Plugin/aggregate.pm:314 +#: ../IkiWiki/Plugin/aggregate.pm:328 #, perl-format msgid "creating new page %s" msgstr "skapar nya sidan %s" @@ -116,16 +116,16 @@ msgstr "fortune misslyckades" msgid "googlecalendar failed to find url in html" msgstr "googlecalendar misslyckades med att hitta url i html" -#: ../IkiWiki/Plugin/inline.pm:37 +#: ../IkiWiki/Plugin/inline.pm:36 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "Måste ange url till wiki med --url när --rss eller --atom används" -#: ../IkiWiki/Plugin/inline.pm:97 +#: ../IkiWiki/Plugin/inline.pm:96 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki/Plugin/inline.pm:370 +#: ../IkiWiki/Plugin/inline.pm:369 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" diff --git a/po/vi.po b/po/vi.po index 14df544ba..f1ef4563a 100644 --- a/po/vi.po +++ b/po/vi.po @@ -3,10 +3,10 @@ # Clytie Siddall , 2007 # msgid "" -"" -msgstr "Project-Id-Version: ikiwiki\n" +msgstr "" +"Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-10 15:32-0500\n" +"POT-Creation-Date: 2007-01-13 23:24-0500\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -16,43 +16,44 @@ msgstr "Project-Id-Version: ikiwiki\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.6fc1\n" -#.translators: The first parameter is a page name, -#.translators: second is the user who locked it. +#. translators: The first parameter is a page name, +#. translators: second is the user who locked it. #: ../IkiWiki/CGI.pm:51 #, perl-format msgid "%s is locked by %s and cannot be edited" msgstr "%s bị %s khoá nên không thể sửa được" -#: ../IkiWiki/CGI.pm:141 +#: ../IkiWiki/CGI.pm:140 msgid "You need to log in first." msgstr "Trước tiên bạn cần phải đăng nhập." -#: ../IkiWiki/CGI.pm:259 +#: ../IkiWiki/CGI.pm:257 msgid "Preferences saved." msgstr "Tùy thích đã được lưu." -#: ../IkiWiki/CGI.pm:410 -#: ../IkiWiki/Plugin/inline.pm:162 -#: ../IkiWiki/Render.pm:97 -#: ../IkiWiki/Render.pm:161 +#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:161 +#: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:161 msgid "discussion" msgstr "thảo luận" -#: ../IkiWiki/CGI.pm:449 +#: ../IkiWiki/CGI.pm:446 #, perl-format msgid "creating %s" msgstr "đang tạo %s" -#: ../IkiWiki/CGI.pm:466 -#: ../IkiWiki/CGI.pm:509 +#: ../IkiWiki/CGI.pm:463 ../IkiWiki/CGI.pm:506 #, perl-format msgid "editing %s" msgstr "đang sửa %s" -#: ../IkiWiki/CGI.pm:626 +#: ../IkiWiki/CGI.pm:623 msgid "You are banned." msgstr "Bạn bị cấm ra." +#: ../IkiWiki/CGI.pm:650 +msgid "login failed, perhaps you need to turn on cookies?" +msgstr "" + #: ../IkiWiki/Plugin/aggregate.pm:61 #, perl-format msgid "aggregate plugin missing %s parameter" @@ -96,10 +97,10 @@ msgstr "nguồn tin đã gây ra XML::Feed sụp đổ." #: ../IkiWiki/Plugin/aggregate.pm:273 #, perl-format -msgid "processed ok at " -msgstr "đã xử lý được ở " +msgid "processed ok at %s" +msgstr "đã xử lý được ở %s" -#: ../IkiWiki/Plugin/aggregate.pm:314 +#: ../IkiWiki/Plugin/aggregate.pm:328 #, perl-format msgid "creating new page %s" msgstr "đang tạo trang mới %s" @@ -116,16 +117,18 @@ msgstr "fortune bị lỗi" msgid "googlecalendar failed to find url in html" msgstr "googlecalendar không tìm thấy địa chỉ URL trong mã HTML" -#: ../IkiWiki/Plugin/inline.pm:37 +#: ../IkiWiki/Plugin/inline.pm:36 msgid "Must specify url to wiki with --url when using --rss or --atom" -msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --rss » hay « --atom »" +msgstr "" +"Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --rss » hay " +"« --atom »" -#: ../IkiWiki/Plugin/inline.pm:97 +#: ../IkiWiki/Plugin/inline.pm:96 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki/Plugin/inline.pm:370 +#: ../IkiWiki/Plugin/inline.pm:369 msgid "RPC::XML::Client not found, not pinging" msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" @@ -211,9 +214,9 @@ msgstr "đang cập nhật chỉ mục tìm kiếm hyperestraier" msgid "shortcut missing name or url parameter" msgstr "lối tắt thiếu tên hay tham số url" -#.translators: This is used to display what shortcuts are defined. -#.translators: First parameter is the name of the shortcut, the second -#.translators: is an URL. +#. translators: This is used to display what shortcuts are defined. +#. translators: First parameter is the name of the shortcut, the second +#. translators: is an URL. #: ../IkiWiki/Plugin/shortcut.pm:33 #, perl-format msgid "shortcut %s points to %s" @@ -244,14 +247,14 @@ msgstr "chưa thực hiện getctime" msgid "" "REV is not set, not running from svn post-commit hook, cannot send " "notifications" -msgstr "Chưa đặt REV, không chạy từ móc sau gài vào nên không thể gửi thông báo" +msgstr "" +"Chưa đặt REV, không chạy từ móc sau gài vào nên không thể gửi thông báo" #: ../IkiWiki/Render.pm:98 msgid "Discussion" msgstr "Thảo luận" -#: ../IkiWiki/Render.pm:228 -#: ../IkiWiki/Render.pm:248 +#: ../IkiWiki/Render.pm:228 ../IkiWiki/Render.pm:248 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" @@ -296,8 +299,8 @@ msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: không thể vẽ %s" -#.translators: The first parameter is a filename, and the second -#.translators: is a (probably not translated) error message. +#. translators: The first parameter is a filename, and the second +#. translators: is a (probably not translated) error message. #: ../IkiWiki/Setup.pm:15 #, perl-format msgid "cannot read %s: %s" @@ -319,10 +322,10 @@ msgstr "đang làm tươi wiki.." msgid "done" msgstr "xong" -#.translators: The three variables are the name of the wiki, -#.translators: A list of one or more pages that were changed, -#.translators: And the name of the user making the change. -#.translators: This is used as the subject of a commit email. +#. translators: The three variables are the name of the wiki, +#. translators: A list of one or more pages that were changed, +#. translators: And the name of the user making the change. +#. translators: This is used as the subject of a commit email. #: ../IkiWiki/UserInfo.pm:139 #, perl-format msgid "update of %s's %s by %s" @@ -341,23 +344,23 @@ msgstr "không thể tạo bộ bao bọc sử dụng tập tin thiết lập" msgid "wrapper filename not specified" msgstr "chưa xác định tên tập tin bộ bao bọc" -#.translators: The first parameter is a filename, and the second is -#.translators: a (probably not translated) error message. +#. translators: The first parameter is a filename, and the second is +#. translators: a (probably not translated) error message. #: ../IkiWiki/Wrapper.pm:64 #, perl-format msgid "failed to write %s: %s" msgstr "lỗi ghi %s: %s" -#.translators: The parameter is a C filename. +#. translators: The parameter is a C filename. #: ../IkiWiki/Wrapper.pm:100 #, perl-format msgid "failed to compile %s" msgstr "lỗi biên dịch %s" -#.translators: The parameter is a filename. +#. translators: The parameter is a filename. #: ../IkiWiki/Wrapper.pm:108 -#, perl-format -msgid "successfully generated %s\n" +#, fuzzy, perl-format +msgid "successfully generated %s" msgstr "%s đã được tạo ra\n" #: ../ikiwiki.in:13 @@ -366,17 +369,17 @@ msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích" #: ../IkiWiki.pm:99 msgid "Must specify url to wiki with --url when using --cgi" -msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »" +msgstr "" +"Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »" -#: ../IkiWiki.pm:144 -#: ../IkiWiki.pm:145 +#: ../IkiWiki.pm:144 ../IkiWiki.pm:145 msgid "Error" msgstr "Lỗi" -#.translators: The first parameter is a -#.translators: preprocessor directive name, -#.translators: the second a page name, the -#.translators: third a number. +#. translators: The first parameter is a +#. translators: preprocessor directive name, +#. translators: the second a page name, the +#. translators: third a number. #: ../IkiWiki.pm:524 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" -- 2.39.5 From c4b171221279d358b1aee1468e7d8d98b923af8c Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 14 Jan 2007 04:30:53 +0000 Subject: [PATCH 11/16] * Change the RecentChanges page to show the path of changed pages. --- IkiWiki/CGI.pm | 2 +- debian/changelog | 3 ++- doc/index/discussion.mdwn | 16 +--------------- doc/patchqueue/full_paths_in_recentchanges.mdwn | 15 --------------- 4 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 doc/patchqueue/full_paths_in_recentchanges.mdwn diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 71a3299a4..96b9dab61 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -92,7 +92,7 @@ sub cgi_recentchanges ($) { #{{{ delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess; $change->{pages} = [ map { - $_->{link} = htmllink("", "", $_->{page}, 1); + $_->{link} = htmllink("", "", $_->{page}, 1, 0, pagetitle($_->{page})); $_; } @{$change->{pages}} ]; diff --git a/debian/changelog b/debian/changelog index 64614e727..3ba2d021a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,9 @@ ikiwiki (1.39) UNRELEASED; urgency=low a templatedir. Based on work by JeremyReed. * In the aggregator, check for and deal with post filenames that are longer than the maximum file length. + * Change the RecentChanges page to show the path of changed pages. - -- Joey Hess Sat, 13 Jan 2007 23:03:48 -0500 + -- Joey Hess Sat, 13 Jan 2007 23:30:20 -0500 ikiwiki (1.38) unstable; urgency=low diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn index 0336e8342..4374130fa 100644 --- a/doc/index/discussion.mdwn +++ b/doc/index/discussion.mdwn @@ -197,21 +197,7 @@ The RecentChanges only shows the final file name for the recently changes file, for example "discussion". It would be more useful to see "index/discussion" or the path to the sub-page. I think this is handled by the htmllink() routine. ->> IMHO it's a good idea and I like it. Often I can see changes in ->> any discussion page, but I don't know without clicking the link ->> what discussion was changed. - ->> However, I can see one problem here. You can commit via command line ->> changes in many pages. It will be displayed ugly then, because probably ->> a width of the RecentChanges page will be greater then a width of ->> user's browser. I hate these pages. So I propose to display a list of ->> changed pages in a column, not in a row. --Pawel - ->>> Well, it's a simple [[patch|patchqueue/full_paths_in_recentchanges]]. ->>> For a limited time I have that patch running on this wiki. Undecided if ->>> I like it or not; the width is not really a problem due to the design ->>> of the recentchanges page, but all those paths do clutter up the page ->>> somewhat. Comments? --[[Joey]] +> Went ahead and did this, IMHO the display is ok as-is. --[[Joey]] ---- diff --git a/doc/patchqueue/full_paths_in_recentchanges.mdwn b/doc/patchqueue/full_paths_in_recentchanges.mdwn deleted file mode 100644 index a42a2726b..000000000 --- a/doc/patchqueue/full_paths_in_recentchanges.mdwn +++ /dev/null @@ -1,15 +0,0 @@ -For my own refrence --[[Joey]] - - Index: CGI.pm - =================================================================== - --- CGI.pm (revision 2225) - +++ CGI.pm (working copy) - @@ -92,7 +92,7 @@ - delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess; - $change->{pages} = [ - map { - - $_->{link} = htmllink("", "", $_->{page}, 1); - + $_->{link} = htmllink("", "", $_->{page}, 1, 0, pagetitle($_->{page})); - $_; - } @{$change->{pages}} - ]; -- 2.39.5 From a6e1274f468477cceb9b118aa5b49bd74e9385c4 Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 14 Jan 2007 04:33:10 +0000 Subject: [PATCH 12/16] unfuzzy --- po/vi.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/vi.po b/po/vi.po index f1ef4563a..2bd2853d0 100644 --- a/po/vi.po +++ b/po/vi.po @@ -359,9 +359,9 @@ msgstr "lỗi biên dịch %s" #. translators: The parameter is a filename. #: ../IkiWiki/Wrapper.pm:108 -#, fuzzy, perl-format +#, perl-format msgid "successfully generated %s" -msgstr "%s đã được tạo ra\n" +msgstr "%s đã được tạo ra" #: ../ikiwiki.in:13 msgid "usage: ikiwiki [options] source dest" -- 2.39.5 From 49d63e7a5530afad04b5cac0d41ca594d9580215 Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 14 Jan 2007 04:35:10 +0000 Subject: [PATCH 13/16] fix format --- IkiWiki/Wrapper.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index ca7304c21..8c363cc11 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -105,7 +105,8 @@ EOF error("chmod $wrapper: $!"); } #translators: The parameter is a filename. - printf(gettext("successfully generated %s"), $wrapper)."\n"; + printf(gettext("successfully generated %s"), $wrapper); + print "\n"; } #}}} 1 -- 2.39.5 From d69488a9df6ae9537402256931ce9ea93f445d3d Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 14 Jan 2007 04:51:35 +0000 Subject: [PATCH 14/16] qouting --- IkiWiki/Rcs/svn.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm index 30020c1fc..87fd12fad 100644 --- a/IkiWiki/Rcs/svn.pm +++ b/IkiWiki/Rcs/svn.pm @@ -95,7 +95,7 @@ sub rcs_commit ($$$;$$) { #{{{ if (system("svn", "commit", "--quiet", "--encoding", "UTF-8", "-m", possibly_foolish_untaint($message), - "$config{srcdir}") != 0) { + $config{srcdir}) != 0) { my $conflict=readfile("$config{srcdir}/$file"); if (system("svn", "revert", "--quiet", "$config{srcdir}/$file") != 0) { warn("svn revert failed\n"); -- 2.39.5 From 1379fa74021647d12730e19547d339aedd48d833 Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 14 Jan 2007 05:01:46 +0000 Subject: [PATCH 15/16] feh --- IkiWiki/Plugin/aggregate.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index d25ebbb3f..7fceb0df3 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -317,7 +317,7 @@ sub add_page (@) { #{{{ my $max=POSIX::pathconf($config{srcdir}, &POSIX::_PC_NAME_MAX); if (defined $max && length(htmlpage($page)) >= $max) { $c=""; - $page="item"; + $page=$feed->{dir}."/item"; while (exists $IkiWiki::pagecase{lc $page.$c} || -e pagefile($page.$c)) { $c++ -- 2.39.5 From 20fd72e2212e44f00cd64cc34b82ae917a8361ea Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 14 Jan 2007 05:25:25 +0000 Subject: [PATCH 16/16] releasing version 1.39 --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3ba2d021a..eff7becb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (1.39) UNRELEASED; urgency=low +ikiwiki (1.39) unstable; urgency=low * Add a rawhtml plugin that allows copying raw html files from the srcdir. * Fix --locale to control LC_ALL now. @@ -17,6 +17,7 @@ ikiwiki (1.39) UNRELEASED; urgency=low * In the aggregator, check for and deal with post filenames that are longer than the maximum file length. * Change the RecentChanges page to show the path of changed pages. + * Various minor bugfixes. -- Joey Hess Sat, 13 Jan 2007 23:30:20 -0500 -- 2.39.5