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.

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

Makes formatDuration with Norwegian Locale Consistent with others #2631

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
61 changes: 18 additions & 43 deletions src/locale/nb/_lib/formatDistance/index.js
@@ -1,116 +1,91 @@
var formatDistanceLocale = {
lessThanXSeconds: {
singular: 'mindre enn ett sekund',
plural: 'mindre enn {{count}} sekunder'
plural: 'mindre enn {{count}} sekunder',
},

xSeconds: {
singular: 'ett sekund',
plural: '{{count}} sekunder'
plural: '{{count}} sekunder',
},

halfAMinute: 'et halvt minutt',

lessThanXMinutes: {
singular: 'mindre enn ett minutt',
plural: 'mindre enn {{count}} minutter'
plural: 'mindre enn {{count}} minutter',
},

xMinutes: {
singular: 'ett minutt',
plural: '{{count}} minutter'
plural: '{{count}} minutter',
},

aboutXHours: {
singular: 'omtrent en time',
plural: 'omtrent {{count}} timer'
plural: 'omtrent {{count}} timer',
},

xHours: {
singular: 'en time',
plural: '{{count}} timer'
plural: '{{count}} timer',
},

xDays: {
singular: 'en dag',
plural: '{{count}} dager'
plural: '{{count}} dager',
},

aboutXWeeks: {
singular: 'omtrent en uke',
plural: 'omtrent {{count}} uker'
plural: 'omtrent {{count}} uker',
},

xWeeks: {
singular: 'en uke',
plural: '{{count}} uker'
plural: '{{count}} uker',
},

aboutXMonths: {
singular: 'omtrent en måned',
plural: 'omtrent {{count}} måneder'
plural: 'omtrent {{count}} måneder',
},

xMonths: {
singular: 'en måned',
plural: '{{count}} måneder'
plural: '{{count}} måneder',
},

aboutXYears: {
singular: 'omtrent ett år',
plural: 'omtrent {{count}} år'
plural: 'omtrent {{count}} år',
},

xYears: {
singular: 'ett år',
plural: '{{count}} år'
plural: '{{count}} år',
},

overXYears: {
singular: 'over ett år',
plural: 'over {{count}} år'
plural: 'over {{count}} år',
},

almostXYears: {
singular: 'nesten ett år',
plural: 'nesten {{count}} år'
}
plural: 'nesten {{count}} år',
},
}

var wordMapping = [
'null',
'en',
'to',
'tre',
'fire',
'fem',
'seks',
'sju',
'åtte',
'ni',
'ti',
'elleve',
'tolv'
]

export default function formatDistance(token, count, options) {
options = options || {
onlyNumeric: false
}
options = options || {}

var translation = formatDistanceLocale[token]
var result
if (typeof translation === 'string') {
result = translation
} else if (count === 0 || count > 1) {
if (options.onlyNumeric) {
result = translation.plural.replace('{{count}}', count)
} else {
result = translation.plural.replace(
'{{count}}',
count < 13 ? wordMapping[count] : count
)
}
result = translation.plural.replace('{{count}}', count)
} else {
result = translation.singular
}
Expand Down