Attachment 46040 Details for Bug 15232 – Bug 15232: Advanced Cataloging Editor: Fix translation issues

[patch] Bug 15232: Advanced Cataloging Editor: Fix translation issues

-Bug-15232-Advanced-Cataloging-Editor-Fix-translat.patch (text/plain), 2.48 KB, created by Brendan Gallagher on 2015-12-29 23:02:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brendan Gallagher

Created: 2015-12-29 23:02:57 UTC

Size: 2.48 KB

patch

obsolete

>From 36c06583298649843309a4fc8696b1c638e16740 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
>Date: Sat, 21 Nov 2015 01:31:00 +0100
>Subject: [PATCH]  Bug 15232: Advanced Cataloging Editor: Fix translation
> issues
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This patch makes
>koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc to comply with
>Coding guidlines to avoid translation issues: "JS3: Avoid strings which
>mix text and markup Text mustn't contain HTML tags."
>
>To test:
>- Apply patch
>- Verify that code changes are correct (html markup moved out of
>  function _(...) )
>- Bonus test: Enable syspref 'EnableAdvancedCatalogingEditor' and verify
>  that it works as before
>
>With type fix from: Hector Castro <hector.hecaxmmx@gmail.com>
>
>Signed-off-by: FrÃ©dÃ©ric Demians <f.demians@tamil.fr>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>
>Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc
>index 443c022..cc8817d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc
>@@ -559,7 +559,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr
>             invalidateSearchResults();
>             Search.Reconnect();
>         } else {
>-            humanMsg.displayMsg( _("<h3>Internal search error</h3>") + '<p>' + error + '</p>' + _("<p>Please <b>refresh</b> the page and try again."), { className: 'humanError' } );
>+            humanMsg.displayMsg( '<h3>' + _("Internal search error") + '</h3><p>' + error + '</p><p>' + _("Please refresh the page and try again.") + '</p>', { className: 'humanError' } );
>         }
>     }
> 
>@@ -948,7 +948,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr
>                 errors.push(error);
>             } );
> 
>-            humanMsg.displayMsg( _("<h3>Failed to run macro:</h3>") + '<ul><li>' + errors.join('</li><li>') + '</li></ul>', { className: 'humanError' } );
>+            humanMsg.displayMsg( '<h3>' + _("Failed to run macro:") + '</h3><ul><li>' + errors.join('</li><li>') + '</li></ul>', { className: 'humanError' } );
> 
>             return false;
>         } );
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 15232: 45094 | 45110 | 45129 | 45143 | 46040