Browse Source

Merge pull request #5077 from wenzhixin/fix/tiny-bug

Fix/tiny bug
Dustin Utecht 5 years ago
parent
commit
b4715785b5
3 changed files with 16 additions and 17 deletions
  1. 1 1
      site/docs/api/column-options.md
  2. 0 1
      src/bootstrap-table.js
  3. 15 15
      src/locale/bootstrap-table-it-IT.js

+ 1 - 1
site/docs/api/column-options.md

@@ -327,7 +327,7 @@ The column options is defined in `jQuery.fn.bootstrapTable.columnDefaults`.
 
 - **Default:** `true`
 
-- **Example:** [Search Formatter](https://examples.bootstrap-table.com/#column-options/format-search.html)
+- **Example:** [Search Formatter](https://examples.bootstrap-table.com/#column-options/search-formatter.html)
 
 ## searchable
 

+ 0 - 1
src/bootstrap-table.js

@@ -2181,7 +2181,6 @@ class BootstrapTable {
         continue
       }
 
-      $.extend(this.options.data[params.index], params.row)
       if (params.hasOwnProperty('replace') && params.replace) {
         this.options.data[params.index] = params.row
       } else {

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

@@ -14,22 +14,22 @@ $.fn.bootstrapTable.locales['it-IT'] = {
   },
   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 rows)`
+      return `Visualizzazione da ${pageFrom} a ${pageTo} di ${totalRows} elementi (filtrati da ${totalNotFiltered} elementi totali)`
     }
 
     return `Visualizzazione da ${pageFrom} a ${pageTo} di ${totalRows} elementi`
   },
   formatSRPaginationPreText () {
-    return 'previous page'
+    return 'pagina precedente'
   },
   formatSRPaginationPageText (page) {
-    return `to page ${page}`
+    return `alla pagina ${page}`
   },
   formatSRPaginationNextText () {
-    return 'next page'
+    return 'pagina successiva'
   },
   formatDetailPagination (totalRows) {
-    return `Showing ${totalRows} rows`
+    return `Mostrando ${totalRows} elementi`
   },
   formatClearSearch () {
     return 'Pulisci filtri'
@@ -44,10 +44,10 @@ $.fn.bootstrapTable.locales['it-IT'] = {
     return 'Nascondi/Mostra paginazione'
   },
   formatPaginationSwitchDown () {
-    return 'Show pagination'
+    return 'Mostra paginazione'
   },
   formatPaginationSwitchUp () {
-    return 'Hide pagination'
+    return 'Nascondi paginazione'
   },
   formatRefresh () {
     return 'Aggiorna'
@@ -56,37 +56,37 @@ $.fn.bootstrapTable.locales['it-IT'] = {
     return 'Attiva/Disattiva'
   },
   formatToggleOn () {
-    return 'Show card view'
+    return 'Mostra visuale a scheda'
   },
   formatToggleOff () {
-    return 'Hide card view'
+    return 'Nascondi visuale a scheda'
   },
   formatColumns () {
     return 'Colonne'
   },
   formatColumnsToggleAll () {
-    return 'Toggle all'
+    return 'Mostra tutte'
   },
   formatFullscreen () {
-    return 'Fullscreen'
+    return 'Schermo intero'
   },
   formatAllRows () {
     return 'Tutto'
   },
   formatAutoRefresh () {
-    return 'Auto Refresh'
+    return 'Auto Aggiornamento'
   },
   formatExport () {
     return 'Esporta dati'
   },
   formatJumpTo () {
-    return 'GO'
+    return 'VAI'
   },
   formatAdvancedSearch () {
-    return 'Advanced search'
+    return 'Filtri avanzati'
   },
   formatAdvancedCloseButton () {
-    return 'Close'
+    return 'Chiudi'
   }
 
 }