Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[locale] nb: Fixed typo in relative times #5790

Closed
wants to merge 2 commits into from
Closed

[locale] nb: Fixed typo in relative times #5790

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1cd80d
Fixed typo (replaced en with én) in relative times for norwegian lang…
Youenn-Bouglouan Dec 4, 2020
910ffa9
updated locale file in src/ and src/test/ folders, reverted changes i…
Youenn-Bouglouan Dec 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
updated locale file in src/ and src/test/ folders, reverted changes i… 
…n locale/ folder
  • Loading branch information
@Youenn-Bouglouan
Youenn-Bouglouan committed Dec 21, 2020
commit 910ffa9b64ea46232655b07083db0c7ff9c39996
8 changes: 4 additions & 4 deletions locale/nb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,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',
Expand Down
8 changes: 4 additions & 4 deletions src/locale/nb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,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',
Expand Down
18 changes: 9 additions & 9 deletions src/test/locale/nb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,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(
Expand All @@ -200,12 +200,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(
Expand All @@ -215,7 +215,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(
Expand All @@ -230,17 +230,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(
Expand All @@ -260,7 +260,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(
Expand Down