From be6515d5ac8bfbbd5cafc04e12b55660f950ad20 Mon Sep 17 00:00:00 2001
From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Date: Wed, 29 Jan 2025 15:05:03 +0000
Subject: [PATCH] Bug 38201: Fix translatability of RelationshipWidget

Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../vue/components/ERM/AgreementResource.vue  | 30 +++++++++++++------
 .../prog/js/vue/components/FormElement.vue    |  1 +
 .../js/vue/components/RelationshipWidget.vue  | 22 +++++++-------
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementResource.vue
index 647aaa3bc8..4826b3fdbc 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementResource.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementResource.vue
@@ -265,9 +265,13 @@ export default {
                             type: "resourceProperty",
                             resourceProperty: "periods",
                         },
-                        resourceName: {
-                            type: "string",
-                            value: "period",
+                        resourceStrings: {
+                            type: "object",
+                            value: {
+                                nameLC: __("period"),
+                                nameUC: __("Period"),
+                                namePL: __("periods"),
+                            },
                         },
                         newRelationship: {
                             type: "object",
@@ -472,9 +476,13 @@ export default {
                             type: "resourceProperty",
                             resourceProperty: "agreement_licenses",
                         },
-                        resourceName: {
-                            type: "string",
-                            value: "license",
+                        resourceStrings: {
+                            type: "object",
+                            value: {
+                                nameLC: __("license"),
+                                nameUC: __("License"),
+                                namePL: __("licenses"),
+                            },
                         },
                     },
                     subFields: [
@@ -569,9 +577,13 @@ export default {
                             type: "resourceProperty",
                             resourceProperty: "agreement_relationships",
                         },
-                        resourceName: {
-                            type: "string",
-                            value: "relationship",
+                        resourceStrings: {
+                            type: "object",
+                            value: {
+                                nameLC: __("relationship"),
+                                nameUC: __("Relationship"),
+                                namePL: __("relationships"),
+                            },
                         },
                         filters: {
                             type: "filter",
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/FormElement.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/FormElement.vue
index fd78f2b56a..c94bc0b131 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/FormElement.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/FormElement.vue
@@ -127,6 +127,7 @@
             :is="relationshipWidget"
             :title="attr.label"
             :apiClient="attr.apiClient"
+            :name="attr.name"
             v-bind="requiredProps()"
             v-on="getEventHandlers()"
         ></component>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/RelationshipWidget.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/RelationshipWidget.vue
index 3635303df4..3bbc0ba1c2 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/RelationshipWidget.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/RelationshipWidget.vue
@@ -1,22 +1,19 @@
 <template>
-    <fieldset class="rows" :id="`${resourceName + '_' + title}`">
+    <fieldset class="rows" :id="`${name + '_' + 'relationship'}`">
         <legend>{{ title }}</legend>
         <fieldset
-            :id="`${resourceName + '_' + title + '_' + counter}`"
+            :id="`${name + '_' + counter}`"
             class="rows"
             v-for="(resourceRelationship, counter) in resourceRelationships"
             v-bind:key="counter"
         >
             <legend>
-                {{
-                    resourceName.slice(0, 1).toUpperCase() +
-                    resourceName.slice(1) +
-                    " " +
-                    (counter + 1)
-                }}
+                {{ resourceStrings.nameUC + " " + (counter + 1) }}
                 <a href="#" @click.prevent="deleteResourceRelationship(counter)"
                     ><i class="fa fa-trash"></i>
-                    {{ $__("Remove this %s").format(resourceName) }}</a
+                    {{
+                        $__("Remove this %s").format(resourceStrings.nameLC)
+                    }}</a
                 >
             </legend>
             <ol>
@@ -35,10 +32,10 @@
             class="btn btn-default"
             @click="addResourceRelationship"
             ><font-awesome-icon icon="plus" />
-            {{ $__("Add new %s").format(resourceName) }}</a
+            {{ $__("Add new %s").format(resourceStrings.nameLC) }}</a
         >
         <span v-else>{{
-            $__("There are no %s created yet").format(resourceName)
+            $__("There are no %s created yet").format(resourceStrings.namePL)
         }}</span>
     </fieldset>
 </template>
@@ -62,12 +59,13 @@ export default {
     props: {
         resourceRelationships: Array,
         subFields: Array,
-        resourceName: String,
+        resourceStrings: Object,
         title: String,
         apiClient: Object,
         newRelationship: Object,
         filters: Object,
         fetchOptions: Boolean,
+        name: String,
     },
     beforeCreate() {
         if (this.apiClient) {