From c3158789106612e4e0ade643477f3431d36ee644 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 20 Oct 2021 22:08:50 +0100
Subject: [PATCH] refactor: simplify the LOCALE_ID provider (#43913)

Other parts of the intialization process are responsible for passing the locale id to ivy, so it does not need to happen in the provider factory. E.g. `PlatformRef.bootstrapModule()` and `R3TestBedCompiler.finalize()`.

PR Close #43913
---
 packages/core/src/application_module.ts                   | 8 +-------
 .../bundling/forms_reactive/bundle.golden_symbols.json    | 5 +----
 .../forms_template_driven/bundle.golden_symbols.json      | 5 +----
 .../core/test/bundling/router/bundle.golden_symbols.json  | 5 +----
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/packages/core/src/application_module.ts b/packages/core/src/application_module.ts
index 5ad90e2e850..bc7ce8bd0f7 100644
--- a/packages/core/src/application_module.ts
+++ b/packages/core/src/application_module.ts
@@ -20,7 +20,6 @@ import {ComponentFactoryResolver} from './linker';
 import {Compiler} from './linker/compiler';
 import {NgModule} from './metadata';
 import {SCHEDULER} from './render3/component_ref';
-import {setLocaleId} from './render3/i18n/i18n_locale_id';
 import {NgZone} from './zone';
 
 declare const $localize: {locale?: string};
@@ -34,13 +33,8 @@ export function _keyValueDiffersFactory() {
 }
 
 export function _localeFactory(locale?: string): string {
-  locale = locale || getGlobalLocale();
-  if (ivyEnabled) {
-    setLocaleId(locale);
-  }
-  return locale;
+  return locale || getGlobalLocale();
 }
-
 /**
  * Work out the locale from the potential global properties.
  *
diff --git a/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json b/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json
index 4e78c83fd34..a4a3c314cf9 100644
--- a/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json
@@ -1532,9 +1532,6 @@
   {
     "name": "setIsInCheckNoChangesMode"
   },
-  {
-    "name": "setLocaleId"
-  },
   {
     "name": "setSelectedIndex"
   },
@@ -1682,4 +1679,4 @@
   {
     "name": "ɵɵtext"
   }
-]
+]
\ No newline at end of file
diff --git a/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json b/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json
index 2be5f4de526..9fad9278c7e 100644
--- a/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json
@@ -1505,9 +1505,6 @@
   {
     "name": "setIsInCheckNoChangesMode"
   },
-  {
-    "name": "setLocaleId"
-  },
   {
     "name": "setSelectedIndex"
   },
@@ -1664,4 +1661,4 @@
   {
     "name": "ɵɵtext"
   }
-]
+]
\ No newline at end of file
diff --git a/packages/core/test/bundling/router/bundle.golden_symbols.json b/packages/core/test/bundling/router/bundle.golden_symbols.json
index d152361d3e6..151ef827b42 100644
--- a/packages/core/test/bundling/router/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/router/bundle.golden_symbols.json
@@ -1928,9 +1928,6 @@
   {
     "name": "setIsInCheckNoChangesMode"
   },
-  {
-    "name": "setLocaleId"
-  },
   {
     "name": "setRouterState"
   },
@@ -2138,4 +2135,4 @@
   {
     "name": "ɵɵtextInterpolate1"
   }
-]
+]
\ No newline at end of file