From e400d1744b0acd8a06f8bd535945cbdb143f2aa3 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 14 Jul 2010 17:28:23 +0200 Subject: Use git submodule, synced with allinone* branches, and restructure to use trailing _LL (not _l10n/LL) for add-on languages. --- .gitmodules | 36 ++++++++++++++++++++++++++++++++++++ basewiki | 2 +- basewiki_da | 1 + basewiki_nb | 1 + basewiki_nonedit | 2 +- basewiki_nonedit_da | 1 + basewiki_nonedit_nb | 1 + directives_da | 1 + directives_nb | 1 + ikiwiki_da.setup | 5 ++--- ikiwiki_da_admin.setup | 6 +++--- ikiwiki_nb.setup | 9 +++------ smiley | 2 +- smiley_da | 1 + smiley_nb | 1 + templates | 2 +- templates_da | 1 + templates_nb | 1 + templates_nonedit | 2 +- templates_nonedit_da | 1 + templates_nonedit_nb | 1 + 21 files changed, 61 insertions(+), 17 deletions(-) create mode 160000 basewiki_da create mode 160000 basewiki_nb create mode 160000 basewiki_nonedit_da create mode 160000 basewiki_nonedit_nb create mode 160000 directives_da create mode 160000 directives_nb create mode 160000 smiley_da create mode 160000 smiley_nb create mode 160000 templates_da create mode 160000 templates_nb create mode 160000 templates_nonedit_da create mode 160000 templates_nonedit_nb diff --git a/.gitmodules b/.gitmodules index 3d4256b..eec5fb2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,39 @@ [submodule "templates_nonedit"] path = templates_nonedit 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 +[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_nonedit_da"] + path = basewiki_nonedit_da + url = git://source.jones.dk/ikiwiki/basewiki +[submodule "templates_nonedit_da"] + path = templates_nonedit_da + url = git://source.jones.dk/ikiwiki/templates +[submodule "basewiki_nonedit_nb"] + path = basewiki_nonedit_nb + url = git://source.jones.dk/ikiwiki/basewiki +[submodule "templates_nonedit_nb"] + path = templates_nonedit_nb + url = git://source.jones.dk/ikiwiki/templates +[submodule "directives_da"] + path = directives_da + url = git://source.jones.dk/ikiwiki/directives +[submodule "directives_nb"] + path = directives_nb + url = git://source.jones.dk/ikiwiki/directives +[submodule "smiley_da"] + path = smiley_da + url = git://source.jones.dk/ikiwiki/smiley +[submodule "smiley_nb"] + path = smiley_nb + url = git://source.jones.dk/ikiwiki/smiley diff --git a/basewiki b/basewiki index d197120..b7e6f5c 160000 --- a/basewiki +++ b/basewiki @@ -1 +1 @@ -Subproject commit d197120d77000d1a26ae7a2e67535445d09b3705 +Subproject commit b7e6f5cc46e494382d13d1684315ef2b4674f7f4 diff --git a/basewiki_da b/basewiki_da new file mode 160000 index 0000000..d197120 --- /dev/null +++ b/basewiki_da @@ -0,0 +1 @@ +Subproject commit d197120d77000d1a26ae7a2e67535445d09b3705 diff --git a/basewiki_nb b/basewiki_nb new file mode 160000 index 0000000..d298a5f --- /dev/null +++ b/basewiki_nb @@ -0,0 +1 @@ +Subproject commit d298a5fe6aa3f3308377635adb64f67834433eac diff --git a/basewiki_nonedit b/basewiki_nonedit index 240f2f0..da47e21 160000 --- a/basewiki_nonedit +++ b/basewiki_nonedit @@ -1 +1 @@ -Subproject commit 240f2f0aeec158e94b54ca23a2cf3e19b95e5ea1 +Subproject commit da47e211683a1b709cbe06d3cacaefa7e57c1f2a diff --git a/basewiki_nonedit_da b/basewiki_nonedit_da new file mode 160000 index 0000000..8321fee --- /dev/null +++ b/basewiki_nonedit_da @@ -0,0 +1 @@ +Subproject commit 8321feea467909190764dde311e1918adb729b33 diff --git a/basewiki_nonedit_nb b/basewiki_nonedit_nb new file mode 160000 index 0000000..240f2f0 --- /dev/null +++ b/basewiki_nonedit_nb @@ -0,0 +1 @@ +Subproject commit 240f2f0aeec158e94b54ca23a2cf3e19b95e5ea1 diff --git a/directives_da b/directives_da new file mode 160000 index 0000000..6634fec --- /dev/null +++ b/directives_da @@ -0,0 +1 @@ +Subproject commit 6634fec4377c1d358edc87c3819c280a9e273380 diff --git a/directives_nb b/directives_nb new file mode 160000 index 0000000..6634fec --- /dev/null +++ b/directives_nb @@ -0,0 +1 @@ +Subproject commit 6634fec4377c1d358edc87c3819c280a9e273380 diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 6ee211a..c179a87 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -33,13 +33,12 @@ use IkiWiki::Setup::Standard { # plugins to disable disable_plugins => [], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit_da', # base wiki source location underlaydirs => [ $ENV{'HOME'} . '/private_webdata/samplewiki/content', ], - # Some plugins (smiley in particular) need non-localized master underlay - underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit', + underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit_da', # display verbose messages when building? #verbose => 1, # log to syslog? diff --git a/ikiwiki_da_admin.setup b/ikiwiki_da_admin.setup index 92bbde3..179cc51 100644 --- a/ikiwiki_da_admin.setup +++ b/ikiwiki_da_admin.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/admin.da.wiki.example.org', # base url to the wiki @@ -33,9 +33,9 @@ use IkiWiki::Setup::Standard { # plugins to disable disable_plugins => [], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_da', # base wiki source location - 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 c18ebd5..0b56dcf 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -33,15 +33,12 @@ use IkiWiki::Setup::Standard { # plugins to disable disable_plugins => [], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit_l10n/nb', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit_nb', # base wiki source location underlaydirs => [ - $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', + $ENV{'HOME'} . '/private_webdata/samplewiki/content', ], - # Some plugins (smiley in particular) need non-localized master underlay - underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit', + underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit_nb', # display verbose messages when building? #verbose => 1, # log to syslog? diff --git a/smiley b/smiley index 65d409e..53c7e61 160000 --- a/smiley +++ b/smiley @@ -1 +1 @@ -Subproject commit 65d409ec96033f5f197c187740d2ad7bc3ea8661 +Subproject commit 53c7e615015d7a1a504996e001a8ce38df41f358 diff --git a/smiley_da b/smiley_da new file mode 160000 index 0000000..65d409e --- /dev/null +++ b/smiley_da @@ -0,0 +1 @@ +Subproject commit 65d409ec96033f5f197c187740d2ad7bc3ea8661 diff --git a/smiley_nb b/smiley_nb new file mode 160000 index 0000000..60c3fee --- /dev/null +++ b/smiley_nb @@ -0,0 +1 @@ +Subproject commit 60c3fee2d6e48ebd094b59be3385bcb8cf9ea9c1 diff --git a/templates b/templates index 9ced7b7..e310666 160000 --- a/templates +++ b/templates @@ -1 +1 @@ -Subproject commit 9ced7b77811a5da81bec49b9174d45dc8364e917 +Subproject commit e310666f0122eed6767fbc6f36c8895f8c8b713f diff --git a/templates_da b/templates_da new file mode 160000 index 0000000..9ced7b7 --- /dev/null +++ b/templates_da @@ -0,0 +1 @@ +Subproject commit 9ced7b77811a5da81bec49b9174d45dc8364e917 diff --git a/templates_nb b/templates_nb new file mode 160000 index 0000000..bc24287 --- /dev/null +++ b/templates_nb @@ -0,0 +1 @@ +Subproject commit bc2428706e55a105261241c281190e7cddc3f91d diff --git a/templates_nonedit b/templates_nonedit index 8c0c142..605cb43 160000 --- a/templates_nonedit +++ b/templates_nonedit @@ -1 +1 @@ -Subproject commit 8c0c142ad073666eaa626ea6bebcc76138e351f6 +Subproject commit 605cb4391d31b3f3ab5f95f97c4b5a6dcb0685e9 diff --git a/templates_nonedit_da b/templates_nonedit_da new file mode 160000 index 0000000..14bb211 --- /dev/null +++ b/templates_nonedit_da @@ -0,0 +1 @@ +Subproject commit 14bb211648396f091577ab4599bbdf8d9e8da26d diff --git a/templates_nonedit_nb b/templates_nonedit_nb new file mode 160000 index 0000000..8c0c142 --- /dev/null +++ b/templates_nonedit_nb @@ -0,0 +1 @@ +Subproject commit 8c0c142ad073666eaa626ea6bebcc76138e351f6 -- cgit v1.2.3