From 9de614887cad48a1b8601454b38e26749ecd31e3 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 12 Nov 2013 15:31:56 +0100 Subject: [PATCH] [SIGNED OFF] Bug 11225: \n in translation strings should be removed Some strings in the serials module contain linebreaks \n that cause problems in translation. Test plan: - Update your po file - Verify that strings in serials/subscription-add.tt and serials/subscription-numberpatterns.tt are present and don't contain "\n" character. Signed-off-by: Katrin Fischer Template only change, passes all tests and QA script. Updated po files now contain only the strings and no line breaks. --- .../intranet-tmpl/prog/en/modules/serials/subscription-add.tt | 8 ++++---- .../prog/en/modules/serials/subscription-numberpatterns.tt | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt index b0d84ee..9b23f87 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt @@ -256,24 +256,24 @@ function testPredictionPattern() { var error = 0; var error_msg = ""; if(frequencyid == undefined || frequencyid == ""){ - error_msg += _("- Frequency is not defined\n"); + error_msg += _("- Frequency is not defined") + "\n"; error ++; } acquidate = $("#acqui_date").val(); if(acquidate == undefined || acquidate == ""){ - error_msg += _("- First publication date is not defined\n"); + error_msg += _("- First publication date is not defined") + "\n"; error ++; } [% IF (more_than_one_serial) %] var nextacquidate = $("#nextacquidate").val(); if(nextacquidate == undefined || nextacquidate == ""){ - error_msg += _("- Next issue publication date is not defined\n"); + error_msg += _("- Next issue publication date is not defined") + "\n"; error ++; } [% END %] if(error){ - alert(_("Cannot test prediction pattern for the following reason(s):\n\n") + alert(_("Cannot test prediction pattern for the following reason(s):") + "\n\n" + error_msg); return false; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt index 686cdc8..953882f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt @@ -11,16 +11,16 @@ var error = 0; var error_msg = ""; if(frequencyid == undefined || frequencyid == "") { - error_msg += _("- Frequency is not defined\n"); + error_msg += _("- Frequency is not defined") + "\n"; error ++; } if(firstacquidate == undefined || firstacquidate == "") { - error_msg += _("- First publication date is not defined\n"); + error_msg += _("- First publication date is not defined") + "\n"; error ++; } if(error){ - alert(_("Cannot test prediction pattern for the following reason(s):\n\n") + alert(_("Cannot test prediction pattern for the following reason(s):") + "\n\n" + error_msg); return false; } -- 1.8.3.2