Merge pull request #6154 from ProcessMaker/bugfix/FOUR-13206

ryancooley · web-flow · commit fc520d8e3687 · 2024-02-05T17:41:01.000-08:00
FOUR-13206 New Table and filters are not translated
diff --git a/resources/js/components/PMColumnFilterPopover/PMColumnFilterOpBetween.vue b/resources/js/components/PMColumnFilterPopover/PMColumnFilterOpBetween.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <b-form-input v-model="value1" placeholder="input 1" size="sm" class="pm-column-filter-op-between-input"></b-form-input>
-    <b-form-input v-model="value2" placeholder="input 2" size="sm" class="pm-column-filter-op-between-input"></b-form-input>
+    <b-form-input v-model="value1" :placeholder="$t('input') + ' ' + 1" size="sm" class="pm-column-filter-op-between-input"></b-form-input>
+    <b-form-input v-model="value2" :placeholder="$t('input') + ' ' + 2" size="sm" class="pm-column-filter-op-between-input"></b-form-input>
   </div>
 </template>
 
diff --git a/resources/js/requests/components/RequestsListing.vue b/resources/js/requests/components/RequestsListing.vue
@@ -469,7 +469,12 @@ export default {
      * @returns {Array}
      */
     getStatus() {
-      return ["In Progress", "Completed", "Error", "Canceled"];
+      return [
+        {value: "In Progress", text: this.$t("In Progress")},
+        {value: "Completed", text: this.$t("Completed")},
+        {value: "Error", text: this.$t("Error")},
+        {value: "Canceled", text: this.$t("Canceled")}
+      ];
     },
     /**
      * This method is used in PMColumnFilterPopoverCommonMixin.js
diff --git a/resources/js/tasks/components/TasksList.vue b/resources/js/tasks/components/TasksList.vue
@@ -494,7 +494,11 @@ export default {
       return cleanHtml;
     },
     getStatus() {
-      return ["Self Service", "In Progress", "Completed"];
+      return [
+        {value: "Self Service", text: this.$t("Self Service")},
+        {value: "In Progress", text: this.$t("In Progress")},
+        {value: "Completed", text: this.$t("Completed")}
+      ];
     },
     /**
      * This method is used in PMColumnFilterPopoverCommonMixin.js
diff --git a/resources/lang/de.json b/resources/lang/de.json
@@ -2033,5 +2033,6 @@
   "Captcha": "Captcha",
   "Google Places": "Google Places",
   "Add an action to submit your form or update a field": "Fügen Sie eine Aktion hinzu, um Ihr Formular abzusenden oder ein Feld zu aktualisieren",
-  "Add special buttons that link between subpages within this Form": "Fügen Sie spezielle Schaltflächen hinzu, die zwischen Unterseiten innerhalb dieses Formulars verlinken"
+  "Add special buttons that link between subpages within this Form": "Fügen Sie spezielle Schaltflächen hinzu, die zwischen Unterseiten innerhalb dieses Formulars verlinken",
+  "input": "eingabe"
 }
diff --git a/resources/lang/en.json b/resources/lang/en.json
@@ -2035,5 +2035,6 @@
   "Captcha": "Captcha",
   "Google Places": "Google Places",
   "Add an action to submit your form or update a field": "Add an action to submit your form or update a field",
-  "Add special buttons that link between subpages within this Form": "Add special buttons that link between subpages within this Form"
+  "Add special buttons that link between subpages within this Form": "Add special buttons that link between subpages within this Form",
+  "input": "input"
 }
diff --git a/resources/lang/es.json b/resources/lang/es.json
@@ -2033,5 +2033,6 @@
   "Captcha": "Captcha",
   "Google Places": "Google Places",
   "Add an action to submit your form or update a field": "Agregue una acción para enviar su formulario o actualizar un campo",
-  "Add special buttons that link between subpages within this Form": "Agregue botones especiales que enlacen entre subpáginas dentro de este Formulario"
+  "Add special buttons that link between subpages within this Form": "Agregue botones especiales que enlacen entre subpáginas dentro de este Formulario",
+  "input": "entrada"
 }
diff --git a/resources/lang/fr.json b/resources/lang/fr.json
@@ -2033,5 +2033,6 @@
   "Captcha": "Captcha",
   "Google Places": "Google Places",
   "Add an action to submit your form or update a field": "Ajoutez une action pour soumettre votre formulaire ou mettre à jour un champ",
-  "Add special buttons that link between subpages within this Form": "Ajouter des boutons spéciaux qui lient entre les sous-pages au sein de ce Formulaire"
+  "Add special buttons that link between subpages within this Form": "Ajouter des boutons spéciaux qui lient entre les sous-pages au sein de ce Formulaire",
+  "input": "entrée"
 }

Original file line number	Diff line number	Diff line change
`@@ -2033,5 +2033,6 @@`
`2033`	`2033`	`"Captcha": "Captcha",`
`2034`	`2034`	`"Google Places": "Google Places",`
`2035`	`2035`	`"Add an action to submit your form or update a field": "Fügen Sie eine Aktion hinzu, um Ihr Formular abzusenden oder ein Feld zu aktualisieren",`
`2036`		`- "Add special buttons that link between subpages within this Form": "Fügen Sie spezielle Schaltflächen hinzu, die zwischen Unterseiten innerhalb dieses Formulars verlinken"`
	`2036`	`+ "Add special buttons that link between subpages within this Form": "Fügen Sie spezielle Schaltflächen hinzu, die zwischen Unterseiten innerhalb dieses Formulars verlinken",`
	`2037`	`+ "input": "eingabe"`
`2037`	`2038`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2035,5 +2035,6 @@`
`2035`	`2035`	`"Captcha": "Captcha",`
`2036`	`2036`	`"Google Places": "Google Places",`
`2037`	`2037`	`"Add an action to submit your form or update a field": "Add an action to submit your form or update a field",`
`2038`		`- "Add special buttons that link between subpages within this Form": "Add special buttons that link between subpages within this Form"`
	`2038`	`+ "Add special buttons that link between subpages within this Form": "Add special buttons that link between subpages within this Form",`
	`2039`	`+ "input": "input"`
`2039`	`2040`	`}`