Skip to content

Commit 65e94f9

Browse files
committed
[fixed] moment localizer
1 parent a771321 commit 65e94f9

File tree

5 files changed

+26
-17
lines changed

5 files changed

+26
-17
lines changed

build/make-config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ module.exports = function makeConfig(options){
9090

9191
externals: options.externals,
9292

93+
babel: options.babel,
94+
9395
resolve: {
9496
extensions: ['', '.js', '.jsx'],
9597
alias: {

dev/configure-globalize.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
var Globalize = require('globalize')
2+
var localizers = require('../src/localizers/globalize')
3+
4+
Globalize.load(
5+
require('cldr-data/main/en-GB/ca-gregorian.json'),
6+
require('cldr-data/main/en-GB/currencies.json'),
7+
require('cldr-data/main/en-GB/dateFields.json'),
8+
require('cldr-data/main/en-GB/numbers.json'),
9+
require('cldr-data/supplemental/numberingSystems.json'),
10+
require('cldr-data/supplemental/currencyData.json'),
11+
require('cldr-data/supplemental/likelySubtags.json'),
12+
require('cldr-data/supplemental/timeData.json'),
13+
require('cldr-data/supplemental/weekData.json')
14+
);
15+
Globalize.locale('en-GB')
16+
17+
localizers(Globalize)

dev/configure-moment.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
var moment = require('moment')
2+
var localizers = require('../src/localizers/moment')
3+
4+
localizers(moment)

dev/dev.jsx

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,10 @@
11
'use strict';
22
require('../src/less/react-widgets.less')
3+
require('./configure-moment')
34

4-
var Globalize = require('globalize')
5-
var localizers = require('../src/localizers/globalize')
65
var numberLocalizer = require('../src/localizers/simple-number')
76

8-
Globalize.load(
9-
require('cldr-data/main/en-GB/ca-gregorian.json'),
10-
require('cldr-data/main/en-GB/currencies.json'),
11-
require('cldr-data/main/en-GB/dateFields.json'),
12-
require('cldr-data/main/en-GB/numbers.json'),
13-
require('cldr-data/supplemental/numberingSystems.json'),
14-
require('cldr-data/supplemental/currencyData.json'),
15-
require('cldr-data/supplemental/likelySubtags.json'),
16-
require('cldr-data/supplemental/timeData.json'),
17-
require('cldr-data/supplemental/weekData.json')
18-
);
19-
Globalize.locale('en-GB')
20-
21-
localizers(Globalize)
7+
228
numberLocalizer()
239

2410
var React = require('react/addons')

src/localizers/moment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export default function(moment){
6161
},
6262

6363
format(value, format, culture) {
64-
return getMoment(culture, value, format).format(format)
64+
return getMoment(culture, value).format(format)
6565
}
6666
}
6767

0 commit comments

Comments
 (0)