revert: refactor($locale): use en-us as generic built-in locale

This reverts commit 70ce425.

There are internal projects in Google that generate their own version
of angular.js and so this commit caused those projects to break.

We are going to look into a more satisfactory way of getting this change
in.

Author: petebacondarwin

Gruntfile.js

@@ -175,8 +175,7 @@ module.exports = function(grunt) {
       },
       angular: {
         dest: 'build/angular.js',
-        src: util.wrap([files['angularSrc']], 'angular')
-                 .concat('src/ngLocale/angular-locale_en-us.js'),
+        src: util.wrap([files['angularSrc']], 'angular'),
         styles: {
           css: ['css/angular.css'],
           generateCspCssFile: true,

angularFiles.js

@@ -25,6 +25,7 @@ var angularFiles = {
     'src/ng/httpBackend.js',
     'src/ng/interpolate.js',
     'src/ng/interval.js',
+    'src/ng/locale.js',
     'src/ng/location.js',
     'src/ng/log.js',
     'src/ng/parse.js',
@@ -181,8 +182,7 @@ var angularFiles = {
     'src/publishExternalApis.js',
     '@angularSrcModules',
     '@angularScenario',
-    '@angularTest',
-    'src/ngLocale/angular-locale_en-us.js'  // we need an ngLocale module
+    '@angularTest'
   ],
 
   'karmaExclude': [
@@ -193,13 +193,12 @@ var angularFiles = {
 
   'karmaScenario': [
     'build/angular-scenario.js',
-    'build/docs/docs-scenario.js',
-    'src/ngLocale/angular-locale_en-us.js'  // we need an ngLocale module
+    'build/docs/docs-scenario.js'
   ],
 
   "karmaModules": [
     'build/angular.js',
-    '@angularSrcModules',,
+    '@angularSrcModules',
     'src/ngScenario/browserTrigger.js',
     'test/helpers/*.js',
     'test/ngMessageFormat/*.js',
@@ -209,8 +208,7 @@ var angularFiles = {
     'test/ngResource/*.js',
     'test/ngSanitize/**/*.js',
     'test/ngTouch/**/*.js',
-    'test/ngAria/*.js',
-    'src/ngLocale/angular-locale_en-us.js'  // we need an ngLocale module
+    'test/ngAria/*.js'
   ],
 
   'karmaJquery': [
@@ -220,9 +218,7 @@ var angularFiles = {
     'src/publishExternalApis.js',
     '@angularSrcModules',
     '@angularScenario',
-    '@angularTest',
-    'src/ngLocale/angular-locale_en-us.js'  // we need an ngLocale module
-
+    '@angularTest'
   ],
 
   'karmaJqueryExclude': [

docs/content/guide/i18n.ngdoc

@@ -23,8 +23,8 @@ directive}.  Additionally, you can use {@link guide/i18n#messageformat-extension
 `$interpolate` for localizable pluralization and gender support in all interpolations via the
 `ngMessageFormat` module.
 
-All localizable Angular components depend on locale-specific rule sets managed by the
-{@link ngLocale `$locale` service}.
+All localizable Angular components depend on locale-specific rule sets managed by the {@link
+ng.$locale `$locale` service}.
 
 There a few examples that showcase how to use Angular filters with various locale rule sets in the
 [`i18n/e2e` directory](https://github.com/angular/angular.js/tree/master/i18n/e2e) of the Angular
@@ -99,7 +99,7 @@ develop your app.
 ### Currency symbol
 
 Angular's {@link ng.filter:currency currency filter} allows you to use the default currency symbol
-from the {@link ngLocale `locale` service}, or you can provide the filter with a custom currency
+from the {@link ng.$locale locale service}, or you can provide the filter with a custom currency
 symbol.
 
 <div class="alert alert-success">

src/AngularPublic.js

@@ -3,6 +3,7 @@
 /* global angularModule: true,
   version: true,
 
+  $LocaleProvider,
   $CompileProvider,
 
   htmlAnchorDirective,
@@ -150,6 +151,11 @@ function publishExternalAPI(angular) {
   });
 
   angularModule = setupModuleLoader(window);
+  try {
+    angularModule('ngLocale');
+  } catch (e) {
+    angularModule('ngLocale', []).provider('$locale', $LocaleProvider);
+  }
 
   angularModule('ng', ['ngLocale'], ['$provide',
     function ngModule($provide) {

src/ng/locale.js

@@ -0,0 +1,81 @@
+'use strict';
+
+/**
+ * @ngdoc service
+ * @name $locale
+ *
+ * @description
+ * $locale service provides localization rules for various Angular components. As of right now the
+ * only public api is:
+ *
+ * * `id` – `{string}` – locale id formatted as `languageId-countryId` (e.g. `en-us`)
+ */
+function $LocaleProvider() {
+  this.$get = function() {
+    return {
+      id: 'en-us',
+
+      NUMBER_FORMATS: {
+        DECIMAL_SEP: '.',
+        GROUP_SEP: ',',
+        PATTERNS: [
+          { // Decimal Pattern
+            minInt: 1,
+            minFrac: 0,
+            maxFrac: 3,
+            posPre: '',
+            posSuf: '',
+            negPre: '-',
+            negSuf: '',
+            gSize: 3,
+            lgSize: 3
+          },{ //Currency Pattern
+            minInt: 1,
+            minFrac: 2,
+            maxFrac: 2,
+            posPre: '\u00A4',
+            posSuf: '',
+            negPre: '(\u00A4',
+            negSuf: ')',
+            gSize: 3,
+            lgSize: 3
+          }
+        ],
+        CURRENCY_SYM: '$'
+      },
+
+      DATETIME_FORMATS: {
+        MONTH:
+            'January,February,March,April,May,June,July,August,September,October,November,December'
+            .split(','),
+        SHORTMONTH:  'Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec'.split(','),
+        DAY: 'Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday'.split(','),
+        SHORTDAY: 'Sun,Mon,Tue,Wed,Thu,Fri,Sat'.split(','),
+        AMPMS: ['AM','PM'],
+        medium: 'MMM d, y h:mm:ss a',
+        'short': 'M/d/yy h:mm a',
+        fullDate: 'EEEE, MMMM d, y',
+        longDate: 'MMMM d, y',
+        mediumDate: 'MMM d, y',
+        shortDate: 'M/d/yy',
+        mediumTime: 'h:mm:ss a',
+        shortTime: 'h:mm a',
+        ERANAMES: [
+          "Before Christ",
+          "Anno Domini"
+        ],
+        ERAS: [
+          "BC",
+          "AD"
+        ]
+      },
+
+      pluralCat: function(num) {
+        if (num === 1) {
+          return 'one';
+        }
+        return 'other';
+      }
+    };
+  };
+}

src/ngLocale/index.js

@@ -0,0 +1,48 @@
+'use strict';
+
+describe('$locale', function() {
+  /* global $LocaleProvider: false */
+
+  var $locale = new $LocaleProvider().$get();
+
+  it('should have locale id set to en-us', function() {
+    expect($locale.id).toBe('en-us');
+  });
+
+
+  it('should have NUMBER_FORMATS', function() {
+    var numberFormats = $locale.NUMBER_FORMATS;
+    expect(numberFormats).toBeDefined();
+    expect(numberFormats.PATTERNS.length).toBe(2);
+    angular.forEach(numberFormats.PATTERNS, function(pattern) {
+      expect(pattern.minInt).toBeDefined();
+      expect(pattern.minFrac).toBeDefined();
+      expect(pattern.maxFrac).toBeDefined();
+      expect(pattern.posPre).toBeDefined();
+      expect(pattern.posSuf).toBeDefined();
+      expect(pattern.negPre).toBeDefined();
+      expect(pattern.negSuf).toBeDefined();
+      expect(pattern.gSize).toBeDefined();
+      expect(pattern.lgSize).toBeDefined();
+    });
+  });
+
+
+  it('should have DATETIME_FORMATS', function() {
+    var datetime = $locale.DATETIME_FORMATS;
+    expect(datetime).toBeDefined();
+    expect(datetime.DAY.length).toBe(7);
+    expect(datetime.SHORTDAY.length).toBe(7);
+    expect(datetime.SHORTMONTH.length).toBe(12);
+    expect(datetime.MONTH.length).toBe(12);
+    expect(datetime.AMPMS.length).toBe(2);
+  });
+
+
+  it('should return correct plural types', function() {
+    expect($locale.pluralCat(-1)).toBe('other');
+    expect($locale.pluralCat(0)).toBe('other');
+    expect($locale.pluralCat(2)).toBe('other');
+    expect($locale.pluralCat(1)).toBe('one');
+  });
+});