View | Details | Raw Unified | Return to bug 25320
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc (-7 lines)
Lines 1-7 Link Here
1
[%# transletable strings for merge-record.js %]
2
<!-- merge-record-strings.inc -->
3
<script>
4
    var MSG_MERGEREC_ALREADY_EXISTS = _("The field is non-repeatable and already exists in the destination record. Therefore, you cannot add it.");
5
    var MSG_MERGEREC_SUBFIELD_ALREADY_EXISTS = _("The subfield is non-repeatable and already exists in the destination record. Therefore, you cannot add it.");
6
</script>
7
<!-- / merge-record-strings.inc -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt (-1 lines)
Lines 181-187 div#result { margin-top: 1em; } Link Here
181
181
182
[% MACRO jsinclude BLOCK %]
182
[% MACRO jsinclude BLOCK %]
183
    [% Asset.js("js/merge-record.js") | $raw %]
183
    [% Asset.js("js/merge-record.js") | $raw %]
184
    [% INCLUDE 'merge-record-strings.inc' %]
185
    <script>
184
    <script>
186
        [% UNLESS (result) %]
185
        [% UNLESS (result) %]
187
          [% IF (choosereference) %]
186
          [% IF (choosereference) %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/merge-record.js (-3 / +2 lines)
Lines 69-75 function field_can_be_added($sources, $li) { Link Here
69
  }
69
  }
70
70
71
  if ((!repeatable) && (tag in target_record)) {
71
  if ((!repeatable) && (tag in target_record)) {
72
    alert(MSG_MERGEREC_ALREADY_EXISTS);
72
    alert( __p("Bibliographic record", "The field is non-repeatable and already exists in the destination record. Therefore, you cannot add it.") );
73
    return false;
73
    return false;
74
  }
74
  }
75
75
Lines 104-110 function subfield_can_be_added($sources, $li) { Link Here
104
      for (i in target_field.subfields) {
104
      for (i in target_field.subfields) {
105
        var subfield = target_field.subfields[i];
105
        var subfield = target_field.subfields[i];
106
        if (code == subfield.code) {
106
        if (code == subfield.code) {
107
          alert(MSG_MERGEREC_SUBFIELD_ALREADY_EXISTS);
107
          alert( __p("Bibliographic record", "The subfield is non-repeatable and already exists in the destination record. Therefore, you cannot add it.") );
108
          return false;
108
          return false;
109
        }
109
        }
110
      }
110
      }
111
- 

Return to bug 25320