nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly support pluralization in timeago strings

Browse source
This commit is contained in:
Jonne Haß 2016-07-24 17:40:06 +02:00
parent f91734028c
commit 734f332333
No known key found for this signature in database
GPG key ID: F347E0EB47AC70D6
2 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/javascripts/widgets/timeago.js
View file

@ -10,11 +10,18 @@
if (Diaspora.I18n.language !== "en") {
$.timeago.settings.lang = Diaspora.I18n.language;
$.timeago.settings.strings[Diaspora.I18n.language] = {};
$.each($.timeago.settings.strings["en"], function(index) {
$.each($.timeago.settings.strings.en, function(index) {
if (index === "numbers") {
$.timeago.settings.strings[Diaspora.I18n.language][index] = [];
}
else {
} else if (index === "minutes" ||
index === "hours" ||
index === "days" ||
index === "months" ||
index === "years") {
$.timeago.settings.strings[Diaspora.I18n.language][index] = function(value) {
return Diaspora.I18n.t("timeago." + index, {count: value});
};
} else {
$.timeago.settings.strings[Diaspora.I18n.language][index] = Diaspora.I18n.t("timeago." + index);
}
});

20
config/locales/javascript/javascript.en.yml
View file

@ -95,15 +95,25 @@ en:
inPast: "any moment now"
seconds: "less than a minute"
minute: "about a minute"
minutes: "%d minutes"
minutes:
one: "1 minute"
other: "%d minutes"
hour: "about an hour"
hours: "about %d hours"
hours:
one: "about 1 hour"
other: "about %d hours"
day: "a day"
days: "%d days"
days:
one: "1 day"
other: "%d days"
month: "about a month"
months: "%d months"
months:
one: "1 month"
other: "%d months"
year: "about a year"
years: "%d years"
years:
one: "1 year"
other: "%d years"
wordSeparator: " "
contacts: