diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-15 12:42:50 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-15 12:42:50 +0200 |
| commit | 633fbfe123fe89b9ffdc6505769e3be9a59af21c (patch) | |
| tree | 3b6f2ae9c00443e3a5e6765f6d297a2e2c0dba15 | |
| parent | 2d00086cb477000ad925392c60216b1c5bba8542 (diff) | |
| parent | bc06d9c59525a59282ca8ba1e46aa04d1770fd19 (diff) | |
Merge branch '_multilang' into allinone-multilang
| -rw-r--r-- | ikiwiki_da.setup | 2 | ||||
| -rw-r--r-- | ikiwiki_da_admin.setup | 2 | ||||
| -rw-r--r-- | ikiwiki_nb.setup | 2 | ||||
| -rw-r--r-- | ikiwiki_nb_admin.setup | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 8ecef5b..0e473bb 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -18,7 +18,7 @@ use IkiWiki::Setup::Standard { cgiurl => "http://wiki.example.org/ikiwiki.da.cgi", templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_nonedit_l10n/da", underlaydirs => [ - $ENV{'HOME'} . "/private_webdata/samplewiki/content_da", + $ENV{'HOME'} . "/private_webdata/samplewiki/content_l10n/da", #$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/da", $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_nonedit_l10n/da", ], diff --git a/ikiwiki_da_admin.setup b/ikiwiki_da_admin.setup index be6b284..998fa3f 100644 --- a/ikiwiki_da_admin.setup +++ b/ikiwiki_da_admin.setup @@ -11,7 +11,7 @@ use IkiWiki::Setup::Standard { adminemail => 'me@example.org', # Be sure to customise these.. - srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content_da", + srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content_l10n/da", destdir => $ENV{'HOME'} . "/public_websites/admin.example.org", url => "http://admin.example.org", diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index ba7e7da..947a5c8 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -18,7 +18,7 @@ use IkiWiki::Setup::Standard { cgiurl => "http://wiki.example.org/ikiwiki.nb.cgi", templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_nonedit_l10n/nb", underlaydirs => [ - $ENV{'HOME'} . "/private_webdata/samplewiki/content_nb", + $ENV{'HOME'} . "/private_webdata/samplewiki/content_l10n/nb", #$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/nb", $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_nonedit_l10n/nb", ], diff --git a/ikiwiki_nb_admin.setup b/ikiwiki_nb_admin.setup index 155fd10..22ffd6a 100644 --- a/ikiwiki_nb_admin.setup +++ b/ikiwiki_nb_admin.setup @@ -11,7 +11,7 @@ use IkiWiki::Setup::Standard { adminemail => 'me@example.org', # Be sure to customise these.. - srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content_nb", + srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content_l10n/nb", destdir => $ENV{'HOME'} . "/public_websites/admin.example.org", url => "http://admin.example.org", |