Finished tr8n functions. Fixes #705

snapappointments · Aug 24, 2014 · 4913226 · 4913226
1 parent 6d825e5
commit 4913226
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 14 deletions.
diff --git a/dist/js/bootstrap-select.js b/dist/js/bootstrap-select.js
@@ -96,7 +96,9 @@
   Selectpicker.DEFAULTS = {
     noneSelectedText: 'Nothing selected',
     noneResultsText: 'No results match',
-    countSelectedText: '{0} of {1} selected',
+    countSelectedText: function (numSelected, numTotal) {
+      return (numSelected == 1) ? "{0} item selected" : "{0} items selected";
+    },
     maxOptionsText: function (numAll, numGroup) {
       var arr = [];
 
@@ -374,8 +376,9 @@
         var max = this.options.selectedTextFormat.split('>');
         var notDisabled = this.options.hideDisabled ? ', [disabled]' : '';
         if ((max.length > 1 && selectedItems.length > max[1]) || (max.length == 1 && selectedItems.length >= 2)) {
-          title = this.options.countSelectedText.replace('{0}', selectedItems.length.toString())
-              .replace('{1}', this.$element.find('option').not('[data-divider="true"], [data-hidden="true"]' + notDisabled).length.toString());
+          var totalCount = this.$element.find('option').not('[data-divider="true"], [data-hidden="true"]' + notDisabled).length,
+              tr8nText = (typeof this.options.countSelectedText === 'function') ? this.options.countSelectedText(selectedItems.length, totalCount) : this.options.countSelectedText;
+          title = tr8nText.replace('{0}', selectedItems.length.toString()).replace('{1}', totalCount.toString());
         }
       }
 

diff --git a/dist/js/bootstrap-select.js.map b/dist/js/bootstrap-select.js.map
diff --git a/dist/js/bootstrap-select.min.js b/dist/js/bootstrap-select.min.js
diff --git a/dist/js/i18n/defaults-en_US.js b/dist/js/i18n/defaults-en_US.js
@@ -8,7 +8,9 @@
   $.fn.selectpicker.defaults = {
     noneSelectedText: 'Nothing selected',
     noneResultsText: 'No results match',
-    countSelectedText: '{0} of {1} selected',
+    countSelectedText: function (numSelected, numTotal) {
+      return (numSelected == 1) ? "{0} item selected" : "{0} items selected";
+    },
     maxOptionsText: function (numAll, numGroup) {
       var arr = [];
 

diff --git a/dist/js/i18n/defaults-en_US.min.js b/dist/js/i18n/defaults-en_US.min.js
@@ -4,4 +4,4 @@
  * Copyright 2013-2014 bootstrap-select
  * Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
  */
-!function(a){a.fn.selectpicker.defaults={noneSelectedText:"Nothing selected",noneResultsText:"No results match",countSelectedText:"{0} of {1} selected",maxOptionsText:function(a,b){var c=[];return c[0]=1==a?"Limit reached ({n} item max)":"Limit reached ({n} items max)",c[1]=1==b?"Group limit reached ({n} item max)":"Group limit reached ({n} items max)",c},selectAllText:"Select All",deselectAllText:"Deselect All",multipleSeparator:", "}}(jQuery);
+!function(a){a.fn.selectpicker.defaults={noneSelectedText:"Nothing selected",noneResultsText:"No results match",countSelectedText:function(a){return 1==a?"{0} item selected":"{0} items selected"},maxOptionsText:function(a,b){var c=[];return c[0]=1==a?"Limit reached ({n} item max)":"Limit reached ({n} items max)",c[1]=1==b?"Group limit reached ({n} item max)":"Group limit reached ({n} items max)",c},selectAllText:"Select All",deselectAllText:"Deselect All",multipleSeparator:", "}}(jQuery);
diff --git a/dist/js/i18n/defaults-fr_FR.js b/dist/js/i18n/defaults-fr_FR.js
@@ -8,7 +8,9 @@
   $.fn.selectpicker.defaults = {
     noneSelectedText: 'Aucune s&eacute;lection',
     noneResultsText: 'Aucun r&eacute;sultat',
-    countSelectedText: '{0} sur {1} s&eacute;lection(s)',
+    countSelectedText: function (numSelected, numTotal) {
+      return (numSelected > 1) ? "{0} &eacute;l&eacute;ments s&eacute;lection&eacute;s" : "{0} &eacute;l&eacute;ment s&eacute;lection&eacute;";
+    },
     maxOptionsText: function (numAll, numGroup) {
       var arr = [];
 

diff --git a/dist/js/i18n/defaults-fr_FR.min.js b/dist/js/i18n/defaults-fr_FR.min.js
diff --git a/js/bootstrap-select.js b/js/bootstrap-select.js
@@ -90,7 +90,9 @@
   Selectpicker.DEFAULTS = {
     noneSelectedText: 'Nothing selected',
     noneResultsText: 'No results match',
-    countSelectedText: '{0} of {1} selected',
+    countSelectedText: function (numSelected, numTotal) {
+      return (numSelected == 1) ? "{0} item selected" : "{0} items selected";
+    },
     maxOptionsText: function (numAll, numGroup) {
       var arr = [];
 
@@ -368,8 +370,9 @@
         var max = this.options.selectedTextFormat.split('>');
         var notDisabled = this.options.hideDisabled ? ', [disabled]' : '';
         if ((max.length > 1 && selectedItems.length > max[1]) || (max.length == 1 && selectedItems.length >= 2)) {
-          title = this.options.countSelectedText.replace('{0}', selectedItems.length.toString())
-              .replace('{1}', this.$element.find('option').not('[data-divider="true"], [data-hidden="true"]' + notDisabled).length.toString());
+          var totalCount = this.$element.find('option').not('[data-divider="true"], [data-hidden="true"]' + notDisabled).length,
+              tr8nText = (typeof this.options.countSelectedText === 'function') ? this.options.countSelectedText(selectedItems.length, totalCount) : this.options.countSelectedText;
+          title = tr8nText.replace('{0}', selectedItems.length.toString()).replace('{1}', totalCount.toString());
         }
       }
 

diff --git a/js/i18n/defaults-en_US.js b/js/i18n/defaults-en_US.js
@@ -7,7 +7,9 @@
   $.fn.selectpicker.defaults = {
     noneSelectedText: 'Nothing selected',
     noneResultsText: 'No results match',
-    countSelectedText: '{0} of {1} selected',
+    countSelectedText: function (numSelected, numTotal) {
+      return (numSelected == 1) ? "{0} item selected" : "{0} items selected";
+    },
     maxOptionsText: function (numAll, numGroup) {
       var arr = [];
 

diff --git a/js/i18n/defaults-fr_FR.js b/js/i18n/defaults-fr_FR.js
@@ -7,7 +7,9 @@
   $.fn.selectpicker.defaults = {
     noneSelectedText: 'Aucune s&eacute;lection',
     noneResultsText: 'Aucun r&eacute;sultat',
-    countSelectedText: '{0} sur {1} s&eacute;lection(s)',
+    countSelectedText: function (numSelected, numTotal) {
+      return (numSelected > 1) ? "{0} &eacute;l&eacute;ments s&eacute;lection&eacute;s" : "{0} &eacute;l&eacute;ment s&eacute;lection&eacute;";
+    },
     maxOptionsText: function (numAll, numGroup) {
       var arr = [];