Use git submodule, synced with allinone* branches, and restructure to use trailing _LL (not _l10n/LL) for add-on languages.

21 files changed, 44 insertions, 12 deletions

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
-Subproject d197120d77000d1a26ae7a2e67535445d09b370
+Subproject b7e6f5cc46e494382d13d1684315ef2b4674f7f
diff --git a/basewiki_da b/basewiki_da
new file mode 160000
+Subproject d197120d77000d1a26ae7a2e67535445d09b370
diff --git a/basewiki_nb b/basewiki_nb
new file mode 160000
+Subproject d298a5fe6aa3f3308377635adb64f67834433ea
diff --git a/basewiki_nonedit b/basewiki_nonedit
-Subproject 240f2f0aeec158e94b54ca23a2cf3e19b95e5ea
+Subproject da47e211683a1b709cbe06d3cacaefa7e57c1f2
diff --git a/basewiki_nonedit_da b/basewiki_nonedit_da
new file mode 160000
+Subproject 8321feea467909190764dde311e1918adb729b3
diff --git a/basewiki_nonedit_nb b/basewiki_nonedit_nb
new file mode 160000
+Subproject 240f2f0aeec158e94b54ca23a2cf3e19b95e5ea
diff --git a/directives_da b/directives_da
new file mode 160000
+Subproject 6634fec4377c1d358edc87c3819c280a9e27338
diff --git a/directives_nb b/directives_nb
new file mode 160000
+Subproject 6634fec4377c1d358edc87c3819c280a9e27338
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
-Subproject 65d409ec96033f5f197c187740d2ad7bc3ea866
+Subproject 53c7e615015d7a1a504996e001a8ce38df41f35
diff --git a/smiley_da b/smiley_da
new file mode 160000
+Subproject 65d409ec96033f5f197c187740d2ad7bc3ea866
diff --git a/smiley_nb b/smiley_nb
new file mode 160000
+Subproject 60c3fee2d6e48ebd094b59be3385bcb8cf9ea9c
diff --git a/templates b/templates
-Subproject 9ced7b77811a5da81bec49b9174d45dc8364e91
+Subproject e310666f0122eed6767fbc6f36c8895f8c8b713
diff --git a/templates_da b/templates_da
new file mode 160000
+Subproject 9ced7b77811a5da81bec49b9174d45dc8364e91
diff --git a/templates_nb b/templates_nb
new file mode 160000
+Subproject bc2428706e55a105261241c281190e7cddc3f91
diff --git a/templates_nonedit b/templates_nonedit
-Subproject 8c0c142ad073666eaa626ea6bebcc76138e351f
+Subproject 605cb4391d31b3f3ab5f95f97c4b5a6dcb0685e
diff --git a/templates_nonedit_da b/templates_nonedit_da
new file mode 160000
+Subproject 14bb211648396f091577ab4599bbdf8d9e8da26
diff --git a/templates_nonedit_nb b/templates_nonedit_nb
new file mode 160000
+Subproject 8c0c142ad073666eaa626ea6bebcc76138e351f