Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

feat(currencyFilter): add numbers after dot count parameter #3642

Closed
wants to merge 1 commit into from
Closed

feat(currencyFilter): add numbers after dot count parameter #3642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions i18n/src/converter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ function convertNumberData(dataObj, currencySymbols) {

if (currencySymbols[dataObj.DEF_CURRENCY_CODE]) {
numberFormats.CURRENCY_SYM = currencySymbols[dataObj.DEF_CURRENCY_CODE][1];
numberFormats.DEFAULT_PRECISION = (currencySymbols[dataObj.DEF_CURRENCY_CODE][0] === 0) ? 0 : 2;
} else {
if (dataObj.DEF_CURRENCY_CODE == 'MTL') {
numberFormats.CURRENCY_SYM = '₤'; //for some reason this is missing in closure
Expand All @@ -29,6 +30,7 @@ function convertNumberData(dataObj, currencySymbols) {
var code = numberFormats.CURRENCY_SYM = dataObj.DEF_CURRENCY_CODE;
console.log(code +' has no currency symbol in closure, used ' + code + ' instead!');
}
numberFormats.DEFAULT_PRECISION = 2;
}
return numberFormats;
}
Expand Down
7 changes: 5 additions & 2 deletions src/ng/filter/filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
*
* @param {number} amount Input to filter.
* @param {string=} symbol Currency symbol or identifier to be displayed.
* @param {number=} number of digits after dot after rounding.
* @returns {string} Formatted number.
*
*
Expand Down Expand Up @@ -44,9 +45,11 @@
currencyFilter.$inject = ['$locale'];
function currencyFilter($locale) {
var formats = $locale.NUMBER_FORMATS;
return function(amount, currencySymbol){
return function(amount, currencySymbol, meanNumbers){
meanNumbers = isNumber(meanNumbers) ? meanNumbers : formats.DEFAULT_PRECISION;
meanNumbers = meanNumbers || 2;
if (isUndefined(currencySymbol)) currencySymbol = formats.CURRENCY_SYM;
return formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, 2).
return formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, meanNumbers).
replace(/\u00A4/g, currencySymbol);
};
}
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_af-na.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "R",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u00a0",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_af-za.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "R",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u00a0",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_af.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "R",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u00a0",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_am-et.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "Birr",
"DECIMAL_SEP": ".",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ",",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_am.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "Birr",
"DECIMAL_SEP": ".",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ",",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-001.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-ae.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-bh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-dz.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-eg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-iq.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-jo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-kw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-lb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-ly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-ma.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-om.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-qa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-sa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-sd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-sy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-tn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar-ye.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u00a3",
"DECIMAL_SEP": "\u066b",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u066c",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_bg-bg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "lev",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u00a0",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_bg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "lev",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u00a0",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_bn-bd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u09f3",
"DECIMAL_SEP": ".",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ",",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_bn-in.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u09f3",
"DECIMAL_SEP": ".",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ",",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_bn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u09f3",
"DECIMAL_SEP": ".",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ",",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ca-ad.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u20ac",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ".",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ca-es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u20ac",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ".",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_ca.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u20ac",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ".",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_cs-cz.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "K\u010d",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u00a0",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_cs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "K\u010d",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "\u00a0",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_da-dk.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "kr",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ".",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_da.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "kr",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ".",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_de-at.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u20ac",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ".",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_de-be.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u20ac",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ".",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_de-ch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "CHF",
"DECIMAL_SEP": ".",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": "'",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_de-de.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u20ac",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ".",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_de-li.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u20ac",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ".",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_de-lu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u20ac",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ".",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_de.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u20ac",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ".",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_el-cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u20ac",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ".",
"PATTERNS": [
{
Expand Down
1 change: 1 addition & 0 deletions src/ngLocale/angular-locale_el-gr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $provide.value("$locale", {
"NUMBER_FORMATS": {
"CURRENCY_SYM": "\u20ac",
"DECIMAL_SEP": ",",
"DEFAULT_PRECISION": 2,
"GROUP_SEP": ".",
"PATTERNS": [
{
Expand Down
Loading