Attachment 27356 Details for Bug 11703 – Bug 11703 [QA Followup] - Provide context for translation of strings

[patch] Bug 11703 [QA Followup] - Provide context for translation of strings

Bug-11703-QA-Followup---Provide-context-for-transl.patch (text/plain), 5.87 KB, created by Kyle M Hall (khall) on 2014-04-21 17:01:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2014-04-21 17:01:41 UTC

Size: 5.87 KB

patch

obsolete

>From b8ddfdd217d16aa5200ac5062dcde68f44f84f34 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>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 += "</a>";
> 
> 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 += " <a href='/cgi-bin/koha/catalogue/detail.pl?biblionumber="
> + oObj.biblionumber
>-- 
>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