Merge remote branch 'upstream/master' into prv/po

diff --combined t/po.t
index cb189a13eb9f04a072288bf37198efefb5f38404,1cd18c317c7b5a6b1220af3f53966933d70e119e..51321fa96c73d3a325064fb59bda6aa6b10fbdea
--- 1/t/po.t
--- 2/t/po.t
+++ b/t/po.t
@@@ -17,7 -17,7 +17,7 @@@ BEGIN 
        }
  }
  
 -use Test::More tests => 68;
 +use Test::More tests => 91;
  
  BEGIN { use_ok("IkiWiki"); }
  
@@@ -31,6 -31,9 +31,9 @@@ my $dir = tempdir("ikiwiki-test-po.XXXX
  %config=IkiWiki::defaultconfig();
  $config{srcdir} = "$dir/src";
  $config{destdir} = "$dir/dst";
+ $config{destdir} = "$dir/dst";
+ $config{underlaydirbase} = "/dev/null";
+ $config{underlaydir} = "/dev/null";
  $config{discussion} = 0;
  $config{po_master_language} = { code => 'en',
                                name => 'English'
@@@ -42,7 -45,6 +45,7 @@@ $config{po_slave_languages} = 
  $config{po_translatable_pages}='index or test1 or test2 or translatable';
  $config{po_link_to}='negotiated';
  IkiWiki::loadplugins();
 +ok(IkiWiki::loadplugin('meta'), "meta plugin loaded");
  ok(IkiWiki::loadplugin('po'), "po plugin loaded");
  IkiWiki::checkconfig();
  
@@@ -51,7 -53,6 +54,7 @@@ $pagesources{'index'}='index.mdwn'
  $pagesources{'index.fr'}='index.fr.po';
  $pagesources{'index.es'}='index.es.po';
  $pagesources{'test1'}='test1.mdwn';
 +$pagesources{'test1.es'}='test1.es.po';
  $pagesources{'test1.fr'}='test1.fr.po';
  $pagesources{'test2'}='test2.mdwn';
  $pagesources{'test2.es'}='test2.es.po';
@@@ -67,10 -68,8 +70,10 @@@ foreach my $page (keys %pagesources) 
  }
  
  ### populate srcdir
 -writefile('index.mdwn', $config{srcdir}, '[[translatable]] [[nontranslatable]]');
 -writefile('test1.mdwn', $config{srcdir}, 'test1 content');
 +writefile('index.mdwn', $config{srcdir},
 +          "[[!meta title=\"index title\"]]\n[[translatable]] [[nontranslatable]]");
 +writefile('test1.mdwn', $config{srcdir},
 +          "[[!meta title=\"test1 title\"]]\ntest1 content");
  writefile('test2.mdwn', $config{srcdir}, 'test2 content');
  writefile('test3.mdwn', $config{srcdir}, 'test3 content');
  writefile('translatable.mdwn', $config{srcdir}, '[[nontranslatable]]');
@@@ -89,9 -88,6 +92,9 @@@ ok(! IkiWiki::Plugin::po::istranslation
  ok(IkiWiki::Plugin::po::istranslation('index.fr'), "index.fr is a translation");
  ok(IkiWiki::Plugin::po::istranslation('index.es'), "index.es is a translation");
  ok(IkiWiki::Plugin::po::istranslation('/index.fr'), "/index.fr is a translation");
 +ok(IkiWiki::Plugin::po::istranslatable('test1'), "test1 is translatable");
 +ok(IkiWiki::Plugin::po::istranslation('test1.es'), "test1.es is a translation");
 +ok(IkiWiki::Plugin::po::istranslation('test1.fr'), "test1.fr is a translation");
  ok(IkiWiki::Plugin::po::istranslatable('test2'), "test2 is translatable");
  ok(! IkiWiki::Plugin::po::istranslation('test2'), "test2 is not a translation");
  ok(! IkiWiki::Plugin::po::istranslatable('test3'), "test3 is not translatable");
@@@ -125,8 -121,8 +128,8 @@@ $config{po_link_to}='negotiated'
  $msgprefix="links (po_link_to=negotiated)";
  refresh_n_scan('index.mdwn', 'translatable.mdwn', 'nontranslatable.mdwn');
  is_deeply(\@{$links{'index'}}, ['translatable', 'nontranslatable'], "$msgprefix index");
- is_deeply(\@{$links{'index.es'}}, ['translatable.es', 'nontranslatable', 'SandBox', 'ikiwiki'], "$msgprefix index.es");
- is_deeply(\@{$links{'index.fr'}}, ['translatable.fr', 'nontranslatable', 'SandBox', 'ikiwiki'], "$msgprefix index.fr");
+ is_deeply(\@{$links{'index.es'}}, ['translatable.es', 'nontranslatable'], "$msgprefix index.es");
+ is_deeply(\@{$links{'index.fr'}}, ['translatable.fr', 'nontranslatable'], "$msgprefix index.fr");
  is_deeply(\@{$links{'translatable'}}, ['nontranslatable'], "$msgprefix translatable");
  is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es");
  is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr");
@@@ -136,8 -132,8 +139,8 @@@ $config{po_link_to}='current'
  $msgprefix="links (po_link_to=current)";
  refresh_n_scan('index.mdwn', 'translatable.mdwn', 'nontranslatable.mdwn');
  is_deeply(\@{$links{'index'}}, ['translatable', 'nontranslatable'], "$msgprefix index");
- is_deeply(\@{$links{'index.es'}}, [ (map bestlink('index.es', $_), ('translatable.es', 'nontranslatable')), 'SandBox', 'ikiwiki'], "$msgprefix index.es");
- is_deeply(\@{$links{'index.fr'}}, [ (map bestlink('index.fr', $_), ('translatable.fr', 'nontranslatable')), 'SandBox', 'ikiwiki'], "$msgprefix index.fr");
+ is_deeply(\@{$links{'index.es'}}, [ (map bestlink('index.es', $_), ('translatable.es', 'nontranslatable'))], "$msgprefix index.es");
+ is_deeply(\@{$links{'index.fr'}}, [ (map bestlink('index.fr', $_), ('translatable.fr', 'nontranslatable'))], "$msgprefix index.fr");
  is_deeply(\@{$links{'translatable'}}, [bestlink('translatable', 'nontranslatable')], "$msgprefix translatable");
  is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es");
  is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr");
@@@ -189,25 -185,3 +192,25 @@@ $msgprefix="beautify_urlpath (po_link_t
  is(IkiWiki::beautify_urlpath('test1/index.html'), './test1/', "$msgprefix test1/index.html");
  is(IkiWiki::beautify_urlpath('test1/index.en.html'), './test1/', "$msgprefix test1/index.en.html");
  is(IkiWiki::beautify_urlpath('test1/index.fr.html'), './test1/', "$msgprefix test1/index.fr.html");
 +
 +### re-scan
 +refresh_n_scan('index.mdwn');
 +is($pagestate{'index'}{meta}{title}, 'index title');
 +is($pagestate{'index.es'}{meta}{title}, 'index title');
 +is($pagestate{'index.fr'}{meta}{title}, 'index title');
 +refresh_n_scan('test1.mdwn');
 +is($pagestate{'test1'}{meta}{title}, 'test1 title');
 +is($pagestate{'test1.es'}{meta}{title}, 'test1 title');
 +is($pagestate{'test1.fr'}{meta}{title}, 'test1 title');
 +
 +### istranslatedto
 +ok(IkiWiki::Plugin::po::istranslatedto('index', 'es'));
 +ok(IkiWiki::Plugin::po::istranslatedto('index', 'fr'));
 +ok(! IkiWiki::Plugin::po::istranslatedto('index', 'cz'));
 +ok(IkiWiki::Plugin::po::istranslatedto('test1', 'es'));
 +ok(IkiWiki::Plugin::po::istranslatedto('test1', 'fr'));
 +ok(! IkiWiki::Plugin::po::istranslatedto('test1', 'cz'));
 +ok(! IkiWiki::Plugin::po::istranslatedto('nontranslatable', 'es'));
 +ok(! IkiWiki::Plugin::po::istranslatedto('nontranslatable', 'cz'));
 +ok(! IkiWiki::Plugin::po::istranslatedto('test1.es', 'fr'));
 +ok(! IkiWiki::Plugin::po::istranslatedto('test1.fr', 'es'));