diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-14 14:28:01 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-14 14:28:01 +0200 |
| commit | dec1e67a56c3b4588f9726dd605b84deab96cf58 (patch) | |
| tree | 8b0a42b122d6657eade629f04110ca2ff5d51798 | |
| parent | 97c2f00d8748f7cb2c0a3b82694ca6cab6531897 (diff) | |
| parent | cceedc3ff37025a679d6be0e36e3ef682b01a9c4 (diff) | |
Merge branch '_multilang' into multilang
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .gitmodules | 12 | ||||
| m--------- | basewiki_da | 0 | ||||
| m--------- | basewiki_nb | 0 | ||||
| -rw-r--r-- | ikiwiki_da.setup | 11 | ||||
| -rw-r--r-- | ikiwiki_nb.setup | 11 | ||||
| m--------- | templates_da | 0 | ||||
| m--------- | templates_nb | 0 |
8 files changed, 18 insertions, 18 deletions
@@ -1,10 +1,8 @@ /basewiki_l10n -/basewiki_nonedit /basewiki_nonedit_l10n /content /content_dummy /directives_l10n /smiley_l10n /templates_l10n -/templates_nonedit /templates_nonedit_l10n diff --git a/.gitmodules b/.gitmodules index 4c34cde..dfd5bce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,15 @@ [submodule "templates"] path = templates url = git://source.jones.dk/ikiwiki/templates +[submodule "basewiki_nb"] + path = basewiki_nb + url = git://source.jones.dk/ikiwiki/basewiki +[submodule "templates_nb"] + path = templates_nb + url = git://source.jones.dk/ikiwiki/templates +[submodule "basewiki_da"] + path = basewiki_da + url = git://source.jones.dk/ikiwiki/basewiki +[submodule "templates_da"] + path = templates_da + url = git://source.jones.dk/ikiwiki/templates diff --git a/basewiki_da b/basewiki_da new file mode 160000 +Subproject ef6324a81724619a7811a964200208f5c808ac1 diff --git a/basewiki_nb b/basewiki_nb new file mode 160000 +Subproject ef6324a81724619a7811a964200208f5c808ac1 diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index c7b91a6..44e84ff 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -15,7 +15,7 @@ use IkiWiki::Setup::Standard { # users who are banned from the wiki banned_users => [], # where the source of the wiki is located - srcdir => $ENV{'HOME'} . '/private_webdata/samplewiki/content_l10n/da', + srcdir => $ENV{'HOME'} . '/private_webdata/samplewiki/content_da', # where to build the wiki destdir => $ENV{'HOME'} . '/public_websites/wiki.example.org', # base url to the wiki @@ -33,14 +33,9 @@ use IkiWiki::Setup::Standard { # plugins to disable disable_plugins => [], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_l10n/da', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_da', # base wiki source location - underlaydirs => [ - #$ENV{'HOME'} . '/private_webdata/samplewiki/smiley_l10n/da', - $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_l10n/da', - ], - # Some plugins (smiley in particular) need non-localized master underlay - underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki', + underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_da', # display verbose messages when building? #verbose => 1, # log to syslog? diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 09aa8d0..17886ac 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -15,7 +15,7 @@ use IkiWiki::Setup::Standard { # users who are banned from the wiki banned_users => [], # where the source of the wiki is located - srcdir => $ENV{'HOME'} . '/private_webdata/samplewiki/content_l10n/nb', + srcdir => $ENV{'HOME'} . '/private_webdata/samplewiki/content_nb', # where to build the wiki destdir => $ENV{'HOME'} . '/public_websites/wiki.example.org', # base url to the wiki @@ -33,14 +33,9 @@ use IkiWiki::Setup::Standard { # plugins to disable disable_plugins => [], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_l10n/nb', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nb', # base wiki source location - 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', + underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nb', # display verbose messages when building? #verbose => 1, # log to syslog? diff --git a/templates_da b/templates_da new file mode 160000 +Subproject 90401bdc7cb46bc15e522cddaf1d22a4deb56e0 diff --git a/templates_nb b/templates_nb new file mode 160000 +Subproject 7ece5830013f820325074b5982742aed0f220f4 |