fix(date filter): display localised era for G format code

i18n/spec/closureI18nExtractorSpec.js

@@ -187,6 +187,8 @@ describe("extractDateTimeSymbols", function() {
                   FIRSTDAYOFWEEK: 6,
                   WEEKENDRANGE: [5, 6],
                   AMPMS: ['AM', 'PM'],
+                  ERAS: ['av. J.-C.', 'ap. J.-C.'],
+                  ERANAMES: ['avant Jésus-Christ', 'après Jésus-Christ'],
                   medium: 'yyyy-MM-dd HH:mm:ss',
                   short: 'yy-MM-dd HH:mm',
                   fullDate: 'EEEE d MMMM y',

i18n/src/converter.js

@@ -44,6 +44,8 @@ function convertDatetimeData(dataObj) {
   datetimeFormats.AMPMS = dataObj.AMPMS;
   datetimeFormats.FIRSTDAYOFWEEK = dataObj.FIRSTDAYOFWEEK;
   datetimeFormats.WEEKENDRANGE = dataObj.WEEKENDRANGE;
+  datetimeFormats.ERAS = dataObj.ERAS;
+  datetimeFormats.ERANAMES = dataObj.ERANAMES;
 
 
   datetimeFormats.medium      = dataObj.DATEFORMATS[2] + ' ' + dataObj.TIMEFORMATS[2];

src/ng/filter/filters.js

@@ -302,6 +302,14 @@ function ampmGetter(date, formats) {
   return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1];
 }
 
+function eraGetter(date, formats) {
+  return date.getFullYear() <= 0 ? formats.ERAS[0] : formats.ERAS[1];
+}
+
+function longEraGetter(date, formats) {
+  return date.getFullYear() <= 0 ? formats.ERANAMES[0] : formats.ERANAMES[1];
+}
+
 var DATE_FORMATS = {
   yyyy: dateGetter('FullYear', 4),
     yy: dateGetter('FullYear', 2, 0, true),
@@ -328,10 +336,14 @@ var DATE_FORMATS = {
      a: ampmGetter,
      Z: timeZoneGetter,
     ww: weekGetter(2),
-     w: weekGetter(1)
+     w: weekGetter(1),
+     G: eraGetter,
+     GG: eraGetter,
+     GGG: eraGetter,
+     GGGG: longEraGetter
 };
 
-var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZEw']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|w+))(.*)/,
+var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|G+|w+))(.*)/,
     NUMBER_STRING = /^\-?\d+$/;
 
 /**
@@ -368,6 +380,8 @@ var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZEw']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d
  *   * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-+1200)
  *   * `'ww'`: Week of year, padded (00-53). Week 01 is the week with the first Thursday of the year
  *   * `'w'`: Week of year (0-53). Week 1 is the week with the first Thursday of the year
+ *   * `'G'`, `'GG'`, `'GGG'`: The abbreviated form of the era string (e.g. 'AD')
+ *   * `'GGGG'`: The long form of the era string (e.g. 'Anno Domini')
  *
  *   `format` string can also be one of the following predefined
  *   {@link guide/i18n localizable formats}:

src/ng/locale.js

@@ -59,7 +59,15 @@ function $LocaleProvider() {
         mediumDate: 'MMM d, y',
         shortDate: 'M/d/yy',
         mediumTime: 'h:mm:ss a',
-        shortTime: 'h:mm a'
+        shortTime: 'h:mm a',
+        ERANAMES: [
+          "Before Christ",
+          "Anno Domini"
+        ],
+        ERAS: [
+          "BC",
+          "AD"
+        ]
       },
 
       pluralCat: function(num) {

src/ngLocale/angular-locale_aa-dj.js

@@ -34,6 +34,14 @@ $provide.value("$locale", {
       "Gumqata",
       "Sabti"
     ],
+    "ERANAMES": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "ERAS": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
     "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "Qunxa Garablu",

src/ngLocale/angular-locale_aa-er.js

@@ -34,6 +34,14 @@ $provide.value("$locale", {
       "Gumqata",
       "Sabti"
     ],
+    "ERANAMES": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "ERAS": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
     "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Qunxa Garablu",

src/ngLocale/angular-locale_aa-et.js

@@ -34,6 +34,14 @@ $provide.value("$locale", {
       "Gumqata",
       "Sabti"
     ],
+    "ERANAMES": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "ERAS": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
     "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Qunxa Garablu",

src/ngLocale/angular-locale_aa.js

@@ -34,6 +34,14 @@ $provide.value("$locale", {
       "Gumqata",
       "Sabti"
     ],
+    "ERANAMES": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
+    "ERAS": [
+      "Yaasuusuk Duma",
+      "Yaasuusuk Wadir"
+    ],
     "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Qunxa Garablu",

src/ngLocale/angular-locale_af-na.js

@@ -16,6 +16,14 @@ $provide.value("$locale", {
       "Vrydag",
       "Saterdag"
     ],
+    "ERANAMES": [
+      "voor Christus",
+      "na Christus"
+    ],
+    "ERAS": [
+      "v.C.",
+      "n.C."
+    ],
     "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Januarie",

src/ngLocale/angular-locale_af-za.js

@@ -16,6 +16,14 @@ $provide.value("$locale", {
       "Vrydag",
       "Saterdag"
     ],
+    "ERANAMES": [
+      "voor Christus",
+      "na Christus"
+    ],
+    "ERAS": [
+      "v.C.",
+      "n.C."
+    ],
     "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Januarie",

src/ngLocale/angular-locale_af.js

@@ -16,6 +16,14 @@ $provide.value("$locale", {
       "Vrydag",
       "Saterdag"
     ],
+    "ERANAMES": [
+      "voor Christus",
+      "na Christus"
+    ],
+    "ERAS": [
+      "v.C.",
+      "n.C."
+    ],
     "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "Januarie",

src/ngLocale/angular-locale_agq-cm.js

@@ -34,6 +34,14 @@ $provide.value("$locale", {
       "tsu\u0294ugh\u0268\u0302m",
       "tsu\u0294ndz\u0268k\u0254\u0294\u0254"
     ],
+    "ERANAMES": [
+      "S\u011be K\u0268\u0300lesto",
+      "B\u01cea K\u0268\u0300lesto"
+    ],
+    "ERAS": [
+      "SK",
+      "BK"
+    ],
     "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "ndz\u0254\u0300\u014b\u0254\u0300n\u00f9m",

src/ngLocale/angular-locale_agq.js

@@ -34,6 +34,14 @@ $provide.value("$locale", {
       "tsu\u0294ugh\u0268\u0302m",
       "tsu\u0294ndz\u0268k\u0254\u0294\u0254"
     ],
+    "ERANAMES": [
+      "S\u011be K\u0268\u0300lesto",
+      "B\u01cea K\u0268\u0300lesto"
+    ],
+    "ERAS": [
+      "SK",
+      "BK"
+    ],
     "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "ndz\u0254\u0300\u014b\u0254\u0300n\u00f9m",

src/ngLocale/angular-locale_ak-gh.js

@@ -34,6 +34,14 @@ $provide.value("$locale", {
       "Fida",
       "Memeneda"
     ],
+    "ERANAMES": [
+      "Ansa Kristo",
+      "Kristo Ekyiri"
+    ],
+    "ERAS": [
+      "AK",
+      "KE"
+    ],
     "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Sanda-\u0186p\u025bp\u0254n",

src/ngLocale/angular-locale_ak.js

@@ -34,6 +34,14 @@ $provide.value("$locale", {
       "Fida",
       "Memeneda"
     ],
+    "ERANAMES": [
+      "Ansa Kristo",
+      "Kristo Ekyiri"
+    ],
+    "ERAS": [
+      "AK",
+      "KE"
+    ],
     "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "Sanda-\u0186p\u025bp\u0254n",

src/ngLocale/angular-locale_am-et.js

@@ -16,6 +16,14 @@ $provide.value("$locale", {
       "\u12d3\u122d\u1265",
       "\u1245\u12f3\u121c"
     ],
+    "ERANAMES": [
+      "\u12d3\u1218\u1270 \u12d3\u1208\u121d",
+      "\u12d3\u1218\u1270 \u121d\u1215\u1228\u1275"
+    ],
+    "ERAS": [
+      "\u12d3/\u12d3",
+      "\u12d3/\u121d"
+    ],
     "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u1303\u1295\u12e9\u12c8\u122a",

src/ngLocale/angular-locale_am.js

@@ -16,6 +16,14 @@ $provide.value("$locale", {
       "\u12d3\u122d\u1265",
       "\u1245\u12f3\u121c"
     ],
+    "ERANAMES": [
+      "\u12d3\u1218\u1270 \u12d3\u1208\u121d",
+      "\u12d3\u1218\u1270 \u121d\u1215\u1228\u1275"
+    ],
+    "ERAS": [
+      "\u12d3/\u12d3",
+      "\u12d3/\u121d"
+    ],
     "FIRSTDAYOFWEEK": 6,
     "MONTH": [
       "\u1303\u1295\u12e9\u12c8\u122a",

src/ngLocale/angular-locale_ar-001.js

@@ -16,6 +16,14 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
     "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",

src/ngLocale/angular-locale_ar-ae.js

@@ -16,6 +16,14 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
     "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",

src/ngLocale/angular-locale_ar-bh.js

@@ -16,6 +16,14 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
     "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",

src/ngLocale/angular-locale_ar-dj.js

@@ -16,6 +16,14 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
     "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",

src/ngLocale/angular-locale_ar-dz.js

@@ -16,6 +16,14 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
     "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u062c\u0627\u0646\u0641\u064a",

src/ngLocale/angular-locale_ar-eg.js

@@ -16,6 +16,14 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
     "FIRSTDAYOFWEEK": 5,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",

src/ngLocale/angular-locale_ar-eh.js

@@ -16,6 +16,14 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
     "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",

src/ngLocale/angular-locale_ar-er.js

@@ -16,6 +16,14 @@ $provide.value("$locale", {
       "\u0627\u0644\u062c\u0645\u0639\u0629",
       "\u0627\u0644\u0633\u0628\u062a"
     ],
+    "ERANAMES": [
+      "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
+      "\u0645\u064a\u0644\u0627\u062f\u064a"
+    ],
+    "ERAS": [
+      "\u0642.\u0645",
+      "\u0645"
+    ],
     "FIRSTDAYOFWEEK": 0,
     "MONTH": [
       "\u064a\u0646\u0627\u064a\u0631",