[go: nahoru, domu]
Skip to content

Commit

Permalink
Various: Include cldr/event and cldr/supplemental to missing places
Browse files Browse the repository at this point in the history 
Ref #235
Closes #370
  • Loading branch information
@rxaviers
rxaviers committed Dec 19, 2014
1 parent 645f8c8 commit bfa663d
Show file tree
Hide file tree
Showing 26 changed files with 112 additions and 34 deletions.
50 changes: 36 additions & 14 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,13 @@ module.exports = function( grunt ) {
{
name: "globalize.currency",
include: [ "currency" ],
exclude: [ "cldr", "cldr/event", "./core", "./number" ],
exclude: [
"cldr",
"cldr/event",
"cldr/supplemental",
"./core",
"./number"
],
create: true,
override: {
wrap: {
Expand All @@ -213,7 +219,13 @@ module.exports = function( grunt ) {
{
name: "globalize.date",
include: [ "date" ],
exclude: [ "cldr", "cldr/supplemental", "./core", "./number" ],
exclude: [
"cldr",
"cldr/event",
"cldr/supplemental",
"./core",
"./number"
],
create: true,
override: {
wrap: {
Expand All @@ -223,37 +235,47 @@ module.exports = function( grunt ) {
}
},
{
name: "globalize.number",
include: [ "number" ],
exclude: [ "cldr", "cldr/event", "./core" ],
name: "globalize.message",
include: [ "message" ],
exclude: [ "cldr", "./core" ],
create: true,
override: {
wrap: {
startFile: "src/build/intro-number.js",
startFile: "src/build/intro-message.js",
endFile: "src/build/outro.js"
}
}
},
{
name: "globalize.plural",
include: [ "plural" ],
exclude: [ "cldr", "cldr/event", "cldr/supplemental", "./core" ],
name: "globalize.number",
include: [ "number" ],
exclude: [
"cldr",
"cldr/event",
"cldr/supplemental",
"./core"
],
create: true,
override: {
wrap: {
startFile: "src/build/intro-plural.js",
startFile: "src/build/intro-number.js",
endFile: "src/build/outro.js"
}
}
},
{
name: "globalize.message",
include: [ "message" ],
exclude: [ "cldr", "cldr/event", "./core" ],
name: "globalize.plural",
include: [ "plural" ],
exclude: [
"cldr",
"cldr/event",
"cldr/supplemental",
"./core"
],
create: true,
override: {
wrap: {
startFile: "src/build/intro-message.js",
startFile: "src/build/intro-plural.js",
endFile: "src/build/outro.js"
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/build/intro-currency.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"cldr",
"../globalize",
"./number",
"cldr/event"
"cldr/event",
"cldr/supplemental"
], factory );
} else if ( typeof exports === "object" ) {

Expand Down
3 changes: 2 additions & 1 deletion src/currency.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ define([
"./util/object/omit",

"./number",
"cldr/event"
"cldr/event",
"cldr/supplemental"
], function( Globalize, validateCldr, validateDefaultLocale, validateParameterPresence,
validateParameterTypeNumber, validateParameterTypeCurrency, validateParameterTypePlainObject,
validatePluralModulePresence, currencyCodeProperties, currencyNameFormat,
Expand Down
3 changes: 2 additions & 1 deletion src/number.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ define([
"./number/symbol",
"./util/string/pad",

"cldr/event"
"cldr/event",
"cldr/supplemental"
], function( Globalize, createErrorUnsupportedFeature, validateCldr, validateDefaultLocale,
validateParameterPresence, validateParameterRange, validateParameterTypeNumber,
validateParameterTypePlainObject, validateParameterTypeString, numberFormat,
Expand Down
1 change: 1 addition & 0 deletions src/plural.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ define([
"./common/validate/parameter-type",
"./common/validate/parameter-type/number",

"cldr/event",
"cldr/supplemental"
], function( Cldr, MakePlural, Globalize, validateCldr, validateDefaultLocale,
validateParameterPresence, validateParameterType, validateParameterTypeNumber ) {
Expand Down
8 changes: 7 additions & 1 deletion test/functional.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ require.config({
json: "../external/requirejs-plugins/src/json",
src: "../src",
text: "../external/requirejs-text/text"
}
},
waitSeconds: 30
});

require([
Expand Down Expand Up @@ -39,5 +40,10 @@ require([

], function() {
QUnit.start();
}, function( error ) {
QUnit.test( "reqirejs load failure", function( assert ) {
assert.ok( false, "requirejs failed to load: " + QUnit.jsDump.parse( error ) );
});
QUnit.start();
});

1 change: 0 additions & 1 deletion test/functional/message/format-message.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ define([
"json!cldr-data/supplemental/plurals.json",
"../../util",

"cldr/event",
"globalize/message",
"globalize/plural"
], function( Globalize, likelySubtags, plurals, util ) {
Expand Down
1 change: 0 additions & 1 deletion test/functional/message/message-formatter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ define([
"json!cldr-data/supplemental/plurals.json",
"../../util",

"cldr/event",
"cldr/unresolved",
"globalize/message",
"globalize/plural"
Expand Down
8 changes: 7 additions & 1 deletion test/unit.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ require.config({
json: "../external/requirejs-plugins/src/json",
src: "../src",
text: "../external/requirejs-text/text"
}
},
waitSeconds: 30
});

require([
Expand Down Expand Up @@ -45,4 +46,9 @@ require([

], function() {
QUnit.start();
}, function( error ) {
QUnit.test( "reqirejs load failure", function( assert ) {
assert.ok( false, "requirejs failed to load: " + QUnit.jsDump.parse( error ) );
});
QUnit.start();
});
4 changes: 3 additions & 1 deletion test/unit/core/locale.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
define([
"cldr",
"src/core",
"json!cldr-data/supplemental/likelySubtags.json"
"json!cldr-data/supplemental/likelySubtags.json",

"cldr/event"
], function( Cldr, Globalize, likelySubtags ) {

Cldr.load( likelySubtags );
Expand Down
5 changes: 4 additions & 1 deletion test/unit/currency/code-properties.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ define([
"json!cldr-data/main/en/numbers.json",
"json!cldr-data/main/zh/numbers.json",
"json!cldr-data/supplemental/currencyData.json",
"json!cldr-data/supplemental/likelySubtags.json"
"json!cldr-data/supplemental/likelySubtags.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, properties, deNumbers, enNumbers, zhNumbers, currencyData, likelySubtags ) {

var de, en, zh;
Expand Down
5 changes: 4 additions & 1 deletion test/unit/currency/name-format.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ define([
"json!cldr-data/main/zh/currencies.json",
"json!cldr-data/main/zh/numbers.json",
"json!cldr-data/supplemental/currencyData.json",
"json!cldr-data/supplemental/likelySubtags.json"
"json!cldr-data/supplemental/likelySubtags.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, format, properties, enCurrencies, enNumbers, zhCurrencies, zhNumbers,
currencyData, likelySubtags ) {

Expand Down
5 changes: 4 additions & 1 deletion test/unit/currency/name-properties.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ define([
"json!cldr-data/main/zh/currencies.json",
"json!cldr-data/main/zh/numbers.json",
"json!cldr-data/supplemental/currencyData.json",
"json!cldr-data/supplemental/likelySubtags.json"
"json!cldr-data/supplemental/likelySubtags.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, properties, deCurrencies, deNumbers, enCurrencies, enNumbers, zhCurrencies,
zhNumbers, currencyData, likelySubtags ) {

Expand Down
5 changes: 4 additions & 1 deletion test/unit/currency/symbol-properties.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ define([
"json!cldr-data/main/zh/currencies.json",
"json!cldr-data/main/zh/numbers.json",
"json!cldr-data/supplemental/currencyData.json",
"json!cldr-data/supplemental/likelySubtags.json"
"json!cldr-data/supplemental/likelySubtags.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, symbolProperties, deCurrencies, deNumbers, enCurrencies, enNumbers, zhCurrencies,
zhNumbers, currencyData, likelySubtags ) {

Expand Down
5 changes: 4 additions & 1 deletion test/unit/date/expand-pattern.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ define([
"cldr",
"src/date/expand-pattern",
"json!cldr-data/main/en/ca-gregorian.json",
"json!cldr-data/supplemental/likelySubtags.json"
"json!cldr-data/supplemental/likelySubtags.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, expandPattern, enCaGregorian, likelySubtags ) {

var cldr;
Expand Down
1 change: 1 addition & 0 deletions test/unit/date/format-properties.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ define([
"json!cldr-data/supplemental/timeData.json",
"json!cldr-data/supplemental/weekData.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, properties, enCaGregorian, likelySubtags, timeData, weekData ) {

Expand Down
1 change: 1 addition & 0 deletions test/unit/date/format.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ define([
"json!cldr-data/supplemental/timeData.json",
"json!cldr-data/supplemental/weekData.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, format, formatProperties, stringPad, enCaGregorian, timeZoneNames, likelySubtags,
timeData, weekData ) {
Expand Down
1 change: 1 addition & 0 deletions test/unit/date/parse-properties.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ define([
"json!cldr-data/supplemental/likelySubtags.json",
"json!cldr-data/supplemental/timeData.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, parseProperties, enCaGregorian, likelySubtags, timeData ) {

Expand Down
1 change: 1 addition & 0 deletions test/unit/date/parse.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ define([
"json!cldr-data/supplemental/timeData.json",
"json!cldr-data/supplemental/weekData.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, parse, parseProperties, startOf, tokenizer, numberTokenizerProperties,
enCaGregorian, enNumbers, likelySubtags, timeData, weekData ) {
Expand Down
5 changes: 4 additions & 1 deletion test/unit/date/tokenizer-properties.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ define([
"cldr",
"src/date/tokenizer-properties",
"json!cldr-data/main/en/ca-gregorian.json",
"json!cldr-data/supplemental/likelySubtags.json"
"json!cldr-data/supplemental/likelySubtags.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, tokenizerProperties, enCaGregorian, likelySubtags ) {

var cldr;
Expand Down
5 changes: 4 additions & 1 deletion test/unit/date/tokenizer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ define([
"json!cldr-data/main/en/numbers.json",
"json!cldr-data/supplemental/likelySubtags.json",
"json!cldr-data/supplemental/timeData.json",
"json!cldr-data/supplemental/weekData.json"
"json!cldr-data/supplemental/weekData.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, tokenizer, tokenizerProperties, enCaGregorian, enNumbers, likelySubtags,
timeData, weekData ) {

Expand Down
5 changes: 4 additions & 1 deletion test/unit/number/format-properties.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ define([
"src/number/format-properties",
"json!cldr-data/main/en/numbers.json",
"json!cldr-data/main/es/numbers.json",
"json!cldr-data/supplemental/likelySubtags.json"
"json!cldr-data/supplemental/likelySubtags.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, properties, enNumbers, esNumbers, likelySubtags ) {

var en, es;
Expand Down
5 changes: 4 additions & 1 deletion test/unit/number/format.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ define([
"json!cldr-data/main/es/numbers.json",
"json!cldr-data/main/zh/numbers.json",
"json!cldr-data/supplemental/likelySubtags.json",
"json!cldr-data/supplemental/numberingSystems.json"
"json!cldr-data/supplemental/numberingSystems.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, format, properties, arNumbers, enNumbers, esNumbers, zhNumbers, likelySubtags,
numberingSystems ) {

Expand Down
5 changes: 4 additions & 1 deletion test/unit/number/parse-properties.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ define([
"src/number/parse-properties",
"json!cldr-data/main/en/numbers.json",
"json!cldr-data/main/es/numbers.json",
"json!cldr-data/supplemental/likelySubtags.json"
"json!cldr-data/supplemental/likelySubtags.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, properties, enNumbers, esNumbers, likelySubtags ) {

var en, es;
Expand Down
5 changes: 4 additions & 1 deletion test/unit/number/parse.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ define([
"json!cldr-data/main/sv/numbers.json",
"json!cldr-data/main/zh/numbers.json",
"json!cldr-data/supplemental/likelySubtags.json",
"json!cldr-data/supplemental/numberingSystems.json"
"json!cldr-data/supplemental/numberingSystems.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, parse, properties, arNumbers, enNumbers, esNumbers, ruNumbers, svNumbers,
zhNumbers, likelySubtags, numberingSystems ) {

Expand Down
5 changes: 4 additions & 1 deletion test/unit/number/pattern-properties.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ define([
"cldr",
"src/number/format-properties",
"json!cldr-data/main/en/numbers.json",
"json!cldr-data/supplemental/likelySubtags.json"
"json!cldr-data/supplemental/likelySubtags.json",

"cldr/event",
"cldr/supplemental"
], function( Cldr, properties, enNumbers, likelySubtags ) {

var en;
Expand Down

0 comments on commit bfa663d

Please sign in to comment.