ソースを参照

Fix table options bug

zhixin 6 年 前
コミット
2ef7f2f71a
50 ファイル変更106 行追加96 行削除
  1. 10 0
      site/docs/api/table-options.md
  2. 1 1
      src/bootstrap-table.js
  3. 2 2
      src/constants/index.js
  4. 2 2
      src/locale/bootstrap-table-af-ZA.js
  5. 2 2
      src/locale/bootstrap-table-ar-SA.js
  6. 2 2
      src/locale/bootstrap-table-ca-ES.js
  7. 2 2
      src/locale/bootstrap-table-cs-CZ.js
  8. 2 2
      src/locale/bootstrap-table-da-DK.js
  9. 1 1
      src/locale/bootstrap-table-de-DE.js
  10. 2 2
      src/locale/bootstrap-table-el-GR.js
  11. 2 2
      src/locale/bootstrap-table-en-US.js
  12. 2 2
      src/locale/bootstrap-table-es-AR.js
  13. 2 2
      src/locale/bootstrap-table-es-CL.js
  14. 2 2
      src/locale/bootstrap-table-es-CR.js
  15. 2 2
      src/locale/bootstrap-table-es-ES.js
  16. 2 2
      src/locale/bootstrap-table-es-MX.js
  17. 2 2
      src/locale/bootstrap-table-es-NI.js
  18. 2 2
      src/locale/bootstrap-table-es-SP.js
  19. 2 2
      src/locale/bootstrap-table-et-EE.js
  20. 2 2
      src/locale/bootstrap-table-eu-EU.js
  21. 2 2
      src/locale/bootstrap-table-fa-IR.js
  22. 2 2
      src/locale/bootstrap-table-fi-FI.js
  23. 2 2
      src/locale/bootstrap-table-fr-BE.js
  24. 2 2
      src/locale/bootstrap-table-fr-FR.js
  25. 2 2
      src/locale/bootstrap-table-he-IL.js
  26. 2 2
      src/locale/bootstrap-table-hr-HR.js
  27. 2 2
      src/locale/bootstrap-table-hu-HU.js
  28. 2 2
      src/locale/bootstrap-table-id-ID.js
  29. 2 2
      src/locale/bootstrap-table-it-IT.js
  30. 2 2
      src/locale/bootstrap-table-ja-JP.js
  31. 2 2
      src/locale/bootstrap-table-ka-GE.js
  32. 2 2
      src/locale/bootstrap-table-ko-KR.js
  33. 2 2
      src/locale/bootstrap-table-ms-MY.js
  34. 2 2
      src/locale/bootstrap-table-nb-NO.js
  35. 2 2
      src/locale/bootstrap-table-nl-NL.js
  36. 2 2
      src/locale/bootstrap-table-pl-PL.js
  37. 2 2
      src/locale/bootstrap-table-pt-BR.js
  38. 2 2
      src/locale/bootstrap-table-pt-PT.js
  39. 2 2
      src/locale/bootstrap-table-ro-RO.js
  40. 2 2
      src/locale/bootstrap-table-ru-RU.js
  41. 2 2
      src/locale/bootstrap-table-sk-SK.js
  42. 2 2
      src/locale/bootstrap-table-sv-SE.js
  43. 2 2
      src/locale/bootstrap-table-th-TH.js
  44. 2 2
      src/locale/bootstrap-table-tr-TR.js
  45. 2 2
      src/locale/bootstrap-table-uk-UA.js
  46. 2 2
      src/locale/bootstrap-table-ur-PK.js
  47. 2 2
      src/locale/bootstrap-table-uz-Latn-UZ.js
  48. 2 2
      src/locale/bootstrap-table-vi-VN.js
  49. 2 2
      src/locale/bootstrap-table-zh-CN.js
  50. 2 2
      src/locale/bootstrap-table-zh-TW.js

+ 10 - 0
site/docs/api/table-options.md

@@ -515,6 +515,8 @@ The table options are defined in `jQuery.fn.bootstrapTable.defaults`.
 
 
 - **Default:** `false`
 - **Default:** `false`
 
 
