Skip to content

Commit

Permalink
Updated rc-picker 1.10.0 -> 1.10.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Johannes-Andersen committed Jul 5, 2020
1 parent 0d05458 commit 5475624
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 32 deletions.
33 changes: 2 additions & 31 deletions components/date-picker/locale/nb_NO.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import CalendarLocale from 'rc-picker/lib/locale/nb_NO';
import TimePickerLocale from '../../time-picker/locale/nb_NO';
import { PickerLocale } from '../generatePicker';

// Merge into a locale object
const locale: PickerLocale = {
lang: {
locale: 'nb_NO',
placeholder: 'Velg dato',
yearPlaceholder: 'Velg år',
quarterPlaceholder: 'Velg kvartal',
Expand All @@ -14,40 +14,11 @@ const locale: PickerLocale = {
rangeYearPlaceholder: ['Startår', 'Sluttår'],
rangeMonthPlaceholder: ['Startmåned', 'Sluttmåned'],
rangeWeekPlaceholder: ['Start uke', 'Sluttuke'],
today: 'I dag',
now: 'Nå',
backToToday: 'Tilbake til i dag',
ok: 'Ok',
clear: 'Fjern',
month: 'Måned',
year: 'År',
timeSelect: 'Velg tid',
dateSelect: 'Velg dato',
monthSelect: 'Velg en måned',
yearSelect: 'Velg et år',
decadeSelect: 'Velg et tiår',
monthBeforeYear: true,
previousMonth: 'Forrige måned (PageUp)',
nextMonth: 'Neste måned (PageDown)',
previousYear: 'I fjor (Kontroll + venstre)',
nextYear: 'Neste år (Kontroll + høyre)',
previousDecade: 'Siste tiår',
nextDecade: 'Neste tiår',
previousCentury: 'Siste århundre',
nextCentury: 'Neste århundre',
yearFormat: 'YYYY',
dateFormat: 'DD.MM.YYYY',
dayFormat: 'DD',
dateTimeFormat: 'DD.MM.YYYY HH:mm:ss',
...CalendarLocale,
},
timePickerLocale: {
placeholder: 'Select time',
...TimePickerLocale,
},
dateFormat: 'YYYY-MM-DD',
dateTimeFormat: 'YYYY-MM-DD HH:mm:ss',
weekFormat: 'YYYY-wo',
monthFormat: 'YYYY-MM',
};

// All settings at:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
"rc-menu": "~8.3.0",
"rc-notification": "~4.4.0",
"rc-pagination": "~2.4.1",
"rc-picker": "~1.10.0",
"rc-picker": "~1.10.6",
"rc-progress": "~3.0.0",
"rc-rate": "~2.8.2",
"rc-resize-observer": "^0.2.3",
Expand Down

0 comments on commit 5475624

Please sign in to comment.