ayanova/src/components/gz-data-table.vue

@@ -490,7 +490,7 @@ export default {
       window.$gz.eventBus.$emit("openobject", { type: typeToOpen, id: i });
     },
     lt(ltKey) {
-      return window.$gz.locale.get(ltKey);
+      return window.$gz.translation.get(ltKey);
     },
     getDataFromApi() {
       var vm = this;
@@ -534,8 +534,8 @@ export default {
             (async function() {
               //Save a copy of the server columns data for handling button clicks etc later
               vm.serverColumns = res.columns;
-              //Make sure the locale keys are fetched
-              await fetchLocalizedHeaderNames(res.columns); //Note can use await here because it's wrapped inside an async function call, it will wait then resume next stuff below
+              //Make sure the translation keys are fetched
+              await fetchTranslatedHeaderNames(res.columns); //Note can use await here because it's wrapped inside an async function call, it will wait then resume next stuff below
               await fetchEnums(res.columns);
 
               //build vm.headers here
@@ -584,7 +584,7 @@ function buildHeaders(columnData) {
   for (var i = 0; i < columnData.length; i++) {
     var cm = columnData[i];
     var h = {};
-    h.text = window.$gz.locale.get(cm.cm);
+    h.text = window.$gz.translation.get(cm.cm);
     h.value = "columns.c" + i.toString(); //+".v";
     ret.push(h);
   }
@@ -594,7 +594,7 @@ function buildHeaders(columnData) {
 
 //Called by getDataFromApi on retrieval of list with columnData
 function buildRecords(listData, columndefinitions) {
-  //iterate data, build each object keyed with index name and display set to correct locale filter and then return
+  //iterate data, build each object keyed with index name and display set to correct translated filter and then return
 
   var ret = [];
   if (!listData) {
@@ -602,8 +602,8 @@ function buildRecords(listData, columndefinitions) {
   }
 
   //cache display format stuff
-  var timeZoneName = window.$gz.locale.getBrowserTimeZoneName();
-  var languageName = window.$gz.locale.getBrowserLanguages();
+  var timeZoneName = window.$gz.translation.getBrowserTimeZoneName();
+  var languageName = window.$gz.translation.getBrowserLanguages();
   var hour12 = window.$gz.store.state.locale.hour12;
   var currencyName = window.$gz.store.state.locale.currencyName;
 
@@ -640,7 +640,7 @@ function buildRecords(listData, columndefinitions) {
       */
       switch (dataType) {
         case 1: //datetime format to shortdatetime
-          display = window.$gz.locale.utcDateToShortDateAndTimeLocalized(
+          display = window.$gz.translation.utcDateToShortDateAndTimeLocalized(
             display,
             timeZoneName,
             languageName,
@@ -648,14 +648,14 @@ function buildRecords(listData, columndefinitions) {
           );
           break;
         case 2: //date only
-          display = window.$gz.locale.utcDateToShortDateLocalized(
+          display = window.$gz.translation.utcDateToShortDateLocalized(
             display,
             timeZoneName,
             languageName
           );
           break;
         case 3: //time only
-          display = window.$gz.locale.utcDateToShortTimeLocalized(
+          display = window.$gz.translation.utcDateToShortTimeLocalized(
             display,
             timeZoneName,
             languageName,
@@ -663,10 +663,13 @@ function buildRecords(listData, columndefinitions) {
           );
           break;
         case 7: //decimal
-          display = window.$gz.locale.decimalLocalized(display, languageName);
+          display = window.$gz.translation.decimalLocalized(
+            display,
+            languageName
+          );
           break;
         case 8: //currency
-          display = window.$gz.locale.currencyLocalized(
+          display = window.$gz.translation.currencyLocalized(
             display,
             languageName,
             currencyName
@@ -717,9 +720,9 @@ function buildRecords(listData, columndefinitions) {
 
 //////////////////////////////////////////////////////////
 //
-// Ensures column names are present in locale table
+// Ensures column names are present in translation table
 //
-async function fetchLocalizedHeaderNames(columnData) {
+async function fetchTranslatedHeaderNames(columnData) {
   if (!columnData) {
     return;
   }
@@ -729,7 +732,7 @@ async function fetchLocalizedHeaderNames(columnData) {
     headerKeys.push(cm.cm);
   }
   //Now fetch all the keys and await the response before returning
-  await window.$gz.locale.fetch(headerKeys).then(() => {
+  await window.$gz.translation.fetch(headerKeys).then(() => {
     return;
   });
 }