|
88 | 88 | } |
89 | 89 |
|
90 | 90 | function globalizeLocalizers(globalize) { |
91 | | - var localizers = globalize.load ? newGlobalize(globalize) : oldGlobalize(globalize); |
| 91 | + var localizers = globalize.locale && !globalize.cultures ? newGlobalize(globalize) : oldGlobalize(globalize); |
92 | 92 |
|
93 | 93 | _configure2['default'].setLocalizers(localizers); |
94 | 94 | return localizers; |
|
149 | 149 |
|
150 | 150 | propType: _react.PropTypes.oneOfType([_react.PropTypes.object, _react.PropTypes.func]), |
151 | 151 |
|
152 | | - parse: function parse(value, format, culture) { |
153 | | - return locale(culture).parseNumber(value, format); |
| 152 | + // TODO major bump consistent ordering |
| 153 | + parse: function parse(value, culture) { |
| 154 | + return locale(culture).parseNumber(value); |
154 | 155 | }, |
155 | 156 |
|
156 | 157 | format: function format(value, _format2, culture) { |
|
161 | 162 | return locale(culture).formatNumber(value, _format2); |
162 | 163 | }, |
163 | 164 |
|
| 165 | + decimalChar: function decimalChar(format, culture) { |
| 166 | + var str = this.format(1.1, { raw: '0.0' }, culture); |
| 167 | + return str[str.length - 2] || '.'; |
| 168 | + }, |
| 169 | + |
164 | 170 | precision: function precision(format) { |
165 | 171 | return !format || format.maximumFractionDigits == null ? null : format.maximumFractionDigits; |
166 | 172 | } |
|
225 | 231 | } |
226 | 232 | }; |
227 | 233 |
|
| 234 | + function formatData(format, _culture) { |
| 235 | + var culture = getCulture(_culture), |
| 236 | + numFormat = culture.numberFormat; |
| 237 | + |
| 238 | + if (typeof format === 'string') { |
| 239 | + if (format.indexOf('p') !== -1) numFormat = numFormat.percent; |
| 240 | + if (format.indexOf('c') !== -1) numFormat = numFormat.curency; |
| 241 | + } |
| 242 | + |
| 243 | + return numFormat; |
| 244 | + } |
| 245 | + |
228 | 246 | var number = { |
229 | 247 |
|
230 | 248 | formats: { |
231 | 249 | 'default': 'D' |
232 | 250 | }, |
233 | 251 |
|
| 252 | + // TODO major bump consistent ordering |
234 | 253 | parse: function parse(value, culture) { |
235 | 254 | return globalize.parseFloat(value, 10, culture); |
236 | 255 | }, |
|
239 | 258 | return globalize.format(value, _format4, culture); |
240 | 259 | }, |
241 | 260 |
|
242 | | - precision: function precision(format, _culture) { |
243 | | - var culture = getCulture(_culture), |
244 | | - numFormat = culture.numberFormat; |
245 | | - |
246 | | - if (typeof format === 'string') { |
247 | | - if (format.length > 1) return parseFloat(format.substr(1)); |
| 261 | + decimalChar: function decimalChar(format, culture) { |
| 262 | + var data = formatData(format, culture); |
| 263 | + return data['.'] || '.'; |
| 264 | + }, |
248 | 265 |
|
249 | | - if (format.indexOf('p') !== -1) numFormat = numFormat.percent; |
250 | | - if (format.indexOf('c') !== -1) numFormat = numFormat.curency; |
| 266 | + precision: function precision(format, _culture) { |
| 267 | + var data = formatData(format, _culture); |
251 | 268 |
|
252 | | - return numFormat.decimals || null; |
253 | | - } |
| 269 | + if (typeof format === 'string' && format.length > 1) return parseFloat(format.substr(1)); |
254 | 270 |
|
255 | | - return null; |
| 271 | + return data ? data.decimals : null; |
256 | 272 | } |
257 | 273 | }; |
258 | 274 |
|
|
0 commit comments