updated locale file in src/ and src/test/ folders, reverted changes in locale/ folder

diff --git a/locale/nb.js b/locale/nb.js
index 1f271aae28fe6d48025f26216d4d2f1a47ad860e..74da7aff5257b54ac9c20383c571bb560e8fe413 100644 (file)
--- a/locale/nb.js
+++ b/locale/nb.js
@@ -47,13 +47,13 @@
             ss: '%d sekunder',
             m: 'ett minutt',
             mm: '%d minutter',
-            h: 'én time',
+            h: 'en time',
             hh: '%d timer',
-            d: 'én dag',
+            d: 'en dag',
             dd: '%d dager',
-            w: 'én uke',
+            w: 'en uke',
             ww: '%d uker',
-            M: 'én måned',
+            M: 'en måned',
             MM: '%d måneder',
             y: 'ett år',
             yy: '%d år',

diff --git a/src/locale/nb.js b/src/locale/nb.js
index c218f518f68caa90e295fd792dee01821c3794e8..cce3aaa9f5c4f8be1b1934cd9e21693a6da72792 100644 (file)
--- a/src/locale/nb.js
+++ b/src/locale/nb.js
@@ -40,13 +40,13 @@ export default moment.defineLocale('nb', {
         ss: '%d sekunder',
         m: 'ett minutt',
         mm: '%d minutter',
-        h: 'en time',
+        h: 'én time',
         hh: '%d timer',
-        d: 'en dag',
+        d: 'én dag',
         dd: '%d dager',
-        w: 'en uke',
+        w: 'én uke',
         ww: '%d uker',
-        M: 'en måned',
+        M: 'én måned',
         MM: '%d måneder',
         y: 'ett år',
         yy: '%d år',

diff --git a/src/test/locale/nb.js b/src/test/locale/nb.js
index 123cbb39b893d09e304ed32b1fe4fdbbcbc4fde8..b2b6848430768ee9c94610c175f166c781180366 100644 (file)
--- a/src/test/locale/nb.js
+++ b/src/test/locale/nb.js
@@ -178,12 +178,12 @@ test('from', function (assert) {
     );
     assert.equal(
         start.from(moment([2007, 1, 28]).add({ m: 45 }), true),
-        'en time',
+        'én time',
         '45 minutes = an hour'
     );
     assert.equal(
         start.from(moment([2007, 1, 28]).add({ m: 89 }), true),
-        'en time',
+        'én time',
         '89 minutes = an hour'
     );
     assert.equal(
@@ -203,12 +203,12 @@ test('from', function (assert) {
     );
     assert.equal(
         start.from(moment([2007, 1, 28]).add({ h: 22 }), true),
-        'en dag',
+        'én dag',
         '22 hours = a day'
     );
     assert.equal(
         start.from(moment([2007, 1, 28]).add({ h: 35 }), true),
-        'en dag',
+        'én dag',
         '35 hours = a day'
     );
     assert.equal(
@@ -218,7 +218,7 @@ test('from', function (assert) {
     );
     assert.equal(
         start.from(moment([2007, 1, 28]).add({ d: 1 }), true),
-        'en dag',
+        'én dag',
         '1 day = a day'
     );
     assert.equal(
@@ -233,17 +233,17 @@ test('from', function (assert) {
     );
     assert.equal(
         start.from(moment([2007, 1, 28]).add({ d: 26 }), true),
-        'en måned',
+        'én måned',
         '26 days = a month'
     );
     assert.equal(
         start.from(moment([2007, 1, 28]).add({ d: 30 }), true),
-        'en måned',
+        'én måned',
         '30 days = a month'
     );
     assert.equal(
         start.from(moment([2007, 1, 28]).add({ d: 43 }), true),
-        'en måned',
+        'én måned',
         '43 days = a month'
     );
     assert.equal(
@@ -263,7 +263,7 @@ test('from', function (assert) {
     );
     assert.equal(
         start.from(moment([2007, 1, 28]).add({ M: 1 }), true),
-        'en måned',
+        'én måned',
         '1 month = a month'
     );
     assert.equal(