From b8ddfdd217d16aa5200ac5062dcde68f44f84f34 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 21 Apr 2014 13:01:01 -0400 Subject: [PATCH] Bug 11703 [QA Followup] - Provide context for translation of strings --- .../intranet-tmpl/prog/en/includes/strings.inc | 19 ++++++++----------- koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 8 +++----- koha-tmpl/intranet-tmpl/prog/en/js/holds.js | 15 ++++++++------- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc index 7f49693..3755dd1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc @@ -10,21 +10,18 @@ var REASON_UNKNOWN = _("reason unkown"); var TODAYS_CHECKOUTS = _("Today's checkouts"); var PREVIOUS_CHECKOUTS = _("Previous checkouts"); - var BY = _("by"); + var BY = _("by _AUTHOR_"); var ON_HOLD = _("On hold"); var NOT_RENEWABLE = _("Not renewable"); var NOT_RENEWABLE_TOO_SOON = _("Cannot renew, renewal is premature"); - var OF = _("of"); - var RENEWALS_REMAINING = _("renewals remaining"); - var HOLD_IS = _("Hold is"); - var SUSPENDED = _("suspended"); - var UNTIL = _("until"); - var ITEM_IS = _("Item is"); - var WAITING = _("waiting"); - var AT = _("at"); - var IN_TRANSIT = _("in transit"); + var RENEWALS_REMAINING = _("_RENEWALS_REMAINING_ of _RENEWALS_ALLOWED_ renewals remaining"); + var HOLD_IS_SUSPENDED = _("Hold is suspended"); + var UNTIL = _("until _SUSPEND_UNTIL_"); + 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 FROM = _("from"); - var NOT_TRANSFERRED_YET = _("Item hasn't been transferred yet from"); + var NOT_TRANSFERRED_YET = _("Item hasn't been transferred yet from _FROM_BRANCH_"); 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 a501aaa..43c0e21 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js @@ -169,7 +169,7 @@ $(document).ready(function() { title += ""; if ( oObj.author ) { - title += " " + BY + " " + oObj.author; + title += " " + BY.replace( "_AUTHOR_", " " + oObj.author ); } if ( oObj.itemnotes ) { @@ -254,10 +254,8 @@ $(document).ready(function() { if ( oObj.renewals_remaining ) { content += "(" - + oObj.renewals_remaining - + " " + OF + " " - + oObj.renewals_allowed + " " - + RENEWALS_REMAINING + ")"; + + RENEWALS_REMAINING.replace( "_RENEWALS_REMAINING_", oObj.renewals_remaining ).replace( "_RENEWALS_ALLOWED_", oObj.renewals_allowed ) + + ")"; } content += ""; diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js index 8a29f5e..2825cac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js @@ -48,9 +48,9 @@ $(document).ready(function() { var data = ""; if ( oObj.suspend == 1 ) { - data += "

" + HOLD_IS + " " + SUSPENDED + " "; + data += "

" + HOLD_IS_SUSPENDED; if ( oObj.suspend_until ) { - data += " " + UNTIL + " " + oObj.suspend_until_formatted; + data += " " + UNTIL.replace( "_SUSPEND_UNTIL_", oObj.suspend_until_formatted ); } data += "

"; } @@ -58,16 +58,17 @@ $(document).ready(function() { if ( oObj.barcode ) { data += ""; if ( oObj.found == "W" ) { - data += ITEM_IS + " " + WAITING + " "; + data += ITEM_IS_WAITING"; if ( ! oObj.waiting_here ) { - data += " " + AT + " " + oObj.waiting_at; + data += " " + AT.replace("_WAITING_AT_BRANCH_", oObj.waiting_at ); } } else if ( oObj.transferred ) { - data += ITEM_IS + " " + IN_TRANSIT + " " + FROM + " " + oObj.from_branch; + data += ITEM_IS_IN_TRANSIT.replace( "_FROM_BRANCH_", oObj.from_branch ); } else if ( oObj.not_transferred ) { - data += NOT_TRANSFERRED_YET + " " + oObj.not_transferred_by; - } data += ""; + data += NOT_TRANSFERRED_YET.replace( "_FROM_BRANCH_", oObj.not_transferred_by; + } + data += ""; data += "