Attachment 29474 Details for Bug 11703 – Bug 11703 [QA Followup] - Use format instead of replace for string translation

[patch] Bug 11703 [QA Followup] - Use format instead of replace for string translation

Bug-11703-QA-Followup---Use-format-instead-of-repl.patch (text/plain), 4.47 KB, created by Kyle M Hall (khall) on 2014-07-03 13:36:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2014-07-03 13:36:17 UTC

Size: 4.47 KB

patch

obsolete

>From de02964393b77396d860f4ddee6fab0a645d6cb0 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Wed, 7 May 2014 10:54:14 -0400
>Subject: [PATCH] Bug 11703 [QA Followup] - Use format instead of replace for string translation
>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>
>Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
>---
> .../intranet-tmpl/prog/en/includes/strings.inc | 10 +++++-----
> koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/js/holds.js | 8 ++++----
> 3 files changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
>index 3755dd1..536a055 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
>@@ -14,14 +14,14 @@
> var ON_HOLD = _("On hold");
> var NOT_RENEWABLE = _("Not renewable");
> var NOT_RENEWABLE_TOO_SOON = _("Cannot renew, renewal is premature");
>- var RENEWALS_REMAINING = _("_RENEWALS_REMAINING_ of _RENEWALS_ALLOWED_ renewals remaining");
>+ var RENEWALS_REMAINING = _("%s of %s renewals remaining");
> var HOLD_IS_SUSPENDED = _("Hold is suspended");
>- var UNTIL = _("until _SUSPEND_UNTIL_");
>+ var UNTIL = _("until %s");
> var ITEM_IS_WAITING = _("Item is waiting"); //
>- var AT = _("at _WAITING_AT_BRANCH_");
>- var ITEM_IS_IN_TRANSIT = _("Item is in transit from _FROM_BRANCH_");
>+ var AT = _("at %s");
>+ var ITEM_IS_IN_TRANSIT = _("Item is in transit from %s");
> var FROM = _("from");
>- var NOT_TRANSFERRED_YET = _("Item hasn't been transferred yet from _FROM_BRANCH_");
>+ var NOT_TRANSFERRED_YET = _("Item hasn't been transferred yet from %s");
> var NO = _("No");
> var YES = _("Yes");
> //]]>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
>index eca940a..4ab7be1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
>+++ b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
>@@ -258,7 +258,7 @@ $(document).ready(function() {
> 
> if ( oObj.renewals_remaining ) {
> content += "("
>- + RENEWALS_REMAINING.replace( "_RENEWALS_REMAINING_", oObj.renewals_remaining ).replace( "_RENEWALS_ALLOWED_", oObj.renewals_allowed )
>+ + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed )
> + ")";
> }
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
>index eab5ae4..ba31e9f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
>+++ b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
>@@ -50,7 +50,7 @@ $(document).ready(function() {
> if ( oObj.suspend == 1 ) {
> data += "" + HOLD_IS_SUSPENDED;
> if ( oObj.suspend_until ) {
>- data += " " + UNTIL.replace( "_SUSPEND_UNTIL_", oObj.suspend_until_formatted );
>+ data += " " + UNTIL.format( oObj.suspend_until_formatted );
> }
> data += "";
> }
>@@ -61,12 +61,12 @@ $(document).ready(function() {
> data += ITEM_IS_WAITING;
> 
> if ( ! oObj.waiting_here ) {
>- data += " " + AT.replace("_WAITING_AT_BRANCH_", oObj.waiting_at );
>+ data += " " + AT.format( oObj.waiting_at );
> }
> } else if ( oObj.transferred ) {
>- data += ITEM_IS_IN_TRANSIT.replace( "_FROM_BRANCH_", oObj.from_branch );
>+ data += ITEM_IS_IN_TRANSIT.format( oObj.from_branch );
> } else if ( oObj.not_transferred ) {
>- data += NOT_TRANSFERRED_YET.replace( "_FROM_BRANCH_", oObj.not_transferred_by );
>+ data += NOT_TRANSFERRED_YET.format( oObj.not_transferred_by );
> }
> data += "";
> 
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 11703: 25105 | 25110 | 25111 | 25213 | 25217 | 25218 | 25220 | 25221 | 25261 | 25262 | 25263 | 25264 | 25271 | 25272 | 25289 | 25290 | 25292 | 25390 | 25391 | 25986 | 25987 | 25988 | 25989 | 25990 | 25991 | 25992 | 25993 | 25994 | 25995 | 25996 | 25997 | 25998 | 25999 | 26081 | 26085 | 26115 | 26131 | 26158 | 26160 | 26241 | 26986 | 26990 | 26991 | 27102 | 27241 | 27338 | 27339 | 27340 | 27341 | 27342 | 27349 | 27350 | 27353 | 27354 | 27356 | 27548 | 27610 | 27717 | 27718 | 27745 | 27746 | 27750 | 27751 | 28025 | 28026 | 28027 | 28028 | 28029 | 29195 | 29196 | 29197 | 29198 | 29199 | 29279 | 29280 | 29281 | 29282 | 29283 | 29284 | 29419 | 29420 | 29432 | 29433 | 29434 | 29438 | 29439 | 29440 | 29444 | 29445 | 29446 | 29447 | 29448 | 29449 | 29450 | 29451 | 29452 | 29453 | 29454 | 29472 | 29473 | 29474 | 29475 | 29476 | 29477 | 29478 | 29479 | 29480 | 29493 | 30228