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>
This commit is contained in:
Kyle M Hall 2014-05-07 10:54:14 -04:00 committed by Tomas Cohen Arazi
parent 0badd2bcb5
commit c2d28186ad
3 changed files with 10 additions and 10 deletions

View File

@ -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 <strong>suspended</strong>");
var UNTIL = _("until _SUSPEND_UNTIL_");
var UNTIL = _("until %s");
var ITEM_IS_WAITING = _("Item is <strong>waiting</strong>"); //
var AT = _("at _WAITING_AT_BRANCH_");
var ITEM_IS_IN_TRANSIT = _("Item is <strong>in transit</strong> from _FROM_BRANCH_");
var AT = _("at %s");
var ITEM_IS_IN_TRANSIT = _("Item is <strong>in transit</strong> 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");
//]]>

View File

@ -258,7 +258,7 @@ $(document).ready(function() {
if ( oObj.renewals_remaining ) {
content += "<span class='renewals'>("
+ RENEWALS_REMAINING.replace( "_RENEWALS_REMAINING_", oObj.renewals_remaining ).replace( "_RENEWALS_ALLOWED_", oObj.renewals_allowed )
+ RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed )
+ ")</span>";
}

View File

@ -50,7 +50,7 @@ $(document).ready(function() {
if ( oObj.suspend == 1 ) {
data += "<p>" + HOLD_IS_SUSPENDED;
if ( oObj.suspend_until ) {
data += " " + UNTIL.replace( "_SUSPEND_UNTIL_", oObj.suspend_until_formatted );
data += " " + UNTIL.format( oObj.suspend_until_formatted );
}
data += "</p>";
}
@ -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 += "</em>";