+- **Example:** [Show Extended Pagination](https://examples.bootstrap-table.com/#options/show-extended-pagination.html)
+
 ## totalNotFilteredField
 ## totalNotFilteredField
 
 
 - **Attribute:** `data-total-not-filtered-field`
 - **Attribute:** `data-total-not-filtered-field`
@@ -527,6 +529,8 @@ The table options are defined in `jQuery.fn.bootstrapTable.defaults`.
 
 
 - **Default:** `totalNotFiltered`
 - **Default:** `totalNotFiltered`
 
 
+- **Example:** [Total Not Filtered Field](https://examples.bootstrap-table.com/#options/total-not-filtered-field.html)
+
 ## paginationLoop
 ## paginationLoop
 
 
 - **Attribute:** `data-pagination-loop`
 - **Attribute:** `data-pagination-loop`
@@ -1200,6 +1204,8 @@ The table options are defined in `jQuery.fn.bootstrapTable.defaults`.
 
 
 - **Default:** `true`
 - **Default:** `true`
 
 
+- **Example:** [Detail View Icon](https://examples.bootstrap-table.com/#options/detail-view-icon.html)
+
 ## detailFormatter
 ## detailFormatter
 
 
 - **Attribute:** `data-detail-formatter`
 - **Attribute:** `data-detail-formatter`
@@ -1238,6 +1244,10 @@ The table options are defined in `jQuery.fn.bootstrapTable.defaults`.
 
 
   Set `true` to toggle the detail view, when a cell is clicked.
   Set `true` to toggle the detail view, when a cell is clicked.
 
 
+- **Default:** `false`
+
+- **Example:** [Detail View Icon](https://examples.bootstrap-table.com/#options/detail-view-icon.html)
+
 ## toolbar
 ## toolbar
 
 
 - **Attribute:** `data-toolbar`
 - **Attribute:** `data-toolbar`

+ 1 - 1
src/bootstrap-table.js

@@ -1740,7 +1740,7 @@ class BootstrapTable {
       const $this = $(el)
       const $this = $(el)
       let index = i
       let index = i
 
 
-      if (this.options.detailView && !this.options.cardView) {
+      if (this.options.detailView && this.options.detailViewIcon && !this.options.cardView) {
         if (i === 0) {
         if (i === 0) {
           const $thDetail = $ths.filter('.detail')
           const $thDetail = $ths.filter('.detail')
           const zoomWidth = $thDetail.width() - $thDetail.find('.fht-cell').width()
           const zoomWidth = $thDetail.width() - $thDetail.find('.fht-cell').width()

+ 2 - 2
src/constants/index.js

@@ -297,8 +297,8 @@ const EN = {
     return `${pageNumber} rows per page`
     return `${pageNumber} rows per page`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Showing ${pageFrom} to ${pageTo} of ${totalRows} rows (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Showing ${pageFrom} to ${pageTo} of ${totalRows} rows (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Showing ${pageFrom} to ${pageTo} of ${totalRows} rows`
     return `Showing ${pageFrom} to ${pageTo} of ${totalRows} rows`

+ 2 - 2
src/locale/bootstrap-table-af-ZA.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['af-ZA'] = {
     return `${pageNumber} rekords per bladsy`
     return `${pageNumber} rekords per bladsy`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Resultate ${pageFrom} tot ${pageTo} van ${totalRows} rye (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Resultate ${pageFrom} tot ${pageTo} van ${totalRows} rye (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Resultate ${pageFrom} tot ${pageTo} van ${totalRows} rye`
     return `Resultate ${pageFrom} tot ${pageTo} van ${totalRows} rye`

+ 2 - 2
src/locale/bootstrap-table-ar-SA.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['ar-SA'] = {
     return `${pageNumber} سجل لكل صفحة`
     return `${pageNumber} سجل لكل صفحة`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `الظاهر ${pageFrom} إلى ${pageTo} من ${totalRows} سجل ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `الظاهر ${pageFrom} إلى ${pageTo} من ${totalRows} سجل ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `الظاهر ${pageFrom} إلى ${pageTo} من ${totalRows} سجل`
     return `الظاهر ${pageFrom} إلى ${pageTo} من ${totalRows} سجل`

+ 2 - 2
src/locale/bootstrap-table-ca-ES.js

@@ -12,8 +12,8 @@ $.fn.bootstrapTable.locales['ca-ES'] = {
     return `${pageNumber} resultats per pàgina`
     return `${pageNumber} resultats per pàgina`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Mostrant de ${pageFrom} fins ${pageTo} - total ${totalRows} resultats (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Mostrant de ${pageFrom} fins ${pageTo} - total ${totalRows} resultats (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Mostrant de ${pageFrom} fins ${pageTo} - total ${totalRows} resultats`
     return `Mostrant de ${pageFrom} fins ${pageTo} - total ${totalRows} resultats`

+ 2 - 2
src/locale/bootstrap-table-cs-CZ.js

@@ -12,8 +12,8 @@ $.fn.bootstrapTable.locales['cs-CZ'] = {
     return `${pageNumber} položek na stránku`
     return `${pageNumber} položek na stránku`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Zobrazena ${pageFrom}. - ${pageTo} . položka z celkových ${totalRows} (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Zobrazena ${pageFrom}. - ${pageTo} . položka z celkových ${totalRows} (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Zobrazena ${pageFrom}. - ${pageTo} . položka z celkových ${totalRows}`
     return `Zobrazena ${pageFrom}. - ${pageTo} . položka z celkových ${totalRows}`

+ 2 - 2
src/locale/bootstrap-table-da-DK.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['da-DK'] = {
     return `${pageNumber} poster pr side`
     return `${pageNumber} poster pr side`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Viser ${pageFrom} til ${pageTo} af ${totalRows} række${(totalRows > 1) ? 'r' : ''} (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Viser ${pageFrom} til ${pageTo} af ${totalRows} række${(totalRows > 1) ? 'r' : ''} (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Viser ${pageFrom} til ${pageTo} af ${totalRows} række${(totalRows > 1) ? 'r' : ''}`
     return `Viser ${pageFrom} til ${pageTo} af ${totalRows} række${(totalRows > 1) ? 'r' : ''}`

+ 1 - 1
src/locale/bootstrap-table-de-DE.js

@@ -11,7 +11,7 @@ $.fn.bootstrapTable.locales['de-DE'] = {
     return `${pageNumber} Zeilen pro Seite.`
     return `${pageNumber} Zeilen pro Seite.`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
       return `Zeige Zeile ${pageFrom} bis ${pageTo} von ${totalRows} Zeile${(totalRows > 1) ? 'n' : ''} (Gefiltert von ${totalNotFiltered} Zeile${(totalNotFiltered > 1) ? 'n' : ''})`
       return `Zeige Zeile ${pageFrom} bis ${pageTo} von ${totalRows} Zeile${(totalRows > 1) ? 'n' : ''} (Gefiltert von ${totalNotFiltered} Zeile${(totalNotFiltered > 1) ? 'n' : ''})`
     }
     }
 
 

+ 2 - 2
src/locale/bootstrap-table-el-GR.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['el-GR'] = {
     return `${pageNumber} αποτελέσματα ανά σελίδα`
     return `${pageNumber} αποτελέσματα ανά σελίδα`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Εμφανίζονται από την ${pageFrom} ως την ${pageTo} από σύνολο ${totalRows} σειρών (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Εμφανίζονται από την ${pageFrom} ως την ${pageTo} από σύνολο ${totalRows} σειρών (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Εμφανίζονται από την ${pageFrom} ως την ${pageTo} από σύνολο ${totalRows} σειρών`
     return `Εμφανίζονται από την ${pageFrom} ως την ${pageTo} από σύνολο ${totalRows} σειρών`

+ 2 - 2
src/locale/bootstrap-table-en-US.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['en-US'] = {
     return `${pageNumber} rows per page`
     return `${pageNumber} rows per page`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Showing ${pageFrom} to ${pageTo} of ${totalRows} rows (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Showing ${pageFrom} to ${pageTo} of ${totalRows} rows (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Showing ${pageFrom} to ${pageTo} of ${totalRows} rows`
     return `Showing ${pageFrom} to ${pageTo} of ${totalRows} rows`

+ 2 - 2
src/locale/bootstrap-table-es-AR.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['es-AR'] = {
     return `${pageNumber} registros por página`
     return `${pageNumber} registros por página`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas`
     return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas`

+ 2 - 2
src/locale/bootstrap-table-es-CL.js

@@ -12,8 +12,8 @@ $.fn.bootstrapTable.locales['es-CL'] = {
     return `${pageNumber} filas por p\u00E1gina`
     return `${pageNumber} filas por p\u00E1gina`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas`
     return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas`

+ 2 - 2
src/locale/bootstrap-table-es-CR.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['es-CR'] = {
     return `${pageNumber} registros por página`
     return `${pageNumber} registros por página`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Mostrando de ${pageFrom} a ${pageTo} registros de ${totalRows} registros en total (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Mostrando de ${pageFrom} a ${pageTo} registros de ${totalRows} registros en total (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Mostrando de ${pageFrom} a ${pageTo} registros de ${totalRows} registros en total`
     return `Mostrando de ${pageFrom} a ${pageTo} registros de ${totalRows} registros en total`

+ 2 - 2
src/locale/bootstrap-table-es-ES.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['es-ES'] = {
     return `${pageNumber} resultados por página`
     return `${pageNumber} resultados por página`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Mostrando desde ${pageFrom} hasta ${pageTo} - En total ${totalRows} resultados (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Mostrando desde ${pageFrom} hasta ${pageTo} - En total ${totalRows} resultados (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Mostrando desde ${pageFrom} hasta ${pageTo} - En total ${totalRows} resultados`
     return `Mostrando desde ${pageFrom} hasta ${pageTo} - En total ${totalRows} resultados`

+ 2 - 2
src/locale/bootstrap-table-es-MX.js

@@ -13,8 +13,8 @@ $.fn.bootstrapTable.locales['es-MX'] = {
     return `${pageNumber} registros por página`
     return `${pageNumber} registros por página`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas`
     return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas`

+ 2 - 2
src/locale/bootstrap-table-es-NI.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['es-NI'] = {
     return `${pageNumber} registros por página`
     return `${pageNumber} registros por página`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Mostrando de ${pageFrom} a ${pageTo} registros de ${totalRows} registros en total (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Mostrando de ${pageFrom} a ${pageTo} registros de ${totalRows} registros en total (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Mostrando de ${pageFrom} a ${pageTo} registros de ${totalRows} registros en total`
     return `Mostrando de ${pageFrom} a ${pageTo} registros de ${totalRows} registros en total`

+ 2 - 2
src/locale/bootstrap-table-es-SP.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['es-SP'] = {
     return `${pageNumber} registros por p&#225;gina.`
     return `${pageNumber} registros por p&#225;gina.`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `${pageFrom} - ${pageTo} de ${totalRows} registros (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `${pageFrom} - ${pageTo} de ${totalRows} registros (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `${pageFrom} - ${pageTo} de ${totalRows} registros.`
     return `${pageFrom} - ${pageTo} de ${totalRows} registros.`

+ 2 - 2
src/locale/bootstrap-table-et-EE.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['et-EE'] = {
     return `${pageNumber} rida lehe kohta`
     return `${pageNumber} rida lehe kohta`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Näitan tulemusi ${pageFrom} kuni ${pageTo} - kokku ${totalRows} tulemust (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Näitan tulemusi ${pageFrom} kuni ${pageTo} - kokku ${totalRows} tulemust (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Näitan tulemusi ${pageFrom} kuni ${pageTo} - kokku ${totalRows} tulemust`
     return `Näitan tulemusi ${pageFrom} kuni ${pageTo} - kokku ${totalRows} tulemust`

+ 2 - 2
src/locale/bootstrap-table-eu-EU.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['eu-EU'] = {
     return `${pageNumber} emaitza orriko.`
     return `${pageNumber} emaitza orriko.`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `${totalRows} erregistroetatik ${pageFrom}etik ${pageTo}erakoak erakusten (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `${totalRows} erregistroetatik ${pageFrom}etik ${pageTo}erakoak erakusten (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `${totalRows} erregistroetatik ${pageFrom}etik ${pageTo}erakoak erakusten.`
     return `${totalRows} erregistroetatik ${pageFrom}etik ${pageTo}erakoak erakusten.`

+ 2 - 2
src/locale/bootstrap-table-fa-IR.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['fa-IR'] = {
     return `${pageNumber} رکورد در صفحه`
     return `${pageNumber} رکورد در صفحه`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `نمایش ${pageFrom} تا ${pageTo} از ${totalRows} ردیف (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `نمایش ${pageFrom} تا ${pageTo} از ${totalRows} ردیف (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `نمایش ${pageFrom} تا ${pageTo} از ${totalRows} ردیف`
     return `نمایش ${pageFrom} تا ${pageTo} از ${totalRows} ردیف`

+ 2 - 2
src/locale/bootstrap-table-fi-FI.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['fi-FI'] = {
     return `${pageNumber} riviä sivulla`
     return `${pageNumber} riviä sivulla`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Näytetään rivit ${pageFrom} - ${pageTo} / ${totalRows} (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Näytetään rivit ${pageFrom} - ${pageTo} / ${totalRows} (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Näytetään rivit ${pageFrom} - ${pageTo} / ${totalRows}`
     return `Näytetään rivit ${pageFrom} - ${pageTo} / ${totalRows}`

+ 2 - 2
src/locale/bootstrap-table-fr-BE.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['fr-BE'] = {
     return `${pageNumber} entrées par page`
     return `${pageNumber} entrées par page`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Affiche de${pageFrom} à ${pageTo} sur ${totalRows} lignes (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Affiche de${pageFrom} à ${pageTo} sur ${totalRows} lignes (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Affiche de${pageFrom} à ${pageTo} sur ${totalRows} lignes`
     return `Affiche de${pageFrom} à ${pageTo} sur ${totalRows} lignes`

+ 2 - 2
src/locale/bootstrap-table-fr-FR.js

@@ -12,8 +12,8 @@ $.fn.bootstrapTable.locales['fr-FR'] = {
     return `${pageNumber} lignes par page`
     return `${pageNumber} lignes par page`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Affichage des lignes ${pageFrom} à ${pageTo} sur ${totalRows} lignes au total (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Affichage des lignes ${pageFrom} à ${pageTo} sur ${totalRows} lignes au total (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Affichage des lignes ${pageFrom} à ${pageTo} sur ${totalRows} lignes au total`
     return `Affichage des lignes ${pageFrom} à ${pageTo} sur ${totalRows} lignes au total`

+ 2 - 2
src/locale/bootstrap-table-he-IL.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['he-IL'] = {
     return `${pageNumber} שורות בעמוד`
     return `${pageNumber} שורות בעמוד`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `מציג ${pageFrom} עד ${pageTo} מ-${totalRows}שורות${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `מציג ${pageFrom} עד ${pageTo} מ-${totalRows}שורות${totalNotFiltered} total rows)`
     }
     }
 
 
     return `מציג ${pageFrom} עד ${pageTo} מ-${totalRows} שורות`
     return `מציג ${pageFrom} עד ${pageTo} מ-${totalRows} שורות`

+ 2 - 2
src/locale/bootstrap-table-hr-HR.js

@@ -12,8 +12,8 @@ $.fn.bootstrapTable.locales['hr-HR'] = {
     return `${pageNumber} broj zapisa po stranici`
     return `${pageNumber} broj zapisa po stranici`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Prikazujem ${pageFrom}. - ${pageTo}. od ukupnog broja zapisa ${totalRows} (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Prikazujem ${pageFrom}. - ${pageTo}. od ukupnog broja zapisa ${totalRows} (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Prikazujem ${pageFrom}. - ${pageTo}. od ukupnog broja zapisa ${totalRows}`
     return `Prikazujem ${pageFrom}. - ${pageTo}. od ukupnog broja zapisa ${totalRows}`

+ 2 - 2
src/locale/bootstrap-table-hu-HU.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['hu-HU'] = {
     return `${pageNumber} rekord per oldal`
     return `${pageNumber} rekord per oldal`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Megjelenítve ${pageFrom} - ${pageTo} / ${totalRows} összesen (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Megjelenítve ${pageFrom} - ${pageTo} / ${totalRows} összesen (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Megjelenítve ${pageFrom} - ${pageTo} / ${totalRows} összesen`
     return `Megjelenítve ${pageFrom} - ${pageTo} / ${totalRows} összesen`

+ 2 - 2
src/locale/bootstrap-table-id-ID.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['id-ID'] = {
     return `${pageNumber} baris per halaman`
     return `${pageNumber} baris per halaman`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Menampilkan ${pageFrom} sampai ${pageTo} dari ${totalRows} baris (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Menampilkan ${pageFrom} sampai ${pageTo} dari ${totalRows} baris (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Menampilkan ${pageFrom} sampai ${pageTo} dari ${totalRows} baris`
     return `Menampilkan ${pageFrom} sampai ${pageTo} dari ${totalRows} baris`

+ 2 - 2
src/locale/bootstrap-table-it-IT.js

@@ -13,8 +13,8 @@ $.fn.bootstrapTable.locales['it-IT'] = {
     return `${pageNumber} elementi per pagina`
     return `${pageNumber} elementi per pagina`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Visualizzazione da ${pageFrom} a ${pageTo} di ${totalRows} elementi (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Visualizzazione da ${pageFrom} a ${pageTo} di ${totalRows} elementi (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Visualizzazione da ${pageFrom} a ${pageTo} di ${totalRows} elementi`
     return `Visualizzazione da ${pageFrom} a ${pageTo} di ${totalRows} elementi`

+ 2 - 2
src/locale/bootstrap-table-ja-JP.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['ja-JP'] = {
     return `ページ当たり最大${pageNumber}件`
     return `ページ当たり最大${pageNumber}件`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `全${totalRows}件から、${pageFrom}から${pageTo}件目まで表示しています (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `全${totalRows}件から、${pageFrom}から${pageTo}件目まで表示しています (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `全${totalRows}件から、${pageFrom}から${pageTo}件目まで表示しています`
     return `全${totalRows}件から、${pageFrom}から${pageTo}件目まで表示しています`

+ 2 - 2
src/locale/bootstrap-table-ka-GE.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['ka-GE'] = {
     return `${pageNumber} ჩანაწერი თითო გვერდზე`
     return `${pageNumber} ჩანაწერი თითო გვერდზე`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `ნაჩვენებია ${pageFrom}-დან ${pageTo}-მდე ჩანაწერი ჯამური ${totalRows}-დან (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `ნაჩვენებია ${pageFrom}-დან ${pageTo}-მდე ჩანაწერი ჯამური ${totalRows}-დან (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `ნაჩვენებია ${pageFrom}-დან ${pageTo}-მდე ჩანაწერი ჯამური ${totalRows}-დან`
     return `ნაჩვენებია ${pageFrom}-დან ${pageTo}-მდე ჩანაწერი ჯამური ${totalRows}-დან`

+ 2 - 2
src/locale/bootstrap-table-ko-KR.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['ko-KR'] = {
     return `페이지 당 ${pageNumber}개 데이터 출력`
     return `페이지 당 ${pageNumber}개 데이터 출력`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `전체 ${totalRows}개 중 ${pageFrom}~${pageTo}번째 데이터 출력, (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `전체 ${totalRows}개 중 ${pageFrom}~${pageTo}번째 데이터 출력, (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `전체 ${totalRows}개 중 ${pageFrom}~${pageTo}번째 데이터 출력,`
     return `전체 ${totalRows}개 중 ${pageFrom}~${pageTo}번째 데이터 출력,`

+ 2 - 2
src/locale/bootstrap-table-ms-MY.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['ms-MY'] = {
     return `${pageNumber} rekod setiap muka surat`
     return `${pageNumber} rekod setiap muka surat`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Sedang memaparkan rekod ${pageFrom} hingga ${pageTo} daripada jumlah ${totalRows} rekod (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Sedang memaparkan rekod ${pageFrom} hingga ${pageTo} daripada jumlah ${totalRows} rekod (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Sedang memaparkan rekod ${pageFrom} hingga ${pageTo} daripada jumlah ${totalRows} rekod`
     return `Sedang memaparkan rekod ${pageFrom} hingga ${pageTo} daripada jumlah ${totalRows} rekod`

+ 2 - 2
src/locale/bootstrap-table-nb-NO.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['nb-NO'] = {
     return `${pageNumber} poster pr side`
     return `${pageNumber} poster pr side`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Viser ${pageFrom} til ${pageTo} av ${totalRows} rekker (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Viser ${pageFrom} til ${pageTo} av ${totalRows} rekker (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Viser ${pageFrom} til ${pageTo} av ${totalRows} rekker`
     return `Viser ${pageFrom} til ${pageTo} av ${totalRows} rekker`

+ 2 - 2
src/locale/bootstrap-table-nl-NL.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['nl-NL'] = {
     return `${pageNumber} records per pagina`
     return `${pageNumber} records per pagina`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Toon ${pageFrom} tot ${pageTo} van ${totalRows} record${(totalRows > 1) ? 's' : ''} (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Toon ${pageFrom} tot ${pageTo} van ${totalRows} record${(totalRows > 1) ? 's' : ''} (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Toon ${pageFrom} tot ${pageTo} van ${totalRows} record${(totalRows > 1) ? 's' : ''}`
     return `Toon ${pageFrom} tot ${pageTo} van ${totalRows} record${(totalRows > 1) ? 's' : ''}`

+ 2 - 2
src/locale/bootstrap-table-pl-PL.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['pl-PL'] = {
     return `${pageNumber} rekordów na stronę`
     return `${pageNumber} rekordów na stronę`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Wyświetlanie rekordów od ${pageFrom} do ${pageTo} z ${totalRows} (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Wyświetlanie rekordów od ${pageFrom} do ${pageTo} z ${totalRows} (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Wyświetlanie rekordów od ${pageFrom} do ${pageTo} z ${totalRows}`
     return `Wyświetlanie rekordów od ${pageFrom} do ${pageTo} z ${totalRows}`

+ 2 - 2
src/locale/bootstrap-table-pt-BR.js

@@ -12,8 +12,8 @@ $.fn.bootstrapTable.locales['pt-BR'] = {
     return `${pageNumber} registros por página`
     return `${pageNumber} registros por página`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Exibindo ${pageFrom} até ${pageTo} de ${totalRows} linhas (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Exibindo ${pageFrom} até ${pageTo} de ${totalRows} linhas (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Exibindo ${pageFrom} até ${pageTo} de ${totalRows} linhas`
     return `Exibindo ${pageFrom} até ${pageTo} de ${totalRows} linhas`

+ 2 - 2
src/locale/bootstrap-table-pt-PT.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['pt-PT'] = {
     return `${pageNumber} registos por p&aacute;gina`
     return `${pageNumber} registos por p&aacute;gina`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `A mostrar ${pageFrom} at&eacute; ${pageTo} de ${totalRows} linhas (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `A mostrar ${pageFrom} at&eacute; ${pageTo} de ${totalRows} linhas (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `A mostrar ${pageFrom} at&eacute; ${pageTo} de ${totalRows} linhas`
     return `A mostrar ${pageFrom} at&eacute; ${pageTo} de ${totalRows} linhas`

+ 2 - 2
src/locale/bootstrap-table-ro-RO.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['ro-RO'] = {
     return `${pageNumber} inregistrari pe pagina`
     return `${pageNumber} inregistrari pe pagina`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Arata de la ${pageFrom} pana la ${pageTo} din ${totalRows} randuri (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Arata de la ${pageFrom} pana la ${pageTo} din ${totalRows} randuri (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Arata de la ${pageFrom} pana la ${pageTo} din ${totalRows} randuri`
     return `Arata de la ${pageFrom} pana la ${pageTo} din ${totalRows} randuri`

+ 2 - 2
src/locale/bootstrap-table-ru-RU.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['ru-RU'] = {
     return `${pageNumber} записей на страницу`
     return `${pageNumber} записей на страницу`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Записи с ${pageFrom} по ${pageTo} из ${totalRows} (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Записи с ${pageFrom} по ${pageTo} из ${totalRows} (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Записи с ${pageFrom} по ${pageTo} из ${totalRows}`
     return `Записи с ${pageFrom} по ${pageTo} из ${totalRows}`

+ 2 - 2
src/locale/bootstrap-table-sk-SK.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['sk-SK'] = {
     return `${pageNumber} záznamov na stranu`
     return `${pageNumber} záznamov na stranu`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Zobrazená ${pageFrom}. - ${pageTo}. položka z celkových ${totalRows} (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Zobrazená ${pageFrom}. - ${pageTo}. položka z celkových ${totalRows} (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Zobrazená ${pageFrom}. - ${pageTo}. položka z celkových ${totalRows}`
     return `Zobrazená ${pageFrom}. - ${pageTo}. položka z celkových ${totalRows}`

+ 2 - 2
src/locale/bootstrap-table-sv-SE.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['sv-SE'] = {
     return `${pageNumber} rader per sida`
     return `${pageNumber} rader per sida`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Visa ${pageFrom} till ${pageTo} av ${totalRows} rader (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Visa ${pageFrom} till ${pageTo} av ${totalRows} rader (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Visa ${pageFrom} till ${pageTo} av ${totalRows} rader`
     return `Visa ${pageFrom} till ${pageTo} av ${totalRows} rader`

+ 2 - 2
src/locale/bootstrap-table-th-TH.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['th-TH'] = {
     return `${pageNumber} รายการต่อหน้า`
     return `${pageNumber} รายการต่อหน้า`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `รายการที่ ${pageFrom} ถึง ${pageTo} จากทั้งหมด ${totalRows} รายการ (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `รายการที่ ${pageFrom} ถึง ${pageTo} จากทั้งหมด ${totalRows} รายการ (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `รายการที่ ${pageFrom} ถึง ${pageTo} จากทั้งหมด ${totalRows} รายการ`
     return `รายการที่ ${pageFrom} ถึง ${pageTo} จากทั้งหมด ${totalRows} รายการ`

+ 2 - 2
src/locale/bootstrap-table-tr-TR.js

@@ -12,8 +12,8 @@ $.fn.bootstrapTable.locales['tr-TR'] = {
     return `Sayfa başına ${pageNumber} kayıt.`
     return `Sayfa başına ${pageNumber} kayıt.`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `${totalRows} kayıttan ${pageFrom}-${pageTo} arası gösteriliyor (filtered from ${totalNotFiltered} total entries).`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `${totalRows} kayıttan ${pageFrom}-${pageTo} arası gösteriliyor (filtered from ${totalNotFiltered} total rows).`
     }
     }
 
 
     return `${totalRows} kayıttan ${pageFrom}-${pageTo} arası gösteriliyor.`
     return `${totalRows} kayıttan ${pageFrom}-${pageTo} arası gösteriliyor.`

+ 2 - 2
src/locale/bootstrap-table-uk-UA.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['uk-UA'] = {
     return `${pageNumber} записів на сторінку`
     return `${pageNumber} записів на сторінку`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Показано з ${pageFrom} по ${pageTo}. Всього: ${totalRows} (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Показано з ${pageFrom} по ${pageTo}. Всього: ${totalRows} (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Показано з ${pageFrom} по ${pageTo}. Всього: ${totalRows}`
     return `Показано з ${pageFrom} по ${pageTo}. Всього: ${totalRows}`

+ 2 - 2
src/locale/bootstrap-table-ur-PK.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['ur-PK'] = {
     return `${pageNumber} ریکارڈز فی صفہ `
     return `${pageNumber} ریکارڈز فی صفہ `
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `دیکھیں ${pageFrom} سے ${pageTo} کے ${totalRows}ریکارڈز (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `دیکھیں ${pageFrom} سے ${pageTo} کے ${totalRows}ریکارڈز (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `دیکھیں ${pageFrom} سے ${pageTo} کے ${totalRows}ریکارڈز`
     return `دیکھیں ${pageFrom} سے ${pageTo} کے ${totalRows}ریکارڈز`

+ 2 - 2
src/locale/bootstrap-table-uz-Latn-UZ.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['uz-Latn-UZ'] = {
     return `${pageNumber} qator har sahifada`
     return `${pageNumber} qator har sahifada`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Ko'rsatypati ${pageFrom} dan ${pageTo} gacha ${totalRows} qatorlarni (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Ko'rsatypati ${pageFrom} dan ${pageTo} gacha ${totalRows} qatorlarni (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Ko'rsatypati ${pageFrom} dan ${pageTo} gacha ${totalRows} qatorlarni`
     return `Ko'rsatypati ${pageFrom} dan ${pageTo} gacha ${totalRows} qatorlarni`

+ 2 - 2
src/locale/bootstrap-table-vi-VN.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['vi-VN'] = {
     return `${pageNumber} bản ghi mỗi trang`
     return `${pageNumber} bản ghi mỗi trang`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `Hiển thị từ trang ${pageFrom} đến ${pageTo} của ${totalRows} bảng ghi (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Hiển thị từ trang ${pageFrom} đến ${pageTo} của ${totalRows} bảng ghi (filtered from ${totalNotFiltered} total rows)`
     }
     }
 
 
     return `Hiển thị từ trang ${pageFrom} đến ${pageTo} của ${totalRows} bảng ghi`
     return `Hiển thị từ trang ${pageFrom} đến ${pageTo} của ${totalRows} bảng ghi`

+ 2 - 2
src/locale/bootstrap-table-zh-CN.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['zh-CN'] = {
     return `每页显示 ${pageNumber} 条记录`
     return `每页显示 ${pageNumber} 条记录`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `显示第 ${pageFrom} 到第 ${pageTo} 条记录,总共 ${totalRows} 条记录 (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `显示第 ${pageFrom} 到第 ${pageTo} 条记录,总共 ${totalRows} 条记录(从 ${totalNotFiltered} 总记录中过滤)`
     }
     }
 
 
     return `显示第 ${pageFrom} 到第 ${pageTo} 条记录,总共 ${totalRows} 条记录`
     return `显示第 ${pageFrom} 到第 ${pageTo} 条记录,总共 ${totalRows} 条记录`

+ 2 - 2
src/locale/bootstrap-table-zh-TW.js

@@ -11,8 +11,8 @@ $.fn.bootstrapTable.locales['zh-TW'] = {
     return `每頁顯示 ${pageNumber} 項記錄`
     return `每頁顯示 ${pageNumber} 項記錄`
   },
   },
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
   formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
-    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
-      return `顯示第 ${pageFrom} 到第 ${pageTo} 項記錄,總共 ${totalRows} 項記錄 (filtered from ${totalNotFiltered} total entries)`
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `顯示第 ${pageFrom} 到第 ${pageTo} 項記錄,總共 ${totalRows} 項記錄(從 ${totalNotFiltered} 總記錄中過濾)`
     }
     }
 
 
     return `顯示第 ${pageFrom} 到第 ${pageTo} 項記錄,總共 ${totalRows} 項記錄`
     return `顯示第 ${pageFrom} 到第 ${pageTo} 項記錄,總共 ${totalRows} 項記錄`