iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ivy): use goog.LOCALE for Closure Compiler to define default LOCALE_ID (#31519) 

Prior to this commit, default value for LOCALE_ID was not setup for Closure Compiler. In Closure Compiler, we can use `goog.LOCALE` as a default value, which will be replaced at build time with current locale.

PR Close #31519
This commit is contained in:
Andrew Kushnir 2019-07-11 14:54:49 -07:00 committed by Matias Niemelä
parent 40d785f0a0
commit 09576e9683
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/core/src/application_module.ts
View File

@ -30,7 +30,16 @@ export function _keyValueDiffersFactory() {
} }
export function _localeFactory(locale?: string): string { export function _localeFactory(locale?: string): string {
return locale || 'en-US'; if (locale) {
return locale;
}
// Use `goog.LOCALE` as default value for `LOCALE_ID` token for Closure Compiler.
// Note: default `goog.LOCALE` value is `en`, when Angular used `en-US`. In order to preserve
// backwards compatibility, we use Angular default value over Closure Compiler's one.
if (ngI18nClosureMode && typeof goog !== 'undefined' && goog.LOCALE !== 'en') {
return goog.LOCALE;
}
return 'en-US';
} }
/** /**

1
packages/goog.d.ts vendored
View File

@ -16,6 +16,7 @@ declare namespace goog {
* as it is sometimes true. * as it is sometimes true.
*/ */
export const DEBUG: boolean; export const DEBUG: boolean;
export const LOCALE: string;
export const getMsg: (input: string, placeholders?: {[key: string]: string}) => string; export const getMsg: (input: string, placeholders?: {[key: string]: string}) => string;
} }