From a92f111b664ef716e06c926251acd9792a931b48 Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Mon, 25 Jun 2018 16:49:46 +0200
Subject: [PATCH] fix(common): use correct currency format for locale de-AT
 (#24658)

Fixes #24609
PR Close #24658
---
 packages/common/locales/closure-locale.ts      | 2 +-
 packages/common/locales/de-AT.ts               | 2 +-
 packages/common/test/pipes/number_pipe_spec.ts | 4 ++++
 tools/gulp-tasks/cldr/extract.js               | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/common/locales/closure-locale.ts b/packages/common/locales/closure-locale.ts
index ec757cb71c..183913a7c9 100644
--- a/packages/common/locales/closure-locale.ts
+++ b/packages/common/locales/closure-locale.ts
@@ -949,7 +949,7 @@ export const locale_de_AT = [
   [['v. Chr.', 'n. Chr.'], u, u], 1, [6, 0],
   ['dd.MM.yy', 'dd.MM.y', 'd. MMMM y', 'EEEE, d. MMMM y'],
   ['HH:mm', 'HH:mm:ss', 'HH:mm:ss z', 'HH:mm:ss zzzz'], ['{1}, {0}', u, '{1} \'um\' {0}', u],
-  [',', ' ', ';', '%', '+', '-', 'E', '·', '‰', '∞', 'NaN', ':', '.'],
+  [',', ' ', ';', '%', '+', '-', 'E', '·', '‰', '∞', 'NaN', ':', u, '.'],
   ['#,##0.###', '#,##0 %', '¤ #,##0.00', '#E0'], '€', 'Euro', {
     'ATS': ['öS'],
     'AUD': ['AU$', '$'],
diff --git a/packages/common/locales/de-AT.ts b/packages/common/locales/de-AT.ts
index 2eff51c202..5898204bd6 100644
--- a/packages/common/locales/de-AT.ts
+++ b/packages/common/locales/de-AT.ts
@@ -51,7 +51,7 @@ export default [
   [['v. Chr.', 'n. Chr.'], u, u], 1, [6, 0],
   ['dd.MM.yy', 'dd.MM.y', 'd. MMMM y', 'EEEE, d. MMMM y'],
   ['HH:mm', 'HH:mm:ss', 'HH:mm:ss z', 'HH:mm:ss zzzz'], ['{1}, {0}', u, '{1} \'um\' {0}', u],
-  [',', ' ', ';', '%', '+', '-', 'E', '·', '‰', '∞', 'NaN', ':', '.'],
+  [',', ' ', ';', '%', '+', '-', 'E', '·', '‰', '∞', 'NaN', ':', u, '.'],
   ['#,##0.###', '#,##0 %', '¤ #,##0.00', '#E0'], '€', 'Euro', {
     'ATS': ['öS'],
     'AUD': ['AU$', '$'],
diff --git a/packages/common/test/pipes/number_pipe_spec.ts b/packages/common/test/pipes/number_pipe_spec.ts
index adc9676f44..f72800f814 100644
--- a/packages/common/test/pipes/number_pipe_spec.ts
+++ b/packages/common/test/pipes/number_pipe_spec.ts
@@ -10,6 +10,7 @@ import localeEn from '@angular/common/locales/en';
 import localeEsUS from '@angular/common/locales/es-US';
 import localeFr from '@angular/common/locales/fr';
 import localeAr from '@angular/common/locales/ar';
+import localeDeAt from '@angular/common/locales/de-AT';
 import {registerLocaleData, CurrencyPipe, DecimalPipe, PercentPipe, formatNumber} from '@angular/common';
 import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal';
 
@@ -20,6 +21,7 @@ import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testin
       registerLocaleData(localeEsUS);
       registerLocaleData(localeFr);
       registerLocaleData(localeAr);
+      registerLocaleData(localeDeAt);
     });
 
     describe('DecimalPipe', () => {
@@ -95,6 +97,8 @@ import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testin
           expect(pipe.transform(5.1234, 'CAD', 'symbol-narrow', '5.2-2', 'fr'))
               .toEqual('00 005,12 $');
           expect(pipe.transform(5, 'USD', 'symbol', '', 'fr')).toEqual('5,00 $US');
+          expect(pipe.transform(123456789, 'EUR', 'symbol', '', 'de-at'))
+              .toEqual('€ 123.456.789,00');
         });
 
         it('should support any currency code name', () => {
diff --git a/tools/gulp-tasks/cldr/extract.js b/tools/gulp-tasks/cldr/extract.js
index e986b79b80..3c0e0ce16c 100644
--- a/tools/gulp-tasks/cldr/extract.js
+++ b/tools/gulp-tasks/cldr/extract.js
@@ -444,7 +444,7 @@ function getNumberSettings(localeData) {
     symbols.timeSeparator,
   ];
 
-  if (symbols.currencyDecimal) {
+  if (symbols.currencyDecimal || symbols.currencyGroup) {
     symbolValues.push(symbols.currencyDecimal);
   }