Skip to content

Commit 269d978

Browse files
committed
sync with TR app
1 parent aac6206 commit 269d978

File tree

5 files changed

+138
-134
lines changed

5 files changed

+138
-134
lines changed

App/Locale.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Manager.prototype.t = function(scope, options) {
1717
scope = this.key + '.' + scope; // prepend our key
1818
}
1919
return I18n.t(scope, options);
20-
}
20+
};
2121

2222
var Locale = {
2323
key: function(object, enHash) {

App/Locales/boot.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ I18n.translations['en-GB'] = require('../Locales/en-GB.js').default;
99
I18n.translations['en-GB-xtra'] = require('../Locales/en-GB-xtra.js').default; // programmatic - ideally empty and in translated
1010

1111

12-
I18n.default_locale = "en-US";
13-
I18n.locale = "en-US";
12+
I18n.default_locale = 'en-US';
13+
I18n.locale = 'en-US';
1414

1515
I18n.fallbacks = {
1616
'en-US': ['en', 'base'],
17-
'en-GB': ['en-GB-xtra', 'en', 'base']
17+
'en-GB': ['en-GB-xtra', 'en', 'base'],
1818
};
1919

2020
const countryIsoCodesToLocale = {

App/Locales/en-GB.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export default {
77
short_day: '%a %b %-d',
88
short_time: '%-H:%M',
99
month_day: '%B %-d',
10+
short_month_day: '%b %-d',
1011
month_day_year: '%e %b %Y',
1112
month_day_year_at_time: '%-d %B %Y at %-H:%M',
1213
short_weekday_name: '%a',

App/Locales/en-US.js

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22

33
export default {
44
datetime: {
5-
day_and_time: "%a, %b %-d, %-I:%M %p",
6-
day_header: "%+A - %B %d",
7-
short_day: "%a %b %-d",
8-
short_time: "%-I:%M %p",
9-
month_day: "%B %-d",
10-
month_day_year: "%b %e, %Y",
11-
month_day_year_at_time: "%B %-d, %Y at %-I:%M %p",
12-
short_weekday_name: "%a",
13-
long_day_of_month: "%d",
14-
time_zone: "%Z"
5+
day_and_time: '%a, %b %-d, %-I:%M %p',
6+
day_header: '%+A - %B %d',
7+
short_day: '%a %b %-d',
8+
short_time: '%-I:%M %p',
9+
month_day: '%B %-d',
10+
short_month_day: '%b %-d',
11+
month_day_year: '%b %e, %Y',
12+
month_day_year_at_time: '%B %-d, %Y at %-I:%M %p',
13+
short_weekday_name: '%a',
14+
long_day_of_month: '%d',
15+
time_zone: '%Z',
1516
},
1617
number: {
1718
currency: {

0 commit comments

Comments
 (0)