IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3569 from gschlager/i18n

Browse Source 
FEATURE: Make abbreviated numbers (k, M) localizable
This commit is contained in:
Robin Ward
2015-07-01 15:27:17 -04:00
parent bfb4dc0055 d08693edce
commit c4b685469e
31 changed files with 183 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/lib/formatter.js
View File

@@ -258,14 +258,18 @@ relativeAge = function(date, options) {
};
var number = function(val) {
var formattedNumber;
val = parseInt(val, 10);
if (isNaN(val)) val = 0;
if (val > 999999) {
return (val / 1000000).toFixed(1) + "M";
formattedNumber = I18n.toNumber(val / 1000000, {precision: 1});
return I18n.t("number.short.millions", {number: formattedNumber});
}
if (val > 999) {
return (val / 1000).toFixed(1) + "K";
formattedNumber = I18n.toNumber(val / 1000, {precision: 1});
return I18n.t("number.short.thousands", {number: formattedNumber});
}
return val.toString();
};