diff options
author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:46:41 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:47:40 +0200 |
commit | a3a014542bddda8ba54f45078232cceeadfa505b (patch) | |
tree | 9cc54a88d5b57212b420625417f085d0706e4cbb /ikiwiki_nb.setup | |
parent | 732fe48592a0f89c572c19f87314f43f6502bcb7 (diff) | |
parent | 845babe7307e76ce905d45dd74a14dcd3d67cecb (diff) |
Merge branch 'nb' into _multilang
Conflicts (manually resolve):
Makefile
basewiki
ikiwiki_nb.setup
templates
Diffstat (limited to 'ikiwiki_nb.setup')
-rw-r--r-- | ikiwiki_nb.setup | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 4d84eb8..182ba39 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -57,7 +57,7 @@ use IkiWiki::Setup::Standard { # strftime format string to display date timeformat => '%c', # UTF-8 locale to use - locale => 'no_NB.UTF-8', + locale => 'nb_NO.UTF-8', # put user pages below specified page userdir => '', # how many backlinks to show before hiding excess (0 to show all) |