From: joey Date: Sun, 28 Jan 2007 02:24:43 +0000 (+0000) Subject: * More gettext fun. X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/ab712992930e190f421a769c52843fb83867404f?hp=9904d10ed9c3677b9a5f7988f743f931739b87d4 * More gettext fun. --- diff --git a/IkiWiki.pm b/IkiWiki.pm index 2bef2164e..292f18f5e 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -9,7 +9,7 @@ use open qw{:utf8 :std}; use vars qw{%config %links %oldlinks %oldpagemtime %pagectime %pagecase %renderedfiles %oldrenderedfiles %pagesources %depends %hooks - %forcerebuild}; + %forcerebuild $gettext_obj}; use Exporter q{import}; our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match @@ -83,8 +83,10 @@ sub checkconfig () { #{{{ if (defined $config{locale}) { eval q{use POSIX}; error($@) if $@; - $ENV{LANG} = $config{locale} - if POSIX::setlocale(&POSIX::LC_ALL, $config{locale}); + if (POSIX::setlocale(&POSIX::LC_ALL, $config{locale})) { + $ENV{LANG}=$config{locale}; + $gettext_obj=undef; + } } if ($config{w3mmode}) { @@ -784,7 +786,6 @@ sub file_pruned ($$) { #{{{ $file =~ m/$regexp/; } #}}} -my $gettext_obj; sub gettext { #{{{ # Only use gettext in the rare cases it's needed. if (exists $ENV{LANG} || exists $ENV{LC_ALL} || exists $ENV{LC_MESSAGES}) { diff --git a/debian/changelog b/debian/changelog index d41a7b8ce..f590d9e39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,9 @@ ikiwiki (1.41) UNRELEASED; urgency=low display. This allows using a shortcut like [[wikipedia War_of_1812]], which links to the correct remote page, but is displayed nicely. * When building the doc wiki, build with LANG=C. + * More gettext fun. - -- Joey Hess Sat, 27 Jan 2007 20:52:10 -0500 + -- Joey Hess Sat, 27 Jan 2007 21:16:33 -0500 ikiwiki (1.40) unstable; urgency=low diff --git a/doc/bugs/Discussion_link_not_translated_in_post.mdwn b/doc/bugs/Discussion_link_not_translated_in_post.mdwn index 218622cf1..993450ce8 100644 --- a/doc/bugs/Discussion_link_not_translated_in_post.mdwn +++ b/doc/bugs/Discussion_link_not_translated_in_post.mdwn @@ -12,4 +12,6 @@ can see "Discussion" link, instead of Polish "Dyskusja" link. --Pawel >> from `inlinepage.tmpl` file is not translated to Polish. Now I hope >> you know what I mean :) --Pawel ->>> Joey, what about my bug report? ;) --Pawel \ No newline at end of file +>>> Joey, what about my bug report? ;) --Pawel + +>>>> Found and [[fixed|bugs/done]] --[[Joey]]. diff --git a/po/bg.po b/po/bg.po index 7aa520bca..8167e9bae 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-27 20:16-0500\n" +"POT-Creation-Date: 2007-01-27 21:18-0500\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -371,13 +371,13 @@ msgstr "успешно генериране на %s" msgid "usage: ikiwiki [options] source dest" msgstr "формат: ikiwiki [опции] източник местоназначение" -#: ../IkiWiki.pm:101 +#: ../IkiWiki.pm:103 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "При използване на пареметъра „--cgi” е необходимо да се укаже и " "местоположението на уикито чрез параметъра „--url”" -#: ../IkiWiki.pm:146 ../IkiWiki.pm:147 +#: ../IkiWiki.pm:148 ../IkiWiki.pm:149 msgid "Error" msgstr "Грешка" @@ -385,7 +385,7 @@ msgstr "Грешка" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:526 +#: ../IkiWiki.pm:528 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" diff --git a/po/cs.po b/po/cs.po index 536d13e82..5bd6ff219 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-27 20:16-0500\n" +"POT-Creation-Date: 2007-01-27 21:18-0500\n" "PO-Revision-Date: 2007-01-07 11:59+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -365,11 +365,11 @@ msgstr "%s byl úspěšně vytvořen" msgid "usage: ikiwiki [options] source dest" msgstr "použití: ikiwiki [volby] zdroj cíl" -#: ../IkiWiki.pm:101 +#: ../IkiWiki.pm:103 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki" -#: ../IkiWiki.pm:146 ../IkiWiki.pm:147 +#: ../IkiWiki.pm:148 ../IkiWiki.pm:149 msgid "Error" msgstr "Chyba" @@ -377,7 +377,7 @@ msgstr "Chyba" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:526 +#: ../IkiWiki.pm:528 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i" diff --git a/po/es.po b/po/es.po index 6f1b17a42..93acb3d11 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-27 20:16-0500\n" +"POT-Creation-Date: 2007-01-27 21:18-0500\n" "PO-Revision-Date: 2007-01-03 09:37+0100\n" "Last-Translator: Víctor Moral \n" "Language-Team: spanish \n" @@ -374,13 +374,13 @@ msgstr "creado con éxito el programa envoltorio %s" msgid "usage: ikiwiki [options] source dest" msgstr "uso: ikiwiki [opciones] origen destino" -#: ../IkiWiki.pm:101 +#: ../IkiWiki.pm:103 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es obligatorio especicar un url al wiki con el parámetro --url si se utiliza " "el parámetro --cgi" -#: ../IkiWiki.pm:146 ../IkiWiki.pm:147 +#: ../IkiWiki.pm:148 ../IkiWiki.pm:149 msgid "Error" msgstr "Error" @@ -388,7 +388,7 @@ msgstr "Error" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:526 +#: ../IkiWiki.pm:528 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "" diff --git a/po/fr.po b/po/fr.po index d0a97f415..460d270b6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-27 20:16-0500\n" +"POT-Creation-Date: 2007-01-27 21:18-0500\n" "PO-Revision-Date: 2007-01-22 22:12+0100\n" "Last-Translator: Jean-Luc Coulon (f5ibh) \n" "Language-Team: French \n" @@ -374,13 +374,13 @@ msgstr "%s a été créé avec succès" msgid "usage: ikiwiki [options] source dest" msgstr "Syntaxe : ikiwiki [options] source destination" -#: ../IkiWiki.pm:101 +#: ../IkiWiki.pm:103 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Vous devez indiquer une url vers le wiki par --url lors de l'utilisation de " "--cgi" -#: ../IkiWiki.pm:146 ../IkiWiki.pm:147 +#: ../IkiWiki.pm:148 ../IkiWiki.pm:149 msgid "Error" msgstr "Erreur" @@ -388,7 +388,7 @@ msgstr "Erreur" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:526 +#: ../IkiWiki.pm:528 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "" diff --git a/po/gu.po b/po/gu.po index 10fea445f..aa0bf7006 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-27 20:16-0500\n" +"POT-Creation-Date: 2007-01-27 21:18-0500\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -363,11 +363,11 @@ msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" msgid "usage: ikiwiki [options] source dest" msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest" -#: ../IkiWiki.pm:101 +#: ../IkiWiki.pm:103 msgid "Must specify url to wiki with --url when using --cgi" msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki.pm:146 ../IkiWiki.pm:147 +#: ../IkiWiki.pm:148 ../IkiWiki.pm:149 msgid "Error" msgstr "ક્ષતિ" @@ -375,7 +375,7 @@ msgstr "ક્ષતિ" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:526 +#: ../IkiWiki.pm:528 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 4d312e2e7..38e490762 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-27 20:16-0500\n" +"POT-Creation-Date: 2007-01-27 21:18-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -364,11 +364,11 @@ msgstr "" msgid "usage: ikiwiki [options] source dest" msgstr "" -#: ../IkiWiki.pm:101 +#: ../IkiWiki.pm:103 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:146 ../IkiWiki.pm:147 +#: ../IkiWiki.pm:148 ../IkiWiki.pm:149 msgid "Error" msgstr "" @@ -376,7 +376,7 @@ msgstr "" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:526 +#: ../IkiWiki.pm:528 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "" diff --git a/po/pl.po b/po/pl.po index 0c39e62ae..a4c150905 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-27 20:16-0500\n" +"POT-Creation-Date: 2007-01-27 21:18-0500\n" "PO-Revision-Date: 2007-01-05 16:33+100\n" "Last-Translator: Paweł Tęcza \n" "Language-Team: Debian L10n Polish \n" @@ -375,13 +375,13 @@ msgstr "strona pomyślnie utworzona %s" msgid "usage: ikiwiki [options] source dest" msgstr "użycie: ikiwiki [parametry] źródło cel" -#: ../IkiWiki.pm:101 +#: ../IkiWiki.pm:103 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru " "--url" -#: ../IkiWiki.pm:146 ../IkiWiki.pm:147 +#: ../IkiWiki.pm:148 ../IkiWiki.pm:149 msgid "Error" msgstr "Błąd" @@ -389,7 +389,7 @@ msgstr "Błąd" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:526 +#: ../IkiWiki.pm:528 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" diff --git a/po/sv.po b/po/sv.po index 55d1dcaaf..26b71db46 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-27 20:16-0500\n" +"POT-Creation-Date: 2007-01-27 21:18-0500\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -367,11 +367,11 @@ msgstr "generering av %s lyckades" msgid "usage: ikiwiki [options] source dest" msgstr "användning: ikiwiki [flaggor] källa mål" -#: ../IkiWiki.pm:101 +#: ../IkiWiki.pm:103 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Måste ange url till wiki med --url när --cgi används" -#: ../IkiWiki.pm:146 ../IkiWiki.pm:147 +#: ../IkiWiki.pm:148 ../IkiWiki.pm:149 msgid "Error" msgstr "Fel" @@ -379,7 +379,7 @@ msgstr "Fel" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:526 +#: ../IkiWiki.pm:528 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" diff --git a/po/vi.po b/po/vi.po index 145a1cd5f..edece967c 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-27 20:16-0500\n" +"POT-Creation-Date: 2007-01-27 21:18-0500\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -367,12 +367,12 @@ msgstr "%s đã được tạo ra" msgid "usage: ikiwiki [options] source dest" msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích" -#: ../IkiWiki.pm:101 +#: ../IkiWiki.pm:103 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:146 ../IkiWiki.pm:147 +#: ../IkiWiki.pm:148 ../IkiWiki.pm:149 msgid "Error" msgstr "Lỗi" @@ -380,7 +380,7 @@ msgstr "Lỗi" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:526 +#: ../IkiWiki.pm:528 #, 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"