From c024d894487f8227f3f5683989329ad8610ae239 Mon Sep 17 00:00:00 2001 From: Pete Bacon Darwin Date: Wed, 31 Jul 2019 10:52:38 +0100 Subject: [PATCH] refactor(ivy): remove `i18nLocalize` instruction (#31609) This has been replaced by the `$localize` tag. PR Close #31609 --- .../test/compliance/r3_view_compiler_i18n_spec.ts | 2 +- packages/compiler/src/render3/r3_identifiers.ts | 1 - packages/core/BUILD.bazel | 1 + packages/core/src/core_render3_private_export.ts | 1 - packages/core/src/render3/jit/environment.ts | 1 - tools/public_api_guard/core/core.d.ts | 5 ----- 6 files changed, 2 insertions(+), 9 deletions(-) diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts index 720e49b14b..0655cb75d5 100644 --- a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts +++ b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts @@ -24,7 +24,7 @@ const angularFiles = setup({ const htmlParser = new HtmlParser(); -// TODO: update translation extraction RegExp to support i18nLocalize calls once #28689 lands. +// TODO: update translation extraction RegExp to support `$localize` tags. const EXTRACT_GENERATED_TRANSLATIONS_REGEXP = /const\s*(.*?)\s*=\s*goog\.getMsg\("(.*?)",?\s*(.*?)\)/g; diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts index cb5b54de1a..c7384c9bd1 100644 --- a/packages/compiler/src/render3/r3_identifiers.ts +++ b/packages/compiler/src/render3/r3_identifiers.ts @@ -198,7 +198,6 @@ export class Identifiers { static i18nEnd: o.ExternalReference = {name: 'ɵɵi18nEnd', moduleName: CORE}; static i18nApply: o.ExternalReference = {name: 'ɵɵi18nApply', moduleName: CORE}; static i18nPostprocess: o.ExternalReference = {name: 'ɵɵi18nPostprocess', moduleName: CORE}; - static i18nLocalize: o.ExternalReference = {name: 'ɵɵi18nLocalize', moduleName: CORE}; static pipe: o.ExternalReference = {name: 'ɵɵpipe', moduleName: CORE}; diff --git a/packages/core/BUILD.bazel b/packages/core/BUILD.bazel index 9ad310f93a..710fdcb05c 100644 --- a/packages/core/BUILD.bazel +++ b/packages/core/BUILD.bazel @@ -17,6 +17,7 @@ ng_module( "//packages/core/src/interface", "//packages/core/src/reflection", "//packages/core/src/util", + "//packages/localize", "@npm//rxjs", "@npm//zone.js", ], diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts index 12114c3731..6834da55f7 100644 --- a/packages/core/src/core_render3_private_export.ts +++ b/packages/core/src/core_render3_private_export.ts @@ -169,7 +169,6 @@ export { ɵɵi18nApply, ɵɵi18nPostprocess, i18nConfigureLocalize as ɵi18nConfigureLocalize, - ɵɵi18nLocalize, setLocaleId as ɵsetLocaleId, setClassMetadata as ɵsetClassMetadata, ɵɵresolveWindow, diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts index 6a9173881a..397aa50296 100644 --- a/packages/core/src/render3/jit/environment.ts +++ b/packages/core/src/render3/jit/environment.ts @@ -153,7 +153,6 @@ export const angularCoreEnv: {[name: string]: Function} = 'ɵɵi18nEnd': r3.ɵɵi18nEnd, 'ɵɵi18nApply': r3.ɵɵi18nApply, 'ɵɵi18nPostprocess': r3.ɵɵi18nPostprocess, - 'ɵɵi18nLocalize': r3.ɵɵi18nLocalize, 'ɵɵresolveWindow': r3.ɵɵresolveWindow, 'ɵɵresolveDocument': r3.ɵɵresolveDocument, 'ɵɵresolveBody': r3.ɵɵresolveBody, diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts index 9cb885bd1d..21884292c4 100644 --- a/tools/public_api_guard/core/core.d.ts +++ b/tools/public_api_guard/core/core.d.ts @@ -888,11 +888,6 @@ export declare function ɵɵi18nEnd(): void; export declare function ɵɵi18nExp(value: T): TsickleIssue1009; -/** @deprecated */ -export declare function ɵɵi18nLocalize(input: string, placeholders?: { - [key: string]: string; -}): string; - export declare function ɵɵi18nPostprocess(message: string, replacements?: { [key: string]: (string | string[]); }): string;