Merge branch 'no-norsk' into 2013-01-09-fixes

2013-01-09 13:13:19 +02:00
parent 4022eebbe9 5828dc2374
commit 8b4c5444b8
2 changed files with 3 additions and 2 deletions
--- a/data/langdb.yaml
+++ b/data/langdb.yaml
@@ -312,7 +312,8 @@ languages:
  nl-informal: [Latn, [EU, AM], Nederlands (informeel)]
  nl: [Latn, [EU, AM], Nederlands]
  nn: [Latn, [EU], norsk (nynorsk)]
-  "no": [Latn, [EU]]
+ # There's also nb for Bokmål and nn for Nynorsk
+  "no": [Latn, [EU], norsk]
  nov: [Latn, [WW], Novial]
  nqo: [Nkoo, [AF], ߒߞߏ]
  nrm: [Latn, [EU], Nouormand]
--- a/src/jquery.uls.data.js
+++ b/src/jquery.uls.data.js