Skip to content

Commit 5ec201c

Browse files
kevin-brownkevin-brown
committed
Built out the translations
This migrates over the required English translations under their new names. The "Searching" message has also been adjusted to use "Searching..." instead of "Loading more results...", which is what it used to say sometimes. This also changes the AJAX handler to call `abort` when needed.
1 parent 7e6782d commit 5ec201c

11 files changed

Lines changed: 349 additions & 179 deletions

File tree

‎dist/js/i18n/en.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/js/select2.amd.full.js‎

Lines changed: 77 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ define('select2/results',[
267267
Results.prototype.showLoading = function (params) {
268268
this.hideLoading();
269269

270-
var loadingMore = this.options.get('translations').get('loadingMore');
270+
var loadingMore = this.options.get('translations').get('searching');
271271

272272
var loading = {
273273
disabled: true,
@@ -578,9 +578,50 @@ define('select2/results',[
578578
return Results;
579579
});
580580

581+
define('select2/keys',[
582+
583+
], function () {
584+
var KEYS = {
585+
BACKSPACE: 8,
586+
TAB: 9,
587+
ENTER: 13,
588+
SHIFT: 16,
589+
CTRL: 17,
590+
ALT: 18,
591+
ESC: 27,
592+
SPACE: 32,
593+
PAGE_UP: 33,
594+
PAGE_DOWN: 34,
595+
END: 35,
596+
HOME: 36,
597+
LEFT: 37,
598+
UP: 38,
599+
RIGHT: 39,
600+
DOWN: 40,
601+
DELETE: 46,
602+
603+
isArrow: function (k) {
604+
k = k.which ? k.which : k;
605+
606+
switch (k) {
607+
case KEY.LEFT:
608+
case KEY.RIGHT:
609+
case KEY.UP:
610+
case KEY.DOWN:
611+
return true;
612+
}
613+
614+
return false;
615+
}
616+
};
617+
618+
return KEYS;
619+
});
620+
581621
define('select2/selection/base',[
582-
'../utils'
583-
], function (Utils) {
622+
'../utils',
623+
'../keys'
624+
], function (Utils, KEYS) {
584625
function BaseSelection ($element, options) {
585626
this.$element = $element;
586627
this.options = options;
@@ -666,46 +707,6 @@ define('select2/selection/base',[
666707
return BaseSelection;
667708
});
668709

669-
define('select2/keys',[
670-
671-
], function () {
672-
var KEYS = {
673-
BACKSPACE: 8,
674-
TAB: 9,
675-
ENTER: 13,
676-
SHIFT: 16,
677-
CTRL: 17,
678-
ALT: 18,
679-
ESC: 27,
680-
SPACE: 32,
681-
PAGE_UP: 33,
682-
PAGE_DOWN: 34,
683-
END: 35,
684-
HOME: 36,
685-
LEFT: 37,
686-
UP: 38,
687-
RIGHT: 39,
688-
DOWN: 40,
689-
DELETE: 46,
690-
691-
isArrow: function (k) {
692-
k = k.which ? k.which : k;
693-
694-
switch (k) {
695-
case KEY.LEFT:
696-
case KEY.RIGHT:
697-
case KEY.UP:
698-
case KEY.DOWN:
699-
return true;
700-
}
701-
702-
return false;
703-
}
704-
};
705-
706-
return KEYS;
707-
});
708-
709710
define('select2/selection/single',[
710711
'./base',
711712
'../utils',
@@ -1341,6 +1342,11 @@ define('select2/data/ajax',[
13411342
var matches = [];
13421343
var self = this;
13431344

1345+
if (this._request) {
1346+
this._request.abort();
1347+
this._request = null;
1348+
}
1349+
13441350
var options = $.extend({
13451351
type: 'GET'
13461352
}, this.ajaxOptions);
@@ -1361,6 +1367,8 @@ define('select2/data/ajax',[
13611367

13621368
callback(results);
13631369
});
1370+
1371+
self._request = $request;
13641372
}
13651373

13661374
if (this.ajaxOptions.delay && params.term !== '') {
@@ -1750,6 +1758,20 @@ define('select2/dropdown/infiniteScroll',[
17501758

17511759
define('select2/i18n/en',[],function () {
17521760
return {
1761+
errorLoading: function () {
1762+
return 'The results could not be loaded.';
1763+
},
1764+
inputTooLong: function (args) {
1765+
var overChars = args.input.length - args.maximum;
1766+
1767+
var message = 'Please delete ' + overChars + ' character';
1768+
1769+
if (overChars != 1) {
1770+
message += 's';
1771+
}
1772+
1773+
return message;
1774+
},
17531775
inputTooShort: function (args) {
17541776
var remainingChars = args.minimum - args.input.length;
17551777

@@ -1761,9 +1783,21 @@ define('select2/i18n/en',[],function () {
17611783

17621784
return message;
17631785
},
1786+
searching: function () {
1787+
return 'Searching…';
1788+
},
17641789
loadingMore: function () {
17651790
return 'Loading more results…';
17661791
},
1792+
maximumSelected: function (args) {
1793+
var message = 'You can only select' + args.maximum + ' item';
1794+
1795+
if (args.maximum != 1) {
1796+
message += 's';
1797+
}
1798+
1799+
return message;
1800+
},
17671801
noResults: function () {
17681802
return 'No results found';
17691803
}

‎dist/js/select2.amd.js‎

Lines changed: 77 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ define('select2/results',[
267267
Results.prototype.showLoading = function (params) {
268268
this.hideLoading();
269269

270-
var loadingMore = this.options.get('translations').get('loadingMore');
270+
var loadingMore = this.options.get('translations').get('searching');
271271

272272
var loading = {
273273
disabled: true,
@@ -578,9 +578,50 @@ define('select2/results',[
578578
return Results;
579579
});
580580

581+
define('select2/keys',[
582+
583+
], function () {
584+
var KEYS = {
585+
BACKSPACE: 8,
586+
TAB: 9,
587+
ENTER: 13,
588+
SHIFT: 16,
589+
CTRL: 17,
590+
ALT: 18,
591+
ESC: 27,
592+
SPACE: 32,
593+
PAGE_UP: 33,
594+
PAGE_DOWN: 34,
595+
END: 35,
596+
HOME: 36,
597+
LEFT: 37,
598+
UP: 38,
599+
RIGHT: 39,
600+
DOWN: 40,
601+
DELETE: 46,
602+
603+
isArrow: function (k) {
604+
k = k.which ? k.which : k;
605+
606+
switch (k) {
607+
case KEY.LEFT:
608+
case KEY.RIGHT:
609+
case KEY.UP:
610+
case KEY.DOWN:
611+
return true;
612+
}
613+
614+
return false;
615+
}
616+
};
617+
618+
return KEYS;
619+
});
620+
581621
define('select2/selection/base',[
582-
'../utils'
583-
], function (Utils) {
622+
'../utils',
623+
'../keys'
624+
], function (Utils, KEYS) {
584625
function BaseSelection ($element, options) {
585626
this.$element = $element;
586627
this.options = options;
@@ -666,46 +707,6 @@ define('select2/selection/base',[
666707
return BaseSelection;
667708
});
668709

669-
define('select2/keys',[
670-
671-
], function () {
672-
var KEYS = {
673-
BACKSPACE: 8,
674-
TAB: 9,
675-
ENTER: 13,
676-
SHIFT: 16,
677-
CTRL: 17,
678-
ALT: 18,
679-
ESC: 27,
680-
SPACE: 32,
681-
PAGE_UP: 33,
682-
PAGE_DOWN: 34,
683-
END: 35,
684-
HOME: 36,
685-
LEFT: 37,
686-
UP: 38,
687-
RIGHT: 39,
688-
DOWN: 40,
689-
DELETE: 46,
690-
691-
isArrow: function (k) {
692-
k = k.which ? k.which : k;
693-
694-
switch (k) {
695-
case KEY.LEFT:
696-
case KEY.RIGHT:
697-
case KEY.UP:
698-
case KEY.DOWN:
699-
return true;
700-
}
701-
702-
return false;
703-
}
704-
};
705-
706-
return KEYS;
707-
});
708-
709710
define('select2/selection/single',[
710711
'./base',
711712
'../utils',
@@ -1341,6 +1342,11 @@ define('select2/data/ajax',[
13411342
var matches = [];
13421343
var self = this;
13431344

1345+
if (this._request) {
1346+
this._request.abort();
1347+
this._request = null;
1348+
}
1349+
13441350
var options = $.extend({
13451351
type: 'GET'
13461352
}, this.ajaxOptions);
@@ -1361,6 +1367,8 @@ define('select2/data/ajax',[
13611367

13621368
callback(results);
13631369
});
1370+
1371+
self._request = $request;
13641372
}
13651373

13661374
if (this.ajaxOptions.delay && params.term !== '') {
@@ -1750,6 +1758,20 @@ define('select2/dropdown/infiniteScroll',[
17501758

17511759
define('select2/i18n/en',[],function () {
17521760
return {
1761+
errorLoading: function () {
1762+
return 'The results could not be loaded.';
1763+
},
1764+
inputTooLong: function (args) {
1765+
var overChars = args.input.length - args.maximum;
1766+
1767+
var message = 'Please delete ' + overChars + ' character';
1768+
1769+
if (overChars != 1) {
1770+
message += 's';
1771+
}
1772+
1773+
return message;
1774+
},
17531775
inputTooShort: function (args) {
17541776
var remainingChars = args.minimum - args.input.length;
17551777

@@ -1761,9 +1783,21 @@ define('select2/i18n/en',[],function () {
17611783

17621784
return message;
17631785
},
1786+
searching: function () {
1787+
return 'Searching…';
1788+
},
17641789
loadingMore: function () {
17651790
return 'Loading more results…';
17661791
},
1792+
maximumSelected: function (args) {
1793+
var message = 'You can only select' + args.maximum + ' item';
1794+
1795+
if (args.maximum != 1) {
1796+
message += 's';
1797+
}
1798+
1799+
return message;
1800+
},
17671801
noResults: function () {
17681802
return 'No results found';
17691803
}

0 commit comments

Comments
 (0)