From 7be58dcdb4e97ea69afbf42d7dcfcd56474bddc1 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 15 Aug 2008 00:59:26 +0200 Subject: Use locale-specific content. Fix danish underlay. --- .gitignore | 2 ++ Makefile | 2 +- ikiwiki_da.setup | 4 ++-- ikiwiki_da_admin.setup | 2 +- ikiwiki_nb.setup | 4 ++-- ikiwiki_nb_admin.setup | 9 +++++++-- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index df30d2f..21df910 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ /basewiki_nonedit_l10n /content /content_dummy +/content_da_dummy +/content_nb_dummy /smiley /smiley_l10n /templates diff --git a/Makefile b/Makefile index 786d5e3..84d0412 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ ikiwiki_LOCALES = da nb #ikiwiki_POMODULES = basewiki smiley #ikiwiki_POLOCALES = da -dummy_MODULES = content_dummy +dummy_MODULES = content_dummy content_da_dummy content_nb_dummy # uncomment this when ikiwiki.setup is configured for the local environment #CONFIGS = ikiwiki.setup ikiwiki_da.setup ikiwiki_nb.setup ikiwiki_admin.setup ikiwiki_da_admin.setup ikiwiki_nb_admin.setup diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index d0814c6..c95312a 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -11,14 +11,14 @@ use IkiWiki::Setup::Standard { adminemail => 'me@example.org', # Be sure to customise these.. - srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content", + srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content_da_dummy", destdir => $ENV{'HOME'} . "/public_websites/wiki.example.org", url => "http://wiki.example.org", cgiurl => "http://wiki.example.org/ikiwiki.cgi", templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_nonedit_l10n/da", underlaydirs => [ - $ENV{'HOME'} . "/private_webdata/samplewiki/content", + $ENV{'HOME'} . "/private_webdata/samplewiki/content_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 c6df093..3d614f9 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", + srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content_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 8642e63..c204c99 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -11,14 +11,14 @@ use IkiWiki::Setup::Standard { adminemail => 'me@example.org', # Be sure to customise these.. - srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content", + srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content_nb_dummy", destdir => $ENV{'HOME'} . "/public_websites/wiki.example.org", url => "http://wiki.example.org", cgiurl => "http://wiki.example.org/ikiwiki.cgi", templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_nonedit_l10n/nb", underlaydirs => [ - $ENV{'HOME'} . "/private_webdata/samplewiki/content", + $ENV{'HOME'} . "/private_webdata/samplewiki/content_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 20c91b7..16f9b12 100644 --- a/ikiwiki_nb_admin.setup +++ b/ikiwiki_nb_admin.setup @@ -11,12 +11,17 @@ use IkiWiki::Setup::Standard { adminemail => 'me@example.org', # Be sure to customise these.. - srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content", + srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content_nb", destdir => $ENV{'HOME'} . "/public_websites/admin.example.org", url => "http://admin.example.org", cgiurl => "http://admin.wiki.example.org/ikiwiki.cgi", - templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates", + templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_nonedit_l10n/nb", + underlaydirs => [ + #$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/nb", + $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_l10n/nb", + ], + # Some plugins (smiley in particular) need non-localized master underlay underlaydir => $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki", # Git stuff. -- cgit v1.2.3