@@ -, +, @@
translation issues
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)
---
.../en/modules/admin/marc-overlay-rules.tt | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
@@ -262,10 +262,10 @@
[% rule.tag | html %] |
|
- [% IF rule.add %]Add[% ELSE %]Skip[% END %] |
- [% IF rule.append %]Append[% ELSE %]Skip[% END %] |
- [% IF rule.remove %]Remove[% ELSE %]Skip[% END %] |
- [% IF rule.delete %]Delete[% ELSE %]Skip[% END %] |
+ [% IF rule.add %]Add[% ELSE %]Skip[% END %] |
+ [% IF rule.append %]Append[% ELSE %]Skip[% END %] |
+ [% IF rule.remove %]Remove[% ELSE %]Skip[% END %] |
+ [% IF rule.delete %]Delete[% ELSE %]Skip[% END %] |
Delete
Edit
@@ -429,13 +429,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());
}
@@ -455,10 +448,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()
);
});
--
|