Skip to content

Commit 380ff6f

Browse files
refactor($locale): use en-us as generic built-in locale
Previously there was a custom built en-us locale that was included with angular.js. This made likely that it would get out of sync with the real en-us locale that is generated from the closure library. This change removes that custom one and uses the generated one instead. This also has the benefit of preventing the unwanted caught error on trying to load `ngLocale` during angular bootstrap. Closes angular#12134 Closes angular#8174
1 parent be9c440 commit 380ff6f

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

angularFiles.js

+8-4
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,13 @@ var angularFiles = {
193193

194194
'karmaScenario': [
195195
'build/angular-scenario.js',
196-
'build/docs/docs-scenario.js'
196+
'build/docs/docs-scenario.js',
197+
'src/ngLocale/angular-locale_en-us.js' // we need an ngLocale module
197198
],
198199

199200
"karmaModules": [
200201
'build/angular.js',
201-
'@angularSrcModules',
202+
'@angularSrcModules',,
202203
'src/ngScenario/browserTrigger.js',
203204
'test/helpers/*.js',
204205
'test/ngMessageFormat/*.js',
@@ -208,7 +209,8 @@ var angularFiles = {
208209
'test/ngResource/*.js',
209210
'test/ngSanitize/**/*.js',
210211
'test/ngTouch/**/*.js',
211-
'test/ngAria/*.js'
212+
'test/ngAria/*.js',
213+
'src/ngLocale/angular-locale_en-us.js' // we need an ngLocale module
212214
],
213215

214216
'karmaJquery': [
@@ -218,7 +220,9 @@ var angularFiles = {
218220
'src/publishExternalApis.js',
219221
'@angularSrcModules',
220222
'@angularScenario',
221-
'@angularTest'
223+
'@angularTest',
224+
'src/ngLocale/angular-locale_en-us.js' // we need an ngLocale module
225+
222226
],
223227

224228
'karmaJqueryExclude': [

0 commit comments

Comments
 (0)