From 982eb7bba81805e852cd13e6b743102feffc444a Mon Sep 17 00:00:00 2001
From: Trotyl <trotyl@qq.com>
Date: Thu, 4 Jan 2018 15:35:57 +0800
Subject: [PATCH] fix(common): fallback to last defined value for named date
 and time formats (#21299)

closes #21282

PR Close #21299
---
 packages/common/src/i18n/locale_data_api.ts       | 4 ++--
 packages/common/test/i18n/locale_data_api_spec.ts | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/common/src/i18n/locale_data_api.ts b/packages/common/src/i18n/locale_data_api.ts
index 9e5ecb0ac7085..4bf240e497a26 100644
--- a/packages/common/src/i18n/locale_data_api.ts
+++ b/packages/common/src/i18n/locale_data_api.ts
@@ -253,7 +253,7 @@ export function getLocaleWeekEndRange(locale: string): [WeekDay, WeekDay] {
  */
 export function getLocaleDateFormat(locale: string, width: FormatWidth): string {
   const data = findLocaleData(locale);
-  return data[LocaleDataIndex.DateFormat][width];
+  return getLastDefinedValue(data[LocaleDataIndex.DateFormat], width);
 }
 
 /**
@@ -278,7 +278,7 @@ export function getLocaleDateFormat(locale: string, width: FormatWidth): string
  */
 export function getLocaleTimeFormat(locale: string, width: FormatWidth): string {
   const data = findLocaleData(locale);
-  return data[LocaleDataIndex.TimeFormat][width];
+  return getLastDefinedValue(data[LocaleDataIndex.TimeFormat], width);
 }
 
 /**
diff --git a/packages/common/test/i18n/locale_data_api_spec.ts b/packages/common/test/i18n/locale_data_api_spec.ts
index 911a4cc61d6f9..ad7b673bf7ec3 100644
--- a/packages/common/test/i18n/locale_data_api_spec.ts
+++ b/packages/common/test/i18n/locale_data_api_spec.ts
@@ -9,9 +9,10 @@
 import localeCaESVALENCIA from '@angular/common/locales/ca-ES-VALENCIA';
 import localeEn from '@angular/common/locales/en';
 import localeFr from '@angular/common/locales/fr';
+import localeZh from '@angular/common/locales/zh';
 import localeFrCA from '@angular/common/locales/fr-CA';
 import {registerLocaleData} from '../../src/i18n/locale_data';
-import {findLocaleData, getCurrencySymbol} from '../../src/i18n/locale_data_api';
+import {findLocaleData, getCurrencySymbol, getLocaleDateFormat, FormatWidth} from '../../src/i18n/locale_data_api';
 
 {
   describe('locale data api', () => {
@@ -22,6 +23,7 @@ import {findLocaleData, getCurrencySymbol} from '../../src/i18n/locale_data_api'
       registerLocaleData(localeFrCA);
       registerLocaleData(localeFr, 'fake-id');
       registerLocaleData(localeFrCA, 'fake_Id2');
+      registerLocaleData(localeZh);
     });
 
     describe('findLocaleData', () => {
@@ -64,5 +66,10 @@ import {findLocaleData, getCurrencySymbol} from '../../src/i18n/locale_data_api'
         expect(getCurrencySymbol('FAKE', 'narrow')).toEqual('FAKE');
       });
     });
+
+    describe('getLastDefinedValue', () => {
+      it('should find the last defined date format when format not defined',
+         () => { expect(getLocaleDateFormat('zh', FormatWidth.Long)).toEqual('y年M月d日'); });
+    });
   });
 }