feat: Hardcoded english in DataTable quasarframework#284

tant42 · Dec 28, 2016 · 60f8cd6 · 60f8cd6
1 parent 7dce8cc
commit 60f8cd6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/dev/components/components/data-table.vue b/dev/components/components/data-table.vue
@@ -170,9 +170,9 @@ export default {
           noDataAfterFiltering: '<i>warning</i> No results. Please refine your search terms.'
         },
         labels: {
-          columns: 'Coloane',
-          allFields: 'Toate campurile',
-          rows: 'Randuri'
+          columns: 'Coluuuuumns',
+          allCols: 'Eeeeeeeeevery Cols',
+          rows: 'Rooows'
         }
       },
       columns: [

diff --git a/src/vue-components/data-table/data-table.ios.styl b/src/vue-components/data-table/data-table.ios.styl
@@ -33,7 +33,7 @@
   > div:not(:first-of-type):not(:last-of-type)
     margin 0 30px
   .q-search
-    min-width 250px
+    width auto
     margin 0 15px 0 0
   @media (max-width $layout-small-max)
     flex-wrap wrap-reverse

diff --git a/src/vue-components/data-table/data-table.mat.styl b/src/vue-components/data-table/data-table.mat.styl
@@ -36,7 +36,7 @@
     &, &:hover
       border-bottom transparent
   .q-search
-    min-width 250px
+    width auto
     margin 0 15px 0 0
   @media (max-width $layout-small-max)
     flex-wrap wrap-reverse

diff --git a/src/vue-components/data-table/plugins/filter/TableFilter.vue b/src/vue-components/data-table/plugins/filter/TableFilter.vue
@@ -22,7 +22,7 @@ export default {
         }
       })
 
-      return [{label: this.labels.allFields, value: ''}].concat(cols)
+      return [{label: this.labels.allCols, value: ''}].concat(cols)
     }
   }
 }

diff --git a/src/vue-components/data-table/plugins/i18n/i18n.js b/src/vue-components/data-table/plugins/i18n/i18n.js
@@ -1,12 +1,17 @@
+import Utils from '../../../../utils'
+const labels = {
+  columns: 'Columns',
+  allCols: 'All Columns',
+  rows: 'Rows'
+}
+
 export default {
   computed: {
     labels () {
-      const labels = this.config && this.config.labels ? this.config.labels : {}
-      return {
-        columns: labels.columns || 'Columns',
-        allFields: labels.allFields || 'All Fields',
-        rows: labels.rows || 'Rows'
+      if (this.config && this.config.labels) {
+        return Utils.extend({}, labels, this.config.labels)
       }
+      return labels
     },
     message () {
       if (this.rows.length) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ export default { @@
             }
           })
-          return [{label: this.labels.allFields, value: ''}].concat(cols)
+          return [{label: this.labels.allCols, value: ''}].concat(cols)
         }
       }
     }
@@ Expand Down @@