locales.js (moment-2.29.2) | : | locales.js (moment-2.29.3) | ||
---|---|---|---|---|
skipping to change at line 10100 | skipping to change at line 10100 | |||
if ( | if ( | |||
number % 10 >= 1 && | number % 10 >= 1 && | |||
number % 10 <= 4 && | number % 10 <= 4 && | |||
(number % 100 < 10 || number % 100 >= 20) | (number % 100 < 10 || number % 100 >= 20) | |||
) { | ) { | |||
return number % 10 === 1 ? wordKey[0] : wordKey[1]; | return number % 10 === 1 ? wordKey[0] : wordKey[1]; | |||
} | } | |||
return wordKey[2]; | return wordKey[2]; | |||
}, | }, | |||
translate: function (number, withoutSuffix, key, isFuture) { | translate: function (number, withoutSuffix, key, isFuture) { | |||
var wordKey = translator$1.words[key]; | var wordKey = translator$1.words[key], | |||
word; | ||||
if (key.length === 1) { | if (key.length === 1) { | |||
// Nominativ | // Nominativ | |||
if (key === 'y' && withoutSuffix) return 'једна година'; | if (key === 'y' && withoutSuffix) return 'једна година'; | |||
return isFuture || withoutSuffix ? wordKey[0] : wordKey[1]; | return isFuture || withoutSuffix ? wordKey[0] : wordKey[1]; | |||
} | } | |||
const word = translator$1.correctGrammaticalCase(number, wordKey); | word = translator$1.correctGrammaticalCase(number, wordKey); | |||
// Nominativ | // Nominativ | |||
if (key === 'yy' && withoutSuffix && word === 'годину') { | if (key === 'yy' && withoutSuffix && word === 'годину') { | |||
return number + ' година'; | return number + ' година'; | |||
} | } | |||
return number + ' ' + word; | return number + ' ' + word; | |||
}, | }, | |||
}; | }; | |||
moment.defineLocale('sr-cyrl', { | moment.defineLocale('sr-cyrl', { | |||
skipping to change at line 10222 | skipping to change at line 10223 | |||
if ( | if ( | |||
number % 10 >= 1 && | number % 10 >= 1 && | |||
number % 10 <= 4 && | number % 10 <= 4 && | |||
(number % 100 < 10 || number % 100 >= 20) | (number % 100 < 10 || number % 100 >= 20) | |||
) { | ) { | |||
return number % 10 === 1 ? wordKey[0] : wordKey[1]; | return number % 10 === 1 ? wordKey[0] : wordKey[1]; | |||
} | } | |||
return wordKey[2]; | return wordKey[2]; | |||
}, | }, | |||
translate: function (number, withoutSuffix, key, isFuture) { | translate: function (number, withoutSuffix, key, isFuture) { | |||
var wordKey = translator$2.words[key]; | var wordKey = translator$2.words[key], | |||
word; | ||||
if (key.length === 1) { | if (key.length === 1) { | |||
// Nominativ | // Nominativ | |||
if (key === 'y' && withoutSuffix) return 'jedna godina'; | if (key === 'y' && withoutSuffix) return 'jedna godina'; | |||
return isFuture || withoutSuffix ? wordKey[0] : wordKey[1]; | return isFuture || withoutSuffix ? wordKey[0] : wordKey[1]; | |||
} | } | |||
const word = translator$2.correctGrammaticalCase(number, wordKey); | word = translator$2.correctGrammaticalCase(number, wordKey); | |||
// Nominativ | // Nominativ | |||
if (key === 'yy' && withoutSuffix && word === 'godinu') { | if (key === 'yy' && withoutSuffix && word === 'godinu') { | |||
return number + ' godina'; | return number + ' godina'; | |||
} | } | |||
return number + ' ' + word; | return number + ' ' + word; | |||
}, | }, | |||
}; | }; | |||
moment.defineLocale('sr', { | moment.defineLocale('sr', { | |||
End of changes. 4 change blocks. | ||||
4 lines changed or deleted | 6 lines changed or added |