From e9c7f84896fe158894c86a682ef110723e5a4a44 Mon Sep 17 00:00:00 2001
From: Kevin Carnes <kevin.carnes@ub.lu.se>
Date: Thu, 13 Apr 2023 15:20:02 +0200
Subject: [PATCH] Bug 31694: (follow-up) Use values for operations to avoid
 translation issues
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

    To test:
    * Try adding a preset rule that has an operation with different translations
      for the column and the pull down (e.g. Outrepasser for fr-CA)
    * Without the patch it appears as Custom (e.g. Personnalisé)
    * With the patch it appears correctly (e.g. Outrepasser)

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Jan Kissig <jkissig@th-wildau.de>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../en/modules/admin/marc-overlay-rules.tt    | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
index 7a6064a135..d7615eb43b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
@@ -263,10 +263,10 @@
                                     </td>
                                     <td>[% rule.tag | html %]</td>
                                     <td class="rule-preset"></td>
-                                    <td class="rule-operation-action" data-operation="add">[% IF rule.add %]Add[% ELSE %]Skip[% END %]</td>
-                                    <td class="rule-operation-action" data-operation="append">[% IF rule.append %]Append[% ELSE %]Skip[% END %]</td>
-                                    <td class="rule-operation-action" data-operation="remove">[% IF rule.remove %]Remove[% ELSE %]Skip[% END %]</td>
-                                    <td class="rule-operation-action" data-operation="delete">[% IF rule.delete %]Delete[% ELSE %]Skip[% END %]</td>
+                                    <td class="rule-operation-action" data-operation="add" data-value="[% rule.add %]">[% IF rule.add %]Add[% ELSE %]Skip[% END %]</td>
+                                    <td class="rule-operation-action" data-operation="append" data-value="[% rule.append %]">[% IF rule.append %]Append[% ELSE %]Skip[% END %]</td>
+                                    <td class="rule-operation-action" data-operation="remove" data-value="[% rule.remove %]">[% IF rule.remove %]Remove[% ELSE %]Skip[% END %]</td>
+                                    <td class="rule-operation-action" data-operation="delete" data-value="[% rule.delete %]">[% IF rule.delete %]Delete[% ELSE %]Skip[% END %]</td>
                                     <td class="actions">
                                         <a href="?op=remove&id=[% rule.id | uri %]" title="Delete" class="btn btn-default btn-xs"><i class="fa fa-trash-can"></i> Delete</a>
                                         <a href="?op=edit&id=[% rule.id | uri %]" title="Edit" class="btn btn-default btn-xs"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
@@ -430,13 +430,6 @@
           'delete': 0
         };
 
-        var overlay_rules_label_to_value = {};
-        overlay_rules_label_to_value[_("Add")] = 1;
-        overlay_rules_label_to_value[_("Append")] = 1;
-        overlay_rules_label_to_value[_("Remove")] = 1;
-        overlay_rules_label_to_value[_("Delete")] = 1;
-        overlay_rules_label_to_value[_("Skip")] = 0;
-
         function hash_config(config) {
           return JSON.stringify(config, Object.keys(config).sort());
         }
@@ -456,10 +449,10 @@
           var operations_config = {};
           $('.rule-operation-action', $this).each(function() {
             var $operation = $(this);
-            operations_config[$operation.data('operation')] = overlay_rules_label_to_value[$operation.text()];
+            operations_config[$operation.data('operation')] = $operation.data('value');
           });
           $('.rule-preset', $this).text(
-            $('option[value="' + operations_config_overlay_rule_preset(operations_config) + '"]').text() || _("Custom")
+            $('select[name="preset"] option[value="' + operations_config_overlay_rule_preset(operations_config) + '"]').text()
           );
         });
 
-- 
2.39.5