Further i18n work

rstoenescu · rstoenescu · commit bbb680757b40 · 2017-11-29T20:47:35.000+02:00
diff --git a/dev/App.vue b/dev/App.vue
@@ -10,7 +10,8 @@
     >
       <q-select
         :options="[
-          { label: 'English', value: 'en' }
+          { label: 'English (US)', value: 'en-us' }
+          ,{ label: 'English (UK)', value: 'en-uk' }
           ,{ label: 'Romanian', value: 'ro' }
           ,{ label: 'Italian', value: 'it' }
           //,{ label: 'Spanish', value: 'es' },
@@ -27,7 +28,7 @@
 export default {
   data () {
     return {
-      lang: 'en'
+      lang: 'en-us'
     }
   },
   watch: {
diff --git a/i18n/en-uk.js b/i18n/en-uk.js
@@ -6,6 +6,7 @@ export default {
     close: 'Close',
     set: 'Set',
     select: 'Select',
+    reset: 'Reset',
     remove: 'Remove',
     update: 'Update',
     create: 'Create',
@@ -17,7 +18,9 @@ export default {
     days: 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
     daysShort: 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
     months: 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-    monthsShort: 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_')
+    monthsShort: 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+    firstDayOfWeek: 1, // 0-6, 0 - Sunday, 1 Monday, ...
+    format24h: true
   },
   pullToRefresh: {
     pull: 'Pull down to refresh',
@@ -56,6 +59,9 @@ export default {
     outdent: 'Decrease indentation',
     indent: 'Increase indentation',
     removeFormat: 'Remove formatting',
+    formatting: 'Formatting',
+    fontSize: 'Font Size',
+    align: 'Align',
     hr: 'Insert Horizontal Rule',
     undo: 'Undo',
     redo: 'Redo',
diff --git a/i18n/en-us.js b/i18n/en-us.js
@@ -0,0 +1,85 @@
+export default {
+  label: {
+    clear: 'Clear',
+    ok: 'OK',
+    cancel: 'Cancel',
+    close: 'Close',
+    set: 'Set',
+    select: 'Select',
+    reset: 'Reset',
+    remove: 'Remove',
+    update: 'Update',
+    create: 'Create',
+    search: 'Search',
+    filter: 'Filter',
+    refresh: 'Refresh'
+  },
+  date: {
+    days: 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+    daysShort: 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+    months: 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+    monthsShort: 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+    firstDayOfWeek: 0, // 0-6, 0 - Sunday, 1 Monday, ...
+    format24h: false
+  },
+  pullToRefresh: {
+    pull: 'Pull down to refresh',
+    release: 'Release to refresh',
+    refresh: 'Refreshing...'
+  },
+  table: {
+    noData: 'No data available',
+    noResults: 'No matching records found',
+    loader: 'Loading...',
+    selectedRows: rows => rows > 1 ? `${rows} selected row(s).` : `${rows === 0 ? 'No' : '1'} selected rows.`,
+    rowsPerPage: 'Rows per page:',
+    allRows: 'All',
+    pagination: (start, end, total) => `${start}-${end} of ${total}`,
+    columns: 'Columns'
+  },
+  editor: {
+    link: 'Link',
+    url: 'URL',
+    bold: 'Bold',
+    italic: 'Italic',
+    strikethrough: 'Strikethrough',
+    underline: 'Underline',
+    unorderedList: 'Unordered List',
+    orderedList: 'Ordered List',
+    subscript: 'Subscript',
+    superscript: 'Superscript',
+    hyperlink: 'Hyperlink',
+    toggleFullscreen: 'Toggle Fullscreen',
+    quote: 'Quote',
+    left: 'Left align',
+    center: 'Center align',
+    right: 'Right align',
+    justify: 'Justify align',
+    print: 'Print',
+    outdent: 'Decrease indentation',
+    indent: 'Increase indentation',
+    removeFormat: 'Remove formatting',
+    formatting: 'Formatting',
+    fontSize: 'Font Size',
+    align: 'Align',
+    hr: 'Insert Horizontal Rule',
+    undo: 'Undo',
+    redo: 'Redo',
+    header1: 'Header 1',
+    header2: 'Header 2',
+    header3: 'Header 3',
+    header4: 'Header 4',
+    header5: 'Header 5',
+    header6: 'Header 6',
+    paragraph: 'Paragraph',
+    code: 'Code',
+    size1: 'Very small',
+    size2: 'A bit small',
+    size3: 'Normal',
+    size4: 'Medium-large',
+    size5: 'Big',
+    size6: 'Very big',
+    size7: 'Maximum',
+    defaultFont: 'Default Font'
+  }
+}
diff --git a/i18n/it.js b/i18n/it.js
@@ -6,6 +6,7 @@ export default {
     close: 'Chiudi',
     set: 'Imposta',
     select: 'Seleziona',
+    reset: 'Risistemare',
     remove: 'Rimuovi',
     update: 'Aggiorna',
     create: 'Crea',
@@ -17,7 +18,9 @@ export default {
     days: 'Domenica_Lunedì_Martedì_Mercoledì_Giovedì_Venerdì_Sabato'.split('_'),
     daysShort: 'Dom_Lun_Mar_Mer_Gio_Ven_Sab'.split('_'),
     months: 'Gennaio_Febbraio_Marzo_Aprile_Maggio_Giugno_Luglio_Agosto_Settembre_Ottobre_Novembre_Dicembre'.split('_'),
-    monthsShort: 'Gen_Feb_Mar_Apr_Mag_Giu_Lug_Ago_Set_Ott_Nov_Dic'.split('_')
+    monthsShort: 'Gen_Feb_Mar_Apr_Mag_Giu_Lug_Ago_Set_Ott_Nov_Dic'.split('_'),
+    firstDayOfWeek: 1, // 0-6, 0 - Sunday, 1 Monday, ...
+    format24h: true
   },
   pullToRefresh: {
     pull: 'Tira giù per aggiornare',
@@ -56,6 +59,9 @@ export default {
     outdent: 'Diminuisci identazione',
     indent: 'Aumenta identazione',
     removeFormat: 'Rimuovi formattazione',
+    formatting: 'Formatazzione',
+    fontSize: 'Dimensione del font',
+    align: 'Allineare',
     hr: 'Inserisci righello orizzontale',
     undo: 'Indietro',
     redo: 'Avanti',
diff --git a/i18n/ro.js b/i18n/ro.js
@@ -18,7 +18,9 @@ export default {
     days: 'Duminică_Luni_Marți_Miercuri_Joi_Vineri_Sâmbătă'.split('_'),
     daysShort: 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),
     months: 'Ianuarie_Februarie_Martie_Aprilie_Mai_Iunie_Iulie_August_Septembrie_Octombrie_Noiembrie_Decembrie'.split('_'),
-    monthsShort: 'Ian_Feb_Mar_Apr_Mai_Iun_Iul_Aug_Sep_Oct_Nov_Dec'.split('_')
+    monthsShort: 'Ian_Feb_Mar_Apr_Mai_Iun_Iul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+    firstDayOfWeek: 1, // 0-6, 0 - Sunday, 1 Monday, ...
+    format24h: true
   },
   pullToRefresh: {
     pull: 'Trage în jos pentru actualizare',
@@ -29,7 +31,7 @@ export default {
     noData: 'Nu sunt date disponibile',
     noResults: 'Nu am găsit înregistrări care să corespundă',
     loader: 'Se încarcă...',
-    selectedRows: rows => `${rows} rânduri selectate.`,
+    selectedRows: rows => rows > 1 ? `${rows} rânduri selectate.` : `${rows === 0 ? 'Nici un' : '1'} rând selectat.`,
     rowsPerPage: 'Rânduri pe pagină:',
     allRows: 'Toate',
     pagination: (start, end, total) => `${start}-${end} din ${total}`,
@@ -57,6 +59,9 @@ export default {
     outdent: 'Decrease indentation',
     indent: 'Increase indentation',
     removeFormat: 'Remove formatting',
+    formatting: 'Formatare',
+    fontSize: 'Marime font',
+    align: 'Aliniază',
     hr: 'Insert Horizontal Rule',
     undo: 'Undo',
     redo: 'Redo',
diff --git a/src/components/datetime/QDatetime.vue b/src/components/datetime/QDatetime.vue
@@ -42,8 +42,7 @@
         :min="min"
         :max="max"
         :format24h="format24h"
-        :monday-first="mondayFirst"
-        :saturday-first="saturdayFirst"
+        :first-day-of-week="firstDayOfWeek"
         :month-names="$q.i18n.date.months"
         :day-names="$q.i18n.date.days"
         :color="color"
@@ -77,8 +76,7 @@
         :min="min"
         :max="max"
         :format24h="format24h"
-        :monday-first="mondayFirst"
-        :saturday-first="saturdayFirst"
+        :first-day-of-week="firstDayOfWeek"
         :month-names="$q.i18n.date.months"
         :day-names="$q.i18n.date.days"
         :color="color"
diff --git a/src/components/datetime/QDatetimeRange.vue b/src/components/datetime/QDatetimeRange.vue
@@ -23,8 +23,7 @@
       :color="color"
       :align="align"
       :format24h="format24h"
-      :monday-first="mondayFirst"
-      :saturday-first="saturdayFirst"
+      :first-day-of-week="firstDayOfWeek"
       class="col q-datetime-range-left"
       :class="className"
       :style="css"
@@ -54,8 +53,7 @@
       :color="color"
       :align="align"
       :format24h="format24h"
-      :monday-first="mondayFirst"
-      :saturday-first="saturdayFirst"
+      :first-day-of-week="firstDayOfWeek"
       class="col q-datetime-range-right"
       :class="className"
       :style="css"
diff --git a/src/components/datetime/QInlineDatetime.mat.vue b/src/components/datetime/QInlineDatetime.mat.vue
@@ -48,7 +48,7 @@
             {{ __pad(minute) }}
           </span>
         </div>
-        <div v-if="!format24h" class="q-datetime-ampm column col-auto col-md-12 justify-around">
+        <div v-if="!computedFormat24h" class="q-datetime-ampm column col-auto col-md-12 justify-around">
           <div
             :class="{active: am}"
             class="q-datetime-link"
@@ -168,7 +168,7 @@
               <div class="q-datetime-clock-pointer" :style="clockPointerStyle">
                 <span></span>
               </div>
-              <div v-if="format24h">
+              <div v-if="computedFormat24h">
                 <div
                   v-for="n in 24"
                   class="q-datetime-clock-position fmt24"
@@ -300,15 +300,20 @@ export default {
       }
       return cls
     },
-    firstDayOfWeek () {
-      return this.mondayFirst
-        ? 1
-        : (this.saturdayFirst ? 6 : 0)
+    computedFormat24h () {
+      return this.format24h !== void 0
+        ? this.format24h
+        : this.$q.i18n.date.format24h
+    },
+    computedFirstDayOfWeek () {
+      return this.firstDayOfWeek !== void 0
+        ? this.firstDayOfWeek
+        : this.$q.i18n.date.firstDayOfWeek
     },
     headerDayNames () {
       const
         days = this.$q.i18n.date.daysShort,
-        first = this.firstDayOfWeek
+        first = this.computedFirstDayOfWeek
 
       return first > 0
         ? days.slice(first, 7).concat(days.slice(0, first))
@@ -326,7 +331,7 @@ export default {
     },
 
     fillerDays () {
-      let days = (new Date(this.model.getFullYear(), this.model.getMonth(), 1).getDay() - this.firstDayOfWeek)
+      let days = (new Date(this.model.getFullYear(), this.model.getMonth(), 1).getDay() - this.computedFirstDayOfWeek)
       if (days < 0) {
         days += 7
       }
@@ -360,7 +365,7 @@ export default {
 
     hour () {
       const h = this.model.getHours()
-      return this.format24h
+      return this.computedFormat24h
         ? h
         : convertToAmPm(h)
     },
@@ -372,7 +377,7 @@ export default {
     },
     clockPointerStyle () {
       let
-        divider = this.view === 'minute' ? 60 : (this.format24h ? 24 : 12),
+        divider = this.view === 'minute' ? 60 : (this.computedFormat24h ? 24 : 12),
         degrees = Math.round((this.view === 'minute' ? this.minute : this.hour) * (360 / divider)) - 180
 
       return cssTransform(`rotate(${degrees}deg)`)
@@ -411,7 +416,7 @@ export default {
 
       value = this.__parseTypeValue('hour', value)
 
-      if (!this.format24h && value < 12 && !this.am) {
+      if (!this.computedFormat24h && value < 12 && !this.am) {
         value += 12
       }
 
@@ -477,7 +482,7 @@ export default {
       }
 
       if (this.view === 'hour') {
-        this.setHour(Math.round(angle / (this.format24h ? 15 : 30)))
+        this.setHour(Math.round(angle / (this.computedFormat24h ? 15 : 30)))
       }
       else {
         this.setMinute(Math.round(angle / 6))
diff --git a/src/components/datetime/datetime-props.js b/src/components/datetime/datetime-props.js
@@ -33,8 +33,7 @@ export const inline = {
     validator: modelValidator,
     default: null
   },
-  mondayFirst: Boolean,
-  saturdayFirst: Boolean,
+  firstDayOfWeek: Number,
   format24h: Boolean
 }
 
diff --git a/src/components/editor/QEditor.js b/src/components/editor/QEditor.js
@@ -1,6 +1,5 @@
 import { getEventKey } from '../../utils/event'
 import { getToolbar, getFonts } from './editor-utils'
-import { buttons } from './editor-definitions'
 import { Caret } from './editor-caret'
 import extend from '../../utils/extend'
 import FullscreenMixin from '../../mixins/fullscreen'
@@ -64,10 +63,57 @@ export default {
         compact: true
       }
     },
+    buttonDef () {
+      const e = this.$q.i18n.editor
+
+      return {
+        bold: {cmd: 'bold', icon: 'format_bold', tip: e.bold, key: 66},
+        italic: {cmd: 'italic', icon: 'format_italic', tip: e.italic, key: 73},
+        strike: {cmd: 'strikeThrough', icon: 'strikethrough_s', tip: e.strikethrough, key: 83},
+        underline: {cmd: 'underline', icon: 'format_underlined', tip: e.underline, key: 85},
+        unordered: {cmd: 'insertUnorderedList', icon: 'format_list_bulleted', tip: e.unorderedList},
+        ordered: {cmd: 'insertOrderedList', icon: 'format_list_numbered', tip: e.orderedList},
+        subscript: {cmd: 'subscript', icon: 'vertical_align_bottom', tip: e.subscript, htmlTip: 'x<subscript>2</subscript>'},
+        superscript: {cmd: 'superscript', icon: 'vertical_align_top', tip: e.superscript, htmlTip: 'x<superscript>2</superscript>'},
+        link: {cmd: 'link', icon: 'link', tip: e.hyperlink, key: 76},
+        fullscreen: {cmd: 'fullscreen', icon: 'fullscreen', tip: e.toggleFullscreen, key: 70},
+
+        quote: {cmd: 'formatBlock', param: 'BLOCKQUOTE', icon: 'format_quote', tip: e.quote, key: 81},
+        left: {cmd: 'justifyLeft', icon: 'format_align_left', tip: e.left},
+        center: {cmd: 'justifyCenter', icon: 'format_align_center', tip: e.center},
+        right: {cmd: 'justifyRight', icon: 'format_align_right', tip: e.right},
+        justify: {cmd: 'justifyFull', icon: 'format_align_justify', tip: e.justify},
+
+        print: {type: 'no-state', cmd: 'print', icon: 'print', tip: e.print, key: 80},
+        outdent: {type: 'no-state', disable: vm => vm.caret && !vm.caret.can('outdent'), cmd: 'outdent', icon: 'format_indent_decrease', tip: e.outdent},
+        indent: {type: 'no-state', disable: vm => vm.caret && !vm.caret.can('indent'), cmd: 'indent', icon: 'format_indent_increase', tip: e.indent},
+        removeFormat: {type: 'no-state', cmd: 'removeFormat', icon: 'format_clear', tip: e.removeFormat},
+        hr: {type: 'no-state', cmd: 'insertHorizontalRule', icon: 'remove', tip: e.hr},
+        undo: {type: 'no-state', cmd: 'undo', icon: 'undo', tip: e.undo, key: 90},
+        redo: {type: 'no-state', cmd: 'redo', icon: 'redo', tip: e.redo, key: 89},
+
+        h1: {cmd: 'formatBlock', param: 'H1', icon: 'format_size', tip: e.header1, htmlTip: `<h1>${e.header1}</h1>`},
+        h2: {cmd: 'formatBlock', param: 'H2', icon: 'format_size', tip: e.header2, htmlTip: `<h2>${e.header2}</h2>`},
+        h3: {cmd: 'formatBlock', param: 'H3', icon: 'format_size', tip: e.header3, htmlTip: `<h3>${e.header3}</h3>`},
+        h4: {cmd: 'formatBlock', param: 'H4', icon: 'format_size', tip: e.header4, htmlTip: `<h4>${e.header4}</h4>`},
+        h5: {cmd: 'formatBlock', param: 'H5', icon: 'format_size', tip: e.header5, htmlTip: `<h5>${e.header5}</h5>`},
+        h6: {cmd: 'formatBlock', param: 'H6', icon: 'format_size', tip: e.header6, htmlTip: `<h6>${e.header6}</h6>`},
+        p: {cmd: 'formatBlock', param: 'DIV', icon: 'format_size', tip: e.paragraph},
+        code: {cmd: 'formatBlock', param: 'PRE', icon: 'code', tip: `<code>${e.code}</code>`},
+
+        'size-1': {cmd: 'fontSize', param: '1', icon: 'filter_1', tip: e.size1, htmlTip: `<font size="1">${e.size1}</font>`},
+        'size-2': {cmd: 'fontSize', param: '2', icon: 'filter_2', tip: e.size2, htmlTip: `<font size="2">${e.size2}</font>`},
+        'size-3': {cmd: 'fontSize', param: '3', icon: 'filter_3', tip: e.size3, htmlTip: `<font size="3">${e.size3}</font>`},
+        'size-4': {cmd: 'fontSize', param: '4', icon: 'filter_4', tip: e.size4, htmlTip: `<font size="4">${e.size4}</font>`},
+        'size-5': {cmd: 'fontSize', param: '5', icon: 'filter_5', tip: e.size5, htmlTip: `<font size="5">${e.size5}</font>`},
+        'size-6': {cmd: 'fontSize', param: '6', icon: 'filter_6', tip: e.size6, htmlTip: `<font size="6">${e.size6}</font>`},
+        'size-7': {cmd: 'fontSize', param: '7', icon: 'filter_7', tip: e.size7, htmlTip: `<font size="7">${e.size7}</font>`}
+      }
+    },
     buttons () {
       let def = this.definitions || this.fonts
-        ? extend(true, {}, buttons, this.definitions || {}, getFonts(this.defaultFont, this.fonts))
-        : buttons
+        ? extend(true, {}, this.buttonDef, this.definitions || {}, getFonts(this.defaultFont, this.$q.i18n.editor.defaultFont, this.fonts))
+        : this.buttonDef
 
       return this.toolbar.map(
         group => group.map(token => {
diff --git a/src/components/editor/editor-definitions.js b/src/components/editor/editor-definitions.js
diff --git a/src/components/editor/editor-utils.js b/src/components/editor/editor-utils.js
diff --git a/src/i18n.js b/src/i18n.js

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,7 @@ export const inline = {`
`33`	`33`	`validator: modelValidator,`
`34`	`34`	`default: null`
`35`	`35`	`},`
`36`		`- mondayFirst: Boolean,`
`37`		`- saturdayFirst: Boolean,`
	`36`	`+ firstDayOfWeek: Number,`
`38`	`37`	`format24h: Boolean`
`39`	`38`	`}`
`40`	`39`