Attachment 17900 Details for Bug 10170 – proposed patch #1

[patch] proposed patch #1

0001-Bug-10170-strings-in-MARC-import-made-translatable.patch (text/plain), 5.52 KB, created by Adrien SAURAT on 2013-05-02 15:02:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrien SAURAT

Created: 2013-05-02 15:02:22 UTC

Size: 5.52 KB

patch

obsolete

>From f983bb133e329fef64e400defa2b20c532411a77 Mon Sep 17 00:00:00 2001
>From: Adrien Saurat <adrien.saurat@biblibre.com>
>Date: Thu, 2 May 2013 16:56:54 +0200
>Subject: [PATCH] Bug 10170: strings in MARC import made translatable
>
>Following bug 9215: non translatable strings are now
>present in the template and translatable
>---
> .../prog/en/modules/tools/manage-marc-import.tt | 78 ++++++++++++++++++--
> 1 files 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 b81ffea..a724f7e 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 %]
> </li>
>- <li>[% IF ( can_commit ) %] <label for="overlay_action">Action if matching record found:</label>
>- [% INCLUDE 'tools-overlay-action.inc' %] Changed. <a href="#" class="reset" id="reset_overlay_action">Reset</a>[% ELSE %]Action if matching record found:[% overlay_action %][% END %]</li>
>+ <li>
>+ [% IF ( can_commit ) %]
>+ <label for="overlay_action">Action if matching record found:</label>
>+ [% INCLUDE 'tools-overlay-action.inc' %] Changed. <a href="#" class="reset" id="reset_overlay_action">Reset</a>
>+ [% 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 %]</li>
> 
>- <li>[% IF ( can_commit ) %]<label for="nomatch_action">Action if no match found:</label>
>- [% INCLUDE 'tools-nomatch-action.inc' %] Changed. <a href="#" class="reset" id="reset_nomatch_action">Reset</a>[% ELSE %]Action if no match found:[% nomatch_action %][% END %]</li>
>+ <li>
>+ [% IF ( can_commit ) %]
>+ <label for="nomatch_action">Action if no match found:</label>
>+ [% INCLUDE 'tools-nomatch-action.inc' %] Changed. <a href="#" class="reset" id="reset_nomatch_action">Reset</a>
>+ [% 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 %]
>+ </li>
> 
>- <li>[% IF ( can_commit ) %]<label for="item_action">Item processing:</label>
>- [% INCLUDE 'tools-item-action.inc' %] Changed. <a href="#" class="reset" id="reset_item_action">Reset</a>[% ELSE %]Item processing:[% item_action %][% END %]</li>
>+ <li>
>+ [% IF ( can_commit ) %]
>+ <label for="item_action">Item processing:</label>
>+ [% INCLUDE 'tools-item-action.inc' %] Changed. <a href="#" class="reset" id="reset_item_action">Reset</a>
>+ [% 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 %]
>+ </li>
> </ol>
> [% IF ( can_commit ) %]<fieldset class="action"><input type="submit" value="Apply different matching rules" class="button" /></fieldset></form>[% END %]
> </fieldset>
>@@ -342,8 +386,26 @@ Page
> [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
> <td>[% record_lis.record_sequence %]</td>
> <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% record_lis.import_record_id %]" rel="gb_page_center[600,500]">[% record_lis.citation %]</a></td>
>- <td>[% record_lis.status %]</td>
>- <td>[% record_lis.overlay_status %]</td>
>+ <td>
>+ [% IF ( record_lis.status == 'imported' ) %]
>+ Imported
>+ [% ELSIF ( record_lis.status == 'ignored' ) %]
>+ Ignored
>+ [% ELSIF ( record_lis.status == 'reverted' ) %]
>+ Reverted
>+ [% ELSE %]
>+ [% record_lis.status %]
>+ [% END %]
>+ </td>
>+ <td>
>+ [% IF ( record_lis.overlay_status == 'no_match' ) %]
>+ No&nbsp;match
>+ [% ELSIF ( record_lis.overlay_status == 'match_applied' ) %]
>+ Match applied
>+ [% ELSE %]
>+ [% record_lis.overlay_status %]
>+ [% END %]
>+ </td>
> <td>[% IF ( record_lis.final_match_id ) %]
> [% PROCESS final_match_link record=record_lis %]
> [% END %]
>-- 
>1.7.5.4
>

Actions: View | Diff | Splinter Review

Attachments on bug 10170: 17880 | 17900 | 17917 | 18020 | 18257 | 19496 | 19626 | 19627