Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 4acb0af

Browse files
fix(ng/$locale): add ERA info in generic locale
This change also updates the closure i18n converter to pull in the ERA info for generated locale files.
1 parent bb5bf7f commit 4acb0af

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

i18n/src/converter.js

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ function convertDatetimeData(dataObj) {
4444
datetimeFormats.AMPMS = dataObj.AMPMS;
4545
datetimeFormats.FIRSTDAYOFWEEK = dataObj.FIRSTDAYOFWEEK;
4646
datetimeFormats.WEEKENDRANGE = dataObj.WEEKENDRANGE;
47+
datetimeFormats.ERAS = dataObj.ERAS;
48+
datetimeFormats.ERANAMES = dataObj.ERANAMES;
4749

4850

4951
datetimeFormats.medium = dataObj.DATEFORMATS[2] + ' ' + dataObj.TIMEFORMATS[2];

src/ng/locale.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,15 @@ function $LocaleProvider() {
5959
mediumDate: 'MMM d, y',
6060
shortDate: 'M/d/yy',
6161
mediumTime: 'h:mm:ss a',
62-
shortTime: 'h:mm a'
62+
shortTime: 'h:mm a',
63+
ERANAMES: [
64+
"Before Christ",
65+
"Anno Domini"
66+
],
67+
ERAS: [
68+
"BC",
69+
"AD"
70+
]
6371
},
6472

6573
pluralCat: function(num) {

0 commit comments

Comments
 (0)