Fixed the default translations

kevin-brown · kevin-brown · commit a4af105a6ed9 · 2014-11-25T16:09:52.000-05:00
Previously the default translations would break for custom AMD
builds. This fixes it so it does not rely on a hard-coded import
path.
diff --git a/dist/js/select2.amd.full.js b/dist/js/select2.amd.full.js
@@ -3090,7 +3090,7 @@ define('select2/defaults',[
 
       options.translations = languages;
     } else {
-      options.translations = new Translations(options.language);
+      options.translations = new Translation(options.language);
     }
 
     return options;
@@ -3152,7 +3152,7 @@ define('select2/defaults',[
     }
 
     this.defaults = {
-      language: ['select2/i18n/en'],
+      language: EnglishTranslation,
       matcher: matcher,
       minimumInputLength: 0,
       theme: 'default',
diff --git a/dist/js/select2.amd.js b/dist/js/select2.amd.js
@@ -3090,7 +3090,7 @@ define('select2/defaults',[
 
       options.translations = languages;
     } else {
-      options.translations = new Translations(options.language);
+      options.translations = new Translation(options.language);
     }
 
     return options;
@@ -3152,7 +3152,7 @@ define('select2/defaults',[
     }
 
     this.defaults = {
-      language: ['select2/i18n/en'],
+      language: EnglishTranslation,
       matcher: matcher,
       minimumInputLength: 0,
       theme: 'default',
diff --git a/dist/js/select2.full.js b/dist/js/select2.full.js
@@ -12625,7 +12625,7 @@ define('select2/defaults',[
 
       options.translations = languages;
     } else {
-      options.translations = new Translations(options.language);
+      options.translations = new Translation(options.language);
     }
 
     return options;
@@ -12687,7 +12687,7 @@ define('select2/defaults',[
     }
 
     this.defaults = {
-      language: ['select2/i18n/en'],
+      language: EnglishTranslation,
       matcher: matcher,
       minimumInputLength: 0,
       theme: 'default',
diff --git a/dist/js/select2.full.min.js b/dist/js/select2.full.min.js
diff --git a/dist/js/select2.js b/dist/js/select2.js
@@ -3518,7 +3518,7 @@ define('select2/defaults',[
 
       options.translations = languages;
     } else {
-      options.translations = new Translations(options.language);
+      options.translations = new Translation(options.language);
     }
 
     return options;
@@ -3580,7 +3580,7 @@ define('select2/defaults',[
     }
 
     this.defaults = {
-      language: ['select2/i18n/en'],
+      language: EnglishTranslation,
       matcher: matcher,
       minimumInputLength: 0,
       theme: 'default',
diff --git a/dist/js/select2.min.js b/dist/js/select2.min.js
diff --git a/src/js/select2/defaults.js b/src/js/select2/defaults.js
@@ -156,7 +156,7 @@ define([
 
       options.translations = languages;
     } else {
-      options.translations = new Translations(options.language);
+      options.translations = new Translation(options.language);
     }
 
     return options;
@@ -218,7 +218,7 @@ define([
     }
 
     this.defaults = {
-      language: ['select2/i18n/en'],
+      language: EnglishTranslation,
       matcher: matcher,
       minimumInputLength: 0,
       theme: 'default',

Original file line number	Diff line number	Diff line change
`@@ -3090,7 +3090,7 @@ define('select2/defaults',[`
`3090`	`3090`
`3091`	`3091`	`options.translations = languages;`
`3092`	`3092`	`} else {`
`3093`		`- options.translations = new Translations(options.language);`
	`3093`	`+ options.translations = new Translation(options.language);`
`3094`	`3094`	`}`
`3095`	`3095`
`3096`	`3096`	`return options;`
`@@ -3152,7 +3152,7 @@ define('select2/defaults',[`
`3152`	`3152`	`}`
`3153`	`3153`
`3154`	`3154`	`this.defaults = {`
`3155`		`- language: ['select2/i18n/en'],`
	`3155`	`+ language: EnglishTranslation,`
`3156`	`3156`	`matcher: matcher,`
`3157`	`3157`	`minimumInputLength: 0,`
`3158`	`3158`	`theme: 'default',`
Original file line number	Diff line number	Diff line change
`@@ -12625,7 +12625,7 @@ define('select2/defaults',[`
`12625`	`12625`
`12626`	`12626`	`options.translations = languages;`
`12627`	`12627`	`} else {`
`12628`		`- options.translations = new Translations(options.language);`
	`12628`	`+ options.translations = new Translation(options.language);`
`12629`	`12629`	`}`
`12630`	`12630`
`12631`	`12631`	`return options;`
`@@ -12687,7 +12687,7 @@ define('select2/defaults',[`
`12687`	`12687`	`}`
`12688`	`12688`
`12689`	`12689`	`this.defaults = {`
`12690`		`- language: ['select2/i18n/en'],`
	`12690`	`+ language: EnglishTranslation,`
`12691`	`12691`	`matcher: matcher,`
`12692`	`12692`	`minimumInputLength: 0,`
`12693`	`12693`	`theme: 'default',`
Original file line number	Diff line number	Diff line change
`@@ -3518,7 +3518,7 @@ define('select2/defaults',[`
`3518`	`3518`
`3519`	`3519`	`options.translations = languages;`
`3520`	`3520`	`} else {`
`3521`		`- options.translations = new Translations(options.language);`
	`3521`	`+ options.translations = new Translation(options.language);`
`3522`	`3522`	`}`
`3523`	`3523`
`3524`	`3524`	`return options;`
`@@ -3580,7 +3580,7 @@ define('select2/defaults',[`
`3580`	`3580`	`}`
`3581`	`3581`
`3582`	`3582`	`this.defaults = {`
`3583`		`- language: ['select2/i18n/en'],`
	`3583`	`+ language: EnglishTranslation,`
`3584`	`3584`	`matcher: matcher,`
`3585`	`3585`	`minimumInputLength: 0,`
`3586`	`3586`	`theme: 'default',`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ define([`
`156`	`156`
`157`	`157`	`options.translations = languages;`
`158`	`158`	`} else {`
`159`		`- options.translations = new Translations(options.language);`
	`159`	`+ options.translations = new Translation(options.language);`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`return options;`
`@@ -218,7 +218,7 @@ define([`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`this.defaults = {`
`221`		`- language: ['select2/i18n/en'],`
	`221`	`+ language: EnglishTranslation,`
`222`	`222`	`matcher: matcher,`
`223`	`223`	`minimumInputLength: 0,`
`224`	`224`	`theme: 'default',`