Skip to content

Commit

Permalink
fix: Update nb (Norsk Bokmål) locale (#604)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Spiralis @iamkun
Spiralis authored and iamkun committed May 28, 2019
1 parent 790cd1a commit 907f5c9
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/locale/nb.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import dayjs from 'dayjs'
const locale = {
name: 'nb',
weekdays: 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
weekdaysShort: 'sø._ma._ti._on._to._fr._lø.'.split('_'),
weekdaysMin: 'sø_ma_ti_on_to_fr_lø'.split('_'),
months: 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
monthsShort: 'jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.'.split('_'),
ordinal: n => `${n}.`,
weekStart: 1,
formats: {
Expand Down Expand Up @@ -34,4 +37,3 @@ const locale = {
dayjs.locale(locale, null, true)

export default locale

5 comments on commit 907f5c9

@Spiralis
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@iamkun Something definetively went wrong with that merge. Only the weekdaysMin seems to match my pull request:

...
  weekdaysShort: 'søn_man_tir_ons_tor_fre_lør'.split('_'),
  weekdaysMin: 'sø_ma_ti_on_to_fr_lø'.split('_'),  
...
  monthsShort: 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
...

@iamkun
Copy link
Owner

@iamkun iamkun commented on 907f5c9 May 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, we've modified this PR a little bit intends to be the same with moment.js locale nb.

If you think they are wrong, feel free to open a correct PR to moment.js and we will keep them in sync.

@Spiralis
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. The moment nb version is really no good. I have just sent a PR to them with some changes. Hopefully they will pick that up soon.

@iamkun
Copy link
Owner

@iamkun iamkun commented on 907f5c9 May 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great!

@Spiralis
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It has passed all checks, including tests. moment/moment#5125

But, unfortunately it seems from the backlog that there may take some time to close the PR. There is a backlog of merges waiting, so... https://github.com/moment/moment/pulls

Please sign in to comment.