Attachment 43978 Details for Bug 14310 – Bug 14310 [QA Followup] - Enable translations, set svc script to be executable

[patch] Bug 14310 [QA Followup] - Enable translations, set svc script to be executable

Bug-14310-QA-Followup---Enable-translations-set-sv.patch (text/plain), 4.19 KB, created by Kyle M Hall (khall) on 2015-10-26 10:40:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2015-10-26 10:40:21 UTC

Size: 4.19 KB

patch

obsolete

>From 2a1404dfee60f2c1335e53518799586e40d2474f Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Mon, 26 Oct 2015 06:39:38 -0400
>Subject: [PATCH] Bug 14310 [QA Followup] - Enable translations, set svc script to be executable
>
>---
> .../intranet-tmpl/prog/en/includes/strings.inc     |    5 +++++
> koha-tmpl/intranet-tmpl/prog/en/js/holds.js        |   12 ++++++------
> 2 files changed, 11 insertions(+), 6 deletions(-)
> mode change 100644 => 100755 svc/hold/resume
> mode change 100644 => 100755 svc/hold/suspend
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
>index 3226ad3..3995b6d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
>@@ -30,5 +30,10 @@
>     var NO = _("No");
>     var YES = _("Yes");
>     var INHOUSE_USE = _("On-site checkout");
>+    var CANCEL = _("Cancel");
>+    var RESUME = _("Resume");
>+    var SUSPEND = _("Suspend");
>+    var SUSPEND_HOLD_ON = _("Suspend hold on");
>+    var CLEAR_DATE_TO_SUSPEND_INDEFINITELY = _("Clear date to suspend indefinitely");
> //]]>
> </script>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
>index bf7ea44..a6c8ca6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
>+++ b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
>@@ -130,10 +130,10 @@ $(document).ready(function() {
>                                 return "";
>                             } else if ( oObj.suspend == 1 ) {
>                                 return "<a class='hold-resume btn btn-link' id='resume" + oObj.reserve_id + "' style='display: inline; white-space: nowrap;'>"
>-                                     + "<i class='icon-play'></i> " + _("Resume") + "</a>";
>+                                     + "<i class='icon-play'></i> " + RESUME + "</a>";
>                             } else {
>                                 return "<a class='hold-suspend btn btn-link' id='suspend" + oObj.reserve_id + "' style='display: inline; white-space: nowrap;'>"
>-                                     + "<i class='icon-pause'></i> " + _("Suspend") + "</a>";
>+                                     + "<i class='icon-pause'></i> " + SUSPEND + "</a>";
>                             }
>                         }
>                     }
>@@ -181,7 +181,7 @@ $(document).ready(function() {
>             <form id='suspend-modal-form' class='form-inline'>\
>                 <div class='modal-header'>\
>                     <button type='button' class='closebtn' data-dismiss='modal' aria-hidden='true'>Ã</button>\
>-                    <h3 id='suspend-modal-label'>" + _("Suspend hold on") + " <i><span id='suspend-modal-title'></span></i></h3>\
>+                    <h3 id='suspend-modal-label'>" + SUSPEND_HOLD_ON + " <i><span id='suspend-modal-title'></span></i></h3>\
>                 </div>\
> \
>                 <div class='modal-body'>\
>@@ -190,13 +190,13 @@ $(document).ready(function() {
>                     <label for='suspend-modal-until'>Suspend until:</label>\
>                     <input name='suspend_until' id='suspend-modal-until' class='suspend-until' size='10' />\
> \
>-                    <p/><a class='btn btn-link' id='suspend-modal-clear-date' >" + _("Clear date to suspend indefinitely") + "</a></p>\
>+                    <p/><a class='btn btn-link' id='suspend-modal-clear-date' >" + CLEAR_DATE_TO_SUSPEND_INDEFINITELY + "</a></p>\
> \
>                 </div>\
> \
>                 <div class='modal-footer'>\
>-                    <button id='suspend-modal-submit' class='btn btn-primary' type='submit' name='submit'>" + _("Suspend") + "</button>\
>-                    <a href='#' data-dismiss='modal' aria-hidden='true' class='cancel'>" + _("Cancel") + "</a>\
>+                    <button id='suspend-modal-submit' class='btn btn-primary' type='submit' name='submit'>" + SUSPEND + "</button>\
>+                    <a href='#' data-dismiss='modal' aria-hidden='true' class='cancel'>" + CANCEL + "</a>\
>                 </div>\
>             </form>\
>         </div>\
>diff --git a/svc/hold/resume b/svc/hold/resume
>old mode 100644
>new mode 100755
>diff --git a/svc/hold/suspend b/svc/hold/suspend
>old mode 100644
>new mode 100755
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 14310: 39750 | 39751 | 39752 | 39753 | 39754 | 40024 | 40030 | 40031 | 40034 | 43525 | 43526 | 43830 | 43831 | 43832 | 43978 | 44203 | 44204 | 44205 | 44206 | 44207 | 46857 | 46858 | 46859 | 46860 | 46861 | 46862 | 46870 | 46871 | 46872 | 46873 | 46874 | 46875 | 46876