feat(VDataFooter): added page-text prop (#8511)

* feat(VDataFooter): added page-text prop also fixed lang t function to replace params in non-prefixed keys closes #8110 * fix: locale structure
vuetifyjs · Sep 24, 2019 · d00534f · d00534f
1 parent 642e952
commit d00534f
Show file tree

Hide file tree

Showing 37 changed files with 96 additions and 80 deletions.
diff --git a/packages/vuetify/src/components/VDataIterator/VDataFooter.ts b/packages/vuetify/src/components/VDataIterator/VDataFooter.ts
@@ -54,6 +54,10 @@ export default Vue.extend({
     showCurrentPage: Boolean,
     disablePagination: Boolean,
     disableItemsPerPage: Boolean,
+    pageText: {
+      type: String,
+      default: '$vuetify.dataFooter.pageText',
+    },
   },
 
   computed: {
@@ -138,7 +142,7 @@ export default Vue.extend({
 
         children = this.$scopedSlots['page-text']
           ? [this.$scopedSlots['page-text']!({ pageStart, pageStop, itemsLength })]
-          : [this.$vuetify.lang.t('$vuetify.dataIterator.pageText', pageStart, pageStop, itemsLength)]
+          : [this.$vuetify.lang.t(this.pageText, pageStart, pageStop, itemsLength)]
       }
 
       return this.$createElement('div', {

diff --git a/packages/vuetify/src/locale/af.ts b/packages/vuetify/src/locale/af.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'Close',
   dataIterator: {
-    pageText: '{0}-{1} van {2}',
     noResultsText: 'Geen ooreenstemmende resultate is gevind nie',
     loadingText: 'Loading item...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'Vorige bladsy',
     firstPage: 'Eerste bladsy',
     lastPage: 'Laaste bladsy',
+    pageText: '{0}-{1} van {2}',
   },
   datePicker: {
     itemsSelected: '{0} gekies',

diff --git a/packages/vuetify/src/locale/ar.ts b/packages/vuetify/src/locale/ar.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'إغلاق',
   dataIterator: {
-    pageText: '{0}-{1} من {2}',
     noResultsText: 'لا توجد سجلات مطابقة',
     loadingText: 'تحميل العنصر...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'الصفحة السابقة',
     firstPage: 'الصفحة الأولى',
     lastPage: 'الصفحة الأخيرة',
+    pageText: '{0}-{1} من {2}',
   },
   datePicker: {
     itemsSelected: '{0} مختارة',

diff --git a/packages/vuetify/src/locale/ca.ts b/packages/vuetify/src/locale/ca.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'Close',
   dataIterator: {
-    pageText: '{0}-{1} de {2}',
     noResultsText: 'Sense dades per mostrar',
     loadingText: 'Loading item...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'Pàgina Anterior',
     firstPage: 'Pàgina Primera',
     lastPage: 'Pàgina Darrera',
+    pageText: '{0}-{1} de {2}',
   },
   datePicker: {
     itemsSelected: '{0} seleccionats',

diff --git a/packages/vuetify/src/locale/cs.ts b/packages/vuetify/src/locale/cs.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'Zavřít',
   dataIterator: {
-    pageText: '{0}-{1} z {2}',
     noResultsText: 'Nenalezeny žádné záznamy',
     loadingText: 'Načítám položky...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'Předchozí strana',
     firstPage: 'První strana',
     lastPage: 'Poslední strana',
+    pageText: '{0}-{1} z {2}',
   },
   datePicker: {
     itemsSelected: '{0} vybráno',

diff --git a/packages/vuetify/src/locale/de.ts b/packages/vuetify/src/locale/de.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'Schließen',
   dataIterator: {
-    pageText: '{0}-{1} von {2}',
     noResultsText: 'Keine Elemente gefunden',
     loadingText: 'Lade Elemente...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'Vorherige Seite',
     firstPage: 'Erste Seite',
     lastPage: 'Letzte Seite',
+    pageText: '{0}-{1} von {2}',
   },
   datePicker: {
     itemsSelected: '{0} ausgewählt',

diff --git a/packages/vuetify/src/locale/el.ts b/packages/vuetify/src/locale/el.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'Close',
   dataIterator: {
-    pageText: '{0}-{1} από {2}',
     noResultsText: 'Δε βρέθηκαν αποτελέσματα',
     loadingText: 'Loading item...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'Προηγούμενη σελίδα',
     firstPage: 'Πρώτη σελίδα',
     lastPage: 'Τελευταία σελίδα',
+    pageText: '{0}-{1} από {2}',
   },
   datePicker: {
     itemsSelected: '{0} επιλεγμένα',

diff --git a/packages/vuetify/src/locale/en.ts b/packages/vuetify/src/locale/en.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'Close',
   dataIterator: {
-    pageText: '{0}-{1} of {2}',
     noResultsText: 'No matching records found',
     loadingText: 'Loading items...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'Previous page',
     firstPage: 'First page',
     lastPage: 'Last page',
+    pageText: '{0}-{1} of {2}',
   },
   datePicker: {
     itemsSelected: '{0} selected',

diff --git a/packages/vuetify/src/locale/es.ts b/packages/vuetify/src/locale/es.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'Cerrar',
   dataIterator: {
-    pageText: '{0}-{1} de {2}',
     noResultsText: 'Ningún elemento coincide con la búsqueda',
     loadingText: 'Cargando...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'Página anterior',
     firstPage: 'Primer página',
     lastPage: 'Última página',
+    pageText: '{0}-{1} de {2}',
   },
   datePicker: {
     itemsSelected: '{0} seleccionados',

diff --git a/packages/vuetify/src/locale/et.ts b/packages/vuetify/src/locale/et.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'Close',
   dataIterator: {
-    pageText: '{0}-{1} {2}st',
     noResultsText: 'Vastavaid kirjeid ei leitud',
     loadingText: 'Loading item...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'Eelmine lehekülg',
     firstPage: 'Esimene lehekülg',
     lastPage: 'Viimane lehekülg',
+    pageText: '{0}-{1} {2}st',
   },
   datePicker: {
     itemsSelected: '{0} valitud',

diff --git a/packages/vuetify/src/locale/fa.ts b/packages/vuetify/src/locale/fa.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'بستن',
   dataIterator: {
-    pageText: '{0} تا {1} از {2}',
     noResultsText: 'نتیجه‌ای یافت نشد',
     loadingText: 'در حال بارگذاری...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'صفحه‌ی قبل',
     firstPage: 'صفحه‌ی اول',
     lastPage: 'صفحه‌ی آخر',
+    pageText: '{0} تا {1} از {2}',
   },
   datePicker: {
     itemsSelected: '{0} انتخاب شده است',

diff --git a/packages/vuetify/src/locale/fr.ts b/packages/vuetify/src/locale/fr.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'Fermer',
   dataIterator: {
-    pageText: '{0}-{1} de {2}',
     noResultsText: 'Aucun enregistrement correspondant trouvé',
     loadingText: "Chargement de l'élément...",
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'Page précédente',
     firstPage: 'Première page',
     lastPage: 'Dernière page',
+    pageText: '{0}-{1} de {2}',
   },
   datePicker: {
     itemsSelected: '{0} sélectionnés',

diff --git a/packages/vuetify/src/locale/he.ts b/packages/vuetify/src/locale/he.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'סגור',
   dataIterator: {
-    pageText: '{0}-{1} מתוך {2}',
     noResultsText: 'לא נמצאו תוצאות מתאימות',
     loadingText: 'טוען פריט...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'עמוד הקודם',
     firstPage: 'עמוד ראשון',
     lastPage: 'עמוד אחרון',
+    pageText: '{0}-{1} מתוך {2}',
   },
   datePicker: {
     itemsSelected: '{0} נבחרו',

diff --git a/packages/vuetify/src/locale/hr.ts b/packages/vuetify/src/locale/hr.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'Close',
   dataIterator: {
-    pageText: '{0}-{1} od {2}',
     noResultsText: 'Nisu pronađeni odgovarajući zapisi',
     loadingText: 'Loading item...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'Prethodna stranica',
     firstPage: 'Prva stranica',
     lastPage: 'Zadnja stranica',
+    pageText: '{0}-{1} od {2}',
   },
   datePicker: {
     itemsSelected: '{0} odabrano',

diff --git a/packages/vuetify/src/locale/hu.ts b/packages/vuetify/src/locale/hu.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'Close',
   dataIterator: {
-    pageText: '{0}-{1} / {2}',
     noResultsText: 'Nincs egyező találat',
     loadingText: 'Loading item...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'Előző oldal',
     firstPage: 'Első oldal',
     lastPage: 'Utolsó oldal',
+    pageText: '{0}-{1} / {2}',
   },
   datePicker: {
     itemsSelected: '{0} kiválaszta/-ott',

diff --git a/packages/vuetify/src/locale/id.ts b/packages/vuetify/src/locale/id.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'Tutup',
   dataIterator: {
-    pageText: '{0}-{1} dari {2}',
     noResultsText: 'Tidak ditemukan catatan yang cocok',
     loadingText: 'Memuat data...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'Halaman sebelumnya',
     firstPage: 'Halaman pertama',
     lastPage: 'Halaman terakhir',
+    pageText: '{0}-{1} dari {2}',
   },
   datePicker: {
     itemsSelected: '{0} dipilih',

diff --git a/packages/vuetify/src/locale/it.ts b/packages/vuetify/src/locale/it.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'Chiudi',
   dataIterator: {
-    pageText: '{0}-{1} di {2}',
     noResultsText: 'Nessun risultato trovato',
     loadingText: 'Caricamento in corso...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: 'Pagina precedente',
     firstPage: 'Pagina prima',
     lastPage: 'Pagina ultima',
+    pageText: '{0}-{1} di {2}',
   },
   datePicker: {
     itemsSelected: '{0} selezionati',

diff --git a/packages/vuetify/src/locale/ja.ts b/packages/vuetify/src/locale/ja.ts
@@ -1,7 +1,6 @@
 export default {
   close: 'Close',
   dataIterator: {
-    pageText: '{0}-{1} 件目 / {2}件',
     noResultsText: '検索結果が見つかりません。',
     loadingText: 'Loading item...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: '前のページ',
     firstPage: '一ページ目',
     lastPage: '最後のページ',
+    pageText: '{0}-{1} 件目 / {2}件',
   },
   datePicker: {
     itemsSelected: '{0}日付選択',

diff --git a/packages/vuetify/src/locale/ko.ts b/packages/vuetify/src/locale/ko.ts
@@ -1,7 +1,6 @@
 export default {
   close: '닫기',
   dataIterator: {
-    pageText: '{2} 중 {0}-{1}',
     noResultsText: '일치하는 항목이 없습니다.',
     loadingText: '불러오는 중...',
   },
@@ -21,6 +20,7 @@ export default {
     prevPage: '이전 페이지',
     firstPage: '첫 페이지',
     lastPage: '마지막 페이지',
+    pageText: '{2} 중 {0}-{1}',
   },
   datePicker: {
     itemsSelected: '{0} 선택됨',

diff --git a/packages/vuetify/src/locale/lt.ts b/packages/vuetify/src/locale/lt.ts
@@ -1,44 +1,44 @@
-export default {
-  close: 'Uždaryti',
-  dataIterator: {
-    pageText: '{0}-{1} iš {2}',
-    noResultsText: 'Nerasta atitinkančių įrašų',
-    loadingText: 'Kraunama...',
-  },
-  dataTable: {
-    itemsPerPageText: 'Eilutės per puslapį:',
-    ariaLabel: {
-      sortDescending: ': Išrikiuota mažėjimo tvarka. Suaktyvinkite, jei norite rikiavimą pašalinti.',
-      sortAscending: ': Išrikiuota didėjimo tvarka. Suaktyvinkite, jei norite rikiuoti mažėjimo tvarka.',
-      sortNone: ': Nerikiuota. Suaktyvinkite, jei norite rikiuoti didėjimo tvarka.',
-    },
-    sortBy: 'Sort by',
-  },
-  dataFooter: {
-    itemsPerPageText: 'Įrašai per puslapį:',
-    itemsPerPageAll: 'Visi',
-    nextPage: 'Kitas puslapis',
-    prevPage: 'Ankstesnis puslapis',
-    firstPage: 'Pirmas puslapis',
-    lastPage: 'Paskutinis puslapis',
-  },
-  datePicker: {
-    itemsSelected: '{0} pasirinkta',
-  },
-  noDataText: 'Nėra duomenų',
-  carousel: {
-    prev: 'Ankstesnioji skaidrė',
-    next: 'Kita skaidrė',
-  },
-  calendar: {
-    moreEvents: 'Daugiau {0}',
-  },
-  fileInput: {
-    counter: '{0} failų',
-    counterSize: '{0} failų ({1} iš viso)',
-  },
-  timePicker: {
-    am: 'AM',
-    pm: 'PM',
-  },
-}
+export default {
+  close: 'Uždaryti',
+  dataIterator: {
+    noResultsText: 'Nerasta atitinkančių įrašų',
+    loadingText: 'Kraunama...',
+  },
+  dataTable: {
+    itemsPerPageText: 'Eilutės per puslapį:',
+    ariaLabel: {
+      sortDescending: ': Išrikiuota mažėjimo tvarka. Suaktyvinkite, jei norite rikiavimą pašalinti.',
+      sortAscending: ': Išrikiuota didėjimo tvarka. Suaktyvinkite, jei norite rikiuoti mažėjimo tvarka.',
+      sortNone: ': Nerikiuota. Suaktyvinkite, jei norite rikiuoti didėjimo tvarka.',
+    },
+    sortBy: 'Sort by',
+  },
+  dataFooter: {
+    itemsPerPageText: 'Įrašai per puslapį:',
+    itemsPerPageAll: 'Visi',
+    nextPage: 'Kitas puslapis',
+    prevPage: 'Ankstesnis puslapis',
+    firstPage: 'Pirmas puslapis',
+    lastPage: 'Paskutinis puslapis',
+    pageText: '{0}-{1} iš {2}',
+  },
+  datePicker: {
+    itemsSelected: '{0} pasirinkta',
+  },
+  noDataText: 'Nėra duomenų',
+  carousel: {
+    prev: 'Ankstesnioji skaidrė',
+    next: 'Kita skaidrė',
+  },
+  calendar: {
+    moreEvents: 'Daugiau {0}',
+  },
+  fileInput: {
+    counter: '{0} failų',
+    counterSize: '{0} failų ({1} iš viso)',
+  },
+  timePicker: {
+    am: 'AM',
+    pm: 'PM',
+  },
+}