my %translations;
my @origneedsbuild;
my %origsubs;
+my @slavelanguages; # orderer as in config po_slave_languages
memoize("istranslatable");
memoize("_istranslation");
inject(name => "IkiWiki::cgiurl", call => \&mycgiurl);
$origsubs{'rootpage'}=\&IkiWiki::rootpage;
inject(name => "IkiWiki::rootpage", call => \&myrootpage);
+ $origsubs{'isselflink'}=\&IkiWiki::isselflink;
+ inject(name => "IkiWiki::isselflink", call => \&myisselflink);
}
}
},
po_slave_languages => {
type => "string",
- example => {
+ example => [
'fr' => 'Français',
'es' => 'Español',
'de' => 'Deutsch'
- },
+ ],
description => "slave languages (PO files)",
safe => 1,
rebuild => 1,
$field, 'po'));
}
}
+
+ if (ref $config{po_slave_languages} eq 'ARRAY') {
+ my %slaves;
+ for (my $i=0; $i<@{$config{po_slave_languages}}; $i = $i + 2) {
+ $slaves{$config{po_slave_languages}->[$i]} = $config{po_slave_languages}->[$i + 1];
+ push @slavelanguages, $config{po_slave_languages}->[$i];
+ }
+ $config{po_slave_languages} = \%slaves;
+ }
+ elsif (ref $config{po_slave_languages} eq 'HASH') {
+ @slavelanguages = sort {
+ $config{po_slave_languages}->{$a} cmp $config{po_slave_languages}->{$b};
+ } keys %{$config{po_slave_languages}};
+ }
+
delete $config{po_slave_languages}{$config{po_master_language}{code}};;
map {
# make existing translations depend on the corresponding master page
foreach my $master (keys %translations) {
- map add_depends($_, $master), values %{otherlanguages($master)};
+ map add_depends($_, $master), values %{otherlanguages_pages($master)};
}
}
# make sure any destpage's translations has
# $page in its backlinks
push @{$links{$page}},
- values %{otherlanguages($destpage)};
+ values %{otherlanguages_pages($destpage)};
}
}
}
my $page = $params{page};
my $destpage = $params{destpage};
my $content = $params{content};
+ my $fullpage = $params{fullpage};
+
+ unless ($fullpage) {
+ return $content;
+ }
+
if (istranslation($page) && ! alreadyfiltered($page, $destpage)) {
$content = po_to_markup($page, $content);
setalreadyfiltered($page, $destpage);
}
if ($template->query(name => "otherlanguages")) {
$template->param(otherlanguages => [otherlanguagesloop($page)]);
- map add_depends($page, $_), (values %{otherlanguages($page)});
+ map add_depends($page, $_), (values %{otherlanguages_pages($page)});
}
if ($config{discussion} && istranslation($page)) {
if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&
return () unless istranslatable($torename{src});
my @ret;
- my %otherpages=%{otherlanguages($torename{src})};
+ my %otherpages=%{otherlanguages_pages($torename{src})};
while (my ($lang, $otherpage) = each %otherpages) {
push @ret, {
src => $otherpage,
srcfile => $pagesources{$otherpage},
- dest => otherlanguage($torename{dest}, $lang),
+ dest => otherlanguage_page($torename{dest}, $lang),
destfile => $torename{dest}.".".$lang.".po",
required => 0,
};
return $rootpage;
}
+sub myisselflink ($$) {
+ my $page=shift;
+ my $link=shift;
+
+ return 1 if $origsubs{'isselflink'}->($page, $link);
+ if (istranslation($page)) {
+ return $origsubs{'isselflink'}->(masterpage($page), $link);
+ }
+ return;
+}
+
# ,----
# | Blackboxes for private data
# `----
return $code =~ /^[a-z]{2}$/;
}
-sub otherlanguage ($$) {
+sub otherlanguage_page ($$) {
my $page=shift;
my $code=shift;
return masterpage($page) . '.' . $code;
}
-sub otherlanguages ($) {
+# Returns the list of other languages codes: the master language comes first,
+# then the codes are ordered the same way as in po_slave_languages, if it is
+# an array, or in the language name lexical order, if it is a hash.
+sub otherlanguages_codes ($) {
my $page=shift;
- my %ret;
- return \%ret unless istranslation($page) || istranslatable($page);
+ my @ret;
+ return \@ret unless istranslation($page) || istranslatable($page);
my $curlang=lang($page);
foreach my $lang
- ($config{po_master_language}{code}, keys %{$config{po_slave_languages}}) {
+ ($config{po_master_language}{code}, @slavelanguages) {
next if $lang eq $curlang;
- $ret{$lang}=otherlanguage($page, $lang);
+ push @ret, $lang;
}
+ return \@ret;
+}
+
+sub otherlanguages_pages ($) {
+ my $page=shift;
+
+ my %ret;
+ map {
+ $ret{$_} = otherlanguage_page($page, $_)
+ } @{otherlanguages_codes($page)};
+
return \%ret;
}
my $page=shift;
my @ret;
- my %otherpages=%{otherlanguages($page)};
- while (my ($lang, $otherpage) = each %otherpages) {
- if (istranslation($page) && masterpage($page) eq $otherpage) {
- push @ret, {
- url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
- code => $lang,
- language => languagename($lang),
- master => 1,
- };
- }
- elsif (istranslation($otherpage)) {
- push @ret, {
- url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
- code => $lang,
- language => languagename($lang),
- percent => percenttranslated($otherpage),
- }
+ if (istranslation($page)) {
+ push @ret, {
+ url => urlto_with_orig_beautiful_urlpath(masterpage($page), $page),
+ code => $config{po_master_language}{code},
+ language => $config{po_master_language}{name},
+ master => 1,
+ };
+ }
+ foreach my $lang (@{otherlanguages_codes($page)}) {
+ next if $lang eq $config{po_master_language}{code};
+ my $otherpage = otherlanguage_page($page, $lang);
+ push @ret, {
+ url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
+ code => $lang,
+ language => languagename($lang),
+ percent => percenttranslated($otherpage),
}
}
- return sort {
- return -1 if $a->{code} eq $config{po_master_language}{code};
- return 1 if $b->{code} eq $config{po_master_language}{code};
- return $a->{language} cmp $b->{language};
- } @ret;
+ return @ret;
}
sub homepageurl (;$) {
my $percenttranslated=IkiWiki::Plugin::po::percenttranslated($page);
if ($percenttranslated eq 'N/A') {
- return IkiWiki::FailReason->new("file is not a translation page");
+ return IkiWiki::FailReason->new("file is not a translatable page");
}
elsif ($percenttranslated < 100) {
return IkiWiki::SuccessReason->new("file has $percenttranslated translated");
`po_slave_languages` is used to set the list of supported "slave"
languages, such as:
- po_slave_languages => { 'fr' => 'Français',
+ po_slave_languages => [ 'fr' => 'Français',
'es' => 'Español',
'de' => 'Deutsch',
- }
+ ]
Decide which pages are translatable
-----------------------------------
An integration branch, called `meta-po`, merges [[intrigeri]]'s `po`
and `meta` branches, and thus has this additional features.
+ Language display order
+ ----------------------
+
+ Jonas pointed out that one might want to control the order that links to
+ other languages are listed, for various reasons. Currently, there is no
+ order, as `po_slave_languages` is a hash. It would need to be converted
+ to an array to support this. (If twere done, twere best done quickly.)
+ --[[Joey]]
+
+ > Done in my po branch, preserving backward compatibility. Please
+ > review :) --[[intrigeri]]
+
+ >> Right, well my immediate concern is that using an array to hold
+ >> hash-like pairs is not very clear to the user. It will be displayed
+ >> in a confusing way by websetup; dumping a setup file will probably
+ >> also cause it to be formatted in a confusing way. And the code
+ >> seems to assume that the array length is even, and probably blows
+ >> up if it is not.. and the value is marked safe so websetup can be
+ >> used to modify it and break that way too. --[[Joey]]
+
Pagespecs
---------
> Any simple testcase to reproduce it, please? I've never seen this
> happen yet. --[[intrigeri]]
+ >> Sure, go here <http://l10n.ikiwiki.info/smiley/smileys/index.sv.html>
+ >> (Currently 0% translateed) and see the 'WikiLink' link at the bottom,
+ >> which goes to <http://l10n.ikiwiki.info/ikiwiki.cgi?page=ikiwiki/wikilink&from=smiley/smileys&do=create>
+ >> Compare with eg, the 100% translated Dansk version, where
+ >> the WikiLink link links to the English WikiLink page. --[[Joey]]
+
Double commits of po files
--------------------------
sipb-www / ikiwiki.git / commitdiff
