From 0cb000be0718321e4679e94904af8da24ae74551 Mon Sep 17 00:00:00 2001 From: Adrien Saurat Date: Thu, 2 May 2013 16:56:54 +0200 Subject: [PATCH] [PASSED QA] Bug 10170: strings in MARC import made translatable Following bug 9215: non translatable strings are now present in the template and translatable Signed-off-by: Chris Cormack Not only does this make the strings translatable it makes the template a lot easier to read Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer All tests pass. --- .../prog/en/modules/tools/manage-marc-import.tt | 78 ++++++++++++++++++-- 1 file changed, 70 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt index 5b0e3a2..74f2ef8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt @@ -168,14 +168,58 @@ $(document).ready(function(){ No matching rule in effect [% END %][% END %] -
  • [% IF ( can_commit ) %] - [% INCLUDE 'tools-overlay-action.inc' %] Changed. Reset[% ELSE %]Action if matching record found:[% overlay_action %][% END %]
  • +
  • + [% IF ( can_commit ) %] + + [% INCLUDE 'tools-overlay-action.inc' %] Changed. Reset + [% ELSE %] + Action if matching record found: + [% IF ( overlay_action == 'replace' ) %] + Replace existing record with incoming record + [% ELSIF ( overlay_action == 'create_new' ) %] + Add incoming record + [% ELSIF ( overlay_action == 'ignore' ) %] + Ignore incoming record (its items may still be processed) + [% ELSE %] + [% overlay_action %] + [% END %] + [% END %]
  • -
  • [% IF ( can_commit ) %] - [% INCLUDE 'tools-nomatch-action.inc' %] Changed. Reset[% ELSE %]Action if no match found:[% nomatch_action %][% END %]
  • +
  • + [% IF ( can_commit ) %] + + [% INCLUDE 'tools-nomatch-action.inc' %] Changed. Reset + [% ELSE %] + Action if no match found: + [% IF ( nomatch_action == 'create_new' ) %] + Add incoming record + [% ELSIF ( nomatch_action == 'ignore' ) %] + Ignore incoming record (its items may still be processed) + [% ELSE %] + [% nomatch_action %] + [% END %] + [% END %] +
  • -
  • [% IF ( can_commit ) %] - [% INCLUDE 'tools-item-action.inc' %] Changed. Reset[% ELSE %]Item processing:[% item_action %][% END %]
  • +
  • + [% IF ( can_commit ) %] + + [% INCLUDE 'tools-item-action.inc' %] Changed. Reset + [% ELSE %] + Item processing: + [% IF ( item_action == 'always_add' ) %] + Always add items + [% ELSIF ( item_action == 'add_only_for_matches' ) %] + Add items only if matching bib was found + [% ELSIF ( item_action == 'add_only_for_new' ) %] + Add items only if no matching bib was found + [% ELSIF ( item_action == 'ignore' ) %] + Ignore items + [% ELSE %] + [% item_action %] + [% END %] + [% END %] +
  • [% IF ( can_commit ) %]
    [% END %] @@ -342,8 +386,26 @@ Page [% UNLESS ( loop.odd ) %][% ELSE %][% END %] [% record_lis.record_sequence %] [% record_lis.citation %] - [% record_lis.status %] - [% record_lis.overlay_status %] + + [% IF ( record_lis.status == 'imported' ) %] + Imported + [% ELSIF ( record_lis.status == 'ignored' ) %] + Ignored + [% ELSIF ( record_lis.status == 'reverted' ) %] + Reverted + [% ELSE %] + [% record_lis.status %] + [% END %] + + + [% IF ( record_lis.overlay_status == 'no_match' ) %] + No match + [% ELSIF ( record_lis.overlay_status == 'match_applied' ) %] + Match applied + [% ELSE %] + [% record_lis.overlay_status %] + [% END %] + [% IF ( record_lis.final_match_id ) %] [% PROCESS final_match_link record=record_lis %] [% END %] -- 1.7.9.5