From 473e54703ecd464c8aa0fe23aa668f8cb39b47ba Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 14 Aug 2008 22:22:19 +0200 Subject: Switch to nb locale and ikiwiki_nb.setup in Makefile. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4f3fe1e..b1e52d0 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ ikiwiki_MODULES = templates basewiki smiley #ikiwiki_basewiki_FLAVORS = nonedit #ikiwiki_templates_FLAVORS = nonedit # locales used. Expands Git BRANCHes -#ikiwiki_LOCALES = da nb +ikiwiki_LOCALES = nb # gettext-based modules and locales used #ikiwiki_POMODULES = basewiki smiley #ikiwiki_POLOCALES = da @@ -18,7 +18,7 @@ ikiwiki_MODULES = templates basewiki smiley #dummy_MODULES = content_dummy # uncomment this when ikiwiki.setup is configured for the local environment -#CONFIGS = ikiwiki.setup +#CONFIGS = ikiwiki_nb.setup # Everything after this is generic -- cgit v1.2.3 From 05d3d86705d650215d2d6324932dd0554faa5b17 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 15 Aug 2008 01:02:45 +0200 Subject: Fix use locale-specific Git hook. --- ikiwiki_nb.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 295f618..44f8f35 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -87,7 +87,7 @@ use IkiWiki::Setup::Standard { # # Note that this will overwrite any existing # # post-update hook script, which may not be # # what you want. - # wrapper => $ENV{'HOME'} . "/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki", + # wrapper => $ENV{'HOME'} . "/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-nb", # wrappermode => "06755", #}, #{ -- cgit v1.2.3 From ab774567b9409b2054f308a908596ada6db54561 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 11 Jul 2010 20:03:51 +0200 Subject: Sync with master-nb branch of basewiki, smiley and templates. --- basewiki | 2 +- smiley | 2 +- templates | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/basewiki b/basewiki index b1fadc6..ef6324a 160000 --- a/basewiki +++ b/basewiki @@ -1 +1 @@ -Subproject commit b1fadc6eacaacb4d892b495e15ff82e9ba36c638 +Subproject commit ef6324a81724619a7811a964200208f5c808ac10 diff --git a/smiley b/smiley index 30dd469..0f24195 160000 --- a/smiley +++ b/smiley @@ -1 +1 @@ -Subproject commit 30dd469765c2396ded03355876af391e922e89b3 +Subproject commit 0f24195c7ac3858346dff976970b8b21e911242f diff --git a/templates b/templates index 03cdb15..7ece583 160000 --- a/templates +++ b/templates @@ -1 +1 @@ -Subproject commit 03cdb15da3f28c109a1a176d6c3f53cf5e1a18f3 +Subproject commit 7ece5830013f820325074b5982742aed0f220f48 -- cgit v1.2.3 From 1e79fb9bbee7c035892759ca130ec6f37157fe3d Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 11 Jul 2010 23:26:52 +0200 Subject: Use main basewiki and templates dir (not ...l10n subdir) in ikiwiki_nb.config. --- ikiwiki_nb.setup | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 1b43923..12a5b94 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -33,13 +33,8 @@ 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', # 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', # display verbose messages when building? #verbose => 1, -- cgit v1.2.3 From 92c4053537577799cb2991c01fadcd6de6d11314 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 19 Jul 2010 17:33:16 +0200 Subject: Sync with HEAD of submodules basewiki, javascript and openid-selector. --- basewiki | 2 +- javascript | 2 +- openid-selector | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/basewiki b/basewiki index ef6324a..320795e 160000 --- a/basewiki +++ b/basewiki @@ -1 +1 @@ -Subproject commit ef6324a81724619a7811a964200208f5c808ac10 +Subproject commit 320795e6d83f5d9fa2fefdcdd3f28cf1033243b8 diff --git a/javascript b/javascript index dea1eff..9bf18dd 160000 --- a/javascript +++ b/javascript @@ -1 +1 @@ -Subproject commit dea1eff3d9e9781e5b92a326ad7df17d3ba8ba11 +Subproject commit 9bf18ddbcb122e0f0005c06870c3b792bf7d9b0a diff --git a/openid-selector b/openid-selector index b4852ae..517a71e 160000 --- a/openid-selector +++ b/openid-selector @@ -1 +1 @@ -Subproject commit b4852ae1f1905a285d69947d6352b68983033246 +Subproject commit 517a71e93b14812d722f000ab42a6e61cb7b4027 -- cgit v1.2.3 From 2c1aca2a6d4c07a0bfe86b00071740905dde6b80 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 19 Jul 2010 19:45:37 +0200 Subject: Fix revert submodules basewiki, javascript, openid-selector, smiley and templates to sync with HEAD of master (not master-nb: switch later). --- basewiki | 2 +- javascript | 2 +- openid-selector | 2 +- smiley | 2 +- templates | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/basewiki b/basewiki index ef6324a..6b53960 160000 --- a/basewiki +++ b/basewiki @@ -1 +1 @@ -Subproject commit ef6324a81724619a7811a964200208f5c808ac10 +Subproject commit 6b53960c5bbcf6a43f2e48b0b37a94e1f909b522 diff --git a/javascript b/javascript index 9bf18dd..dea1eff 160000 --- a/javascript +++ b/javascript @@ -1 +1 @@ -Subproject commit 9bf18ddbcb122e0f0005c06870c3b792bf7d9b0a +Subproject commit dea1eff3d9e9781e5b92a326ad7df17d3ba8ba11 diff --git a/openid-selector b/openid-selector index 517a71e..b4852ae 160000 --- a/openid-selector +++ b/openid-selector @@ -1 +1 @@ -Subproject commit 517a71e93b14812d722f000ab42a6e61cb7b4027 +Subproject commit b4852ae1f1905a285d69947d6352b68983033246 diff --git a/smiley b/smiley index 0f24195..30dd469 160000 --- a/smiley +++ b/smiley @@ -1 +1 @@ -Subproject commit 0f24195c7ac3858346dff976970b8b21e911242f +Subproject commit 30dd469765c2396ded03355876af391e922e89b3 diff --git a/templates b/templates index 7ece583..5df058b 160000 --- a/templates +++ b/templates @@ -1 +1 @@ -Subproject commit 7ece5830013f820325074b5982742aed0f220f48 +Subproject commit 5df058b2b3dc6e565ad3b3604263f487ef65f2af -- cgit v1.2.3 From 235edae6896d19251dd4f75e5c8f4716340aa250 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 19 Jul 2010 19:54:27 +0200 Subject: Sync submodules basewiki, smiley and templates with HEAD of master-nb, and javascript and openid-selector with HEAD of master-da. --- basewiki | 2 +- javascript | 2 +- openid-selector | 2 +- smiley | 2 +- templates | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/basewiki b/basewiki index 6b53960..ef6324a 160000 --- a/basewiki +++ b/basewiki @@ -1 +1 @@ -Subproject commit 6b53960c5bbcf6a43f2e48b0b37a94e1f909b522 +Subproject commit ef6324a81724619a7811a964200208f5c808ac10 diff --git a/javascript b/javascript index dea1eff..9bf18dd 160000 --- a/javascript +++ b/javascript @@ -1 +1 @@ -Subproject commit dea1eff3d9e9781e5b92a326ad7df17d3ba8ba11 +Subproject commit 9bf18ddbcb122e0f0005c06870c3b792bf7d9b0a diff --git a/openid-selector b/openid-selector index b4852ae..517a71e 160000 --- a/openid-selector +++ b/openid-selector @@ -1 +1 @@ -Subproject commit b4852ae1f1905a285d69947d6352b68983033246 +Subproject commit 517a71e93b14812d722f000ab42a6e61cb7b4027 diff --git a/smiley b/smiley index 30dd469..0f24195 160000 --- a/smiley +++ b/smiley @@ -1 +1 @@ -Subproject commit 30dd469765c2396ded03355876af391e922e89b3 +Subproject commit 0f24195c7ac3858346dff976970b8b21e911242f diff --git a/templates b/templates index 5df058b..7ece583 160000 --- a/templates +++ b/templates @@ -1 +1 @@ -Subproject commit 5df058b2b3dc6e565ad3b3604263f487ef65f2af +Subproject commit 7ece5830013f820325074b5982742aed0f220f48 -- cgit v1.2.3