gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 25320: Move translatable strings out of merge-record-strings.inc into merge-record.js 

This patch eliminates the use of a separate include file containing
translatable strings in favor of embedding translatable strings in the
JavaScript itself.

To test, apply the patch and clear your browser cache if necessary.

 - Perform a catalog search in the staff interface.
 - Select two results to merge. Click Edit -> Merge records.
 - Click "Next" on the "Merging records" page.
 - On the "Source records" page click the second tab where all the
   checkboxes are unchecked.
   - Check the box for a tag which is non-repeatable, e.g. 245.
     - You should see a message, "The field is non-repeatable and
       already exists in the destination record. Therefore, you cannot add it."
   - Check the box for a subfield which is non-repeatable, e.g. 245$a.
     - You should see a message, "The subfield is non-repeatable and
       already exists in the destination record. Therefore, you cannot
       add it."

TESTING TRANSLATABILITY

 - Update a translation, e.g. fr-FR:

   > cd misc/translator
   > perl translate update fr-FR

 - Open the corresponding .po file for JavaScript strings, e.g.
   misc/translator/po/fr-FR-messages-js.po
 - Locate strings pulled from prog/js/merge-record.js for
   translation, e.g.:

   #: koha-tmpl/intranet-tmpl/prog/js/merge-record.js:72
   msgctxt "Bibliographic record"
   msgid ""
   "The field is non-repeatable and already exists in the destination
   record. "
   "Therefore, you cannot add it."
   msgstr ""

 - Edit the "msgstr" string however you want (it's just for testing).
 - Install the updated translation:

   > perl translate install fr-FR

 - Switch to your newly translated language in the staff client and
   repeat the test plan above. The translated string should appear.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Owen Leonard 2020-06-18 14:28:38 +00:00 committed by Jonathan Druart
parent 654eda8edc
commit dc393dc6be
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc
View File

@ -1,7 +0,0 @@
[%# transletable strings for merge-record.js %]
<!-- merge-record-strings.inc -->
<script>
var MSG_MERGEREC_ALREADY_EXISTS = _("The field is non-repeatable and already exists in the destination record. Therefore, you cannot add it.");
var MSG_MERGEREC_SUBFIELD_ALREADY_EXISTS = _("The subfield is non-repeatable and already exists in the destination record. Therefore, you cannot add it.");
</script>
<!-- / merge-record-strings.inc -->

1
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
View File

@ -181,7 +181,6 @@ div#result { margin-top: 1em; }
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/merge-record.js") | $raw %]
[% INCLUDE 'merge-record-strings.inc' %]
<script>
[% UNLESS (result) %]
[% IF (choosereference) %]

4
koha-tmpl/intranet-tmpl/prog/js/merge-record.js
View File

@ -69,7 +69,7 @@ function field_can_be_added($sources, $li) {
}
if ((!repeatable) && (tag in target_record)) {
alert(MSG_MERGEREC_ALREADY_EXISTS);
alert( __p("Bibliographic record", "The field is non-repeatable and already exists in the destination record. Therefore, you cannot add it.") );
return false;
}
@ -104,7 +104,7 @@ function subfield_can_be_added($sources, $li) {
for (i in target_field.subfields) {
var subfield = target_field.subfields[i];
if (code == subfield.code) {
alert(MSG_MERGEREC_SUBFIELD_ALREADY_EXISTS);
alert( __p("Bibliographic record", "The subfield is non-repeatable and already exists in the destination record. Therefore, you cannot add it.") );
return false;
}
}