fix(i18n): by default put negative sign before currency symbol

petebacondarwin · petebacondarwin · commit 96f2e3bef5fc · 2015-07-16T19:20:11.000+01:00
It seems that the case where the negative sign goes between the currency symbol and the numeric value is actually the special case and that locales that require this have it built in. So we should default to having the negative sign before the symbol. See http://cldr.unicode.org/translation/number-patterns and http://unicode.org/cldr/trac/ticket/5674 Closes angular#10158
diff --git a/i18n/spec/parserSpec.js b/i18n/spec/parserSpec.js
@@ -38,16 +38,16 @@ describe('parsePattern', function() {
     parseAndExpect('#,##,##0.00\u00A4', '', '-', '\u00A4', '\u00A4', 1, 2, 2, 2, 3);
     parseAndExpect('#,##,##0.00\u00A4;(#,##,##0.00\u00A4)',
                    '', '(', '\u00A4', '\u00A4)', 1, 2, 2, 2, 3);
-    parseAndExpect('\u00A4#,##0.00', '\u00A4', '\u00A4-', '', '', 1, 2, 2, 3, 3);
+    parseAndExpect('\u00A4#,##0.00', '\u00A4', '-\u00A4', '', '', 1, 2, 2, 3, 3);
     parseAndExpect('\u00A4#,##0.00;(\u00A4#,##0.00)',
                    '\u00A4', '(\u00A4', '', ')', 1, 2, 2, 3, 3);
     parseAndExpect('\u00A4#,##0.00;\u00A4-#,##0.00',
                    '\u00A4', '\u00A4-', '', '', 1, 2, 2, 3, 3);
-    parseAndExpect('\u00A4 #,##0.00', '\u00A4 ', '\u00A4 -', '', '', 1, 2, 2, 3, 3);
+    parseAndExpect('\u00A4 #,##0.00', '\u00A4 ', '-\u00A4 ', '', '', 1, 2, 2, 3, 3);
     parseAndExpect('\u00A4 #,##0.00;\u00A4-#,##0.00',
                    '\u00A4 ', '\u00A4-', '', '', 1, 2, 2, 3, 3);
     parseAndExpect('\u00A4 #,##0.00;\u00A4 #,##0.00-',
                    '\u00A4 ', '\u00A4 ', '', '-', 1, 2, 2, 3, 3);
-    parseAndExpect('\u00A4 #,##,##0.00', '\u00A4 ', '\u00A4 -', '', '', 1, 2, 2, 2, 3);
+    parseAndExpect('\u00A4 #,##,##0.00', '\u00A4 ', '-\u00A4 ', '', '', 1, 2, 2, 2, 3);
   });
 });
diff --git a/i18n/src/parser.js b/i18n/src/parser.js
@@ -56,7 +56,7 @@ function parsePattern(pattern) {
     p.negSuf = negative.substr(pos + trunkLen).replace(/\'/g, '');
   } else {
     // hardcoded '-' sign is fine as all locale use '-' as MINUS_SIGN. (\u2212 is the same as '-')
-    p.negPre = p.posPre + '-';
+    p.negPre = '-' + p.posPre;
     p.negSuf = p.posSuf;
   }
 
diff --git a/src/ng/filter/filters.js b/src/ng/filter/filters.js
@@ -45,9 +45,9 @@
          }
          element(by.model('amount')).clear();
          element(by.model('amount')).sendKeys('-1234');
-         expect(element(by.id('currency-default')).getText()).toBe('($1,234.00)');
-         expect(element(by.id('currency-custom')).getText()).toBe('(USD$1,234.00)');
-         expect(element(by.id('currency-no-fractions')).getText()).toBe('(USD$1,234)');
+         expect(element(by.id('currency-default')).getText()).toBe('-$1,234.00');
+         expect(element(by.id('currency-custom')).getText()).toBe('-USD$1,234.00');
+         expect(element(by.id('currency-no-fractions')).getText()).toBe('-USD$1,234');
        });
      </file>
    </example>
diff --git a/test/ng/filter/filtersSpec.js b/test/ng/filter/filtersSpec.js
@@ -101,7 +101,7 @@ describe('filters', function() {
 
     it('should do basic currency filtering', function() {
       expect(currency(0)).toEqual('$0.00');
-      expect(currency(-999)).toEqual('($999.00)');
+      expect(currency(-999)).toEqual('-$999.00');
       expect(currency(1234.5678, "USD$")).toEqual('USD$1,234.57');
       expect(currency(1234.5678, "USD$", 0)).toEqual('USD$1,235');
     });

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ function parsePattern(pattern) {`
`56`	`56`	`p.negSuf = negative.substr(pos + trunkLen).replace(/\'/g, '');`
`57`	`57`	`} else {`
`58`	`58`	`// hardcoded '-' sign is fine as all locale use '-' as MINUS_SIGN. (\u2212 is the same as '-')`
`59`		`- p.negPre = p.posPre + '-';`
	`59`	`+ p.negPre = '-' + p.posPre;`
`60`	`60`	`p.negSuf = p.posSuf;`
`61`	`61`	`}`
`62`	`62`