[open-ils-commits] [GIT] Evergreen ILS branch master updated. 22aad90045c9d747f0315594e373f1d4df147e60

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  22aad90045c9d747f0315594e373f1d4df147e60 (commit)
       via  b41a615328721bfe1e1e2836e69bac3d1f2e8621 (commit)
       via  ce9131a32ad5c19b126f189c76b20c0c65d4aebd (commit)
      from  0f567f749c1ea74227f5e03ddff60dc3bd4c8e67 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 22aad90045c9d747f0315594e373f1d4df147e60
Author: Kyle Tomita <ktomita at catalystitservices.com>
Date:   Wed Mar 27 15:31:17 2013 -0700

    Update LP1159768 - Client: Holds Client Controls Confusing
    
    The new string "Are you sure you want to cancel the hold(s)?"
    has been added as the following variable,
    staff.hold_list.cancel_hold_dialog.confirmation.
    
    The string also needs to be translated to all supported languages.
    
    Signed-off-by: Kyle Tomita <ktomita at catalystitservices.com>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 6d6b2e5..d52ae78 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -2640,6 +2640,7 @@
 <!ENTITY staff.hold_list.cancel_hold_dialog.cancel_btn.accesskey "N">
 <!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.label "Yes">
 <!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.accesskey "Y">
+<!ENTITY staff.hold_list.cancel_hold_dialog.confirmation "Are you sure you want to cancel the hold(s)?">
 <!ENTITY staff.cat.manage_multi_bib_items.caption "Manage Conjoined Items">
 <!ENTITY staff.cat.manage_multi_bib_items.actions.menu.label "Actions for Selected Items">
 <!ENTITY staff.cat.manage_multi_bib_items.actions.menu.accesskey "f">
diff --git a/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul b/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
index ca0941b..49aea97 100644
--- a/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
+++ b/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
@@ -49,7 +49,7 @@
     <textbox id="note_tb" multiline="true" />
     <hbox>
         <spacer flex="1"/>
-        Are you sure you want to cancel the hold(s)?
+        <label value="&staff.hold_list.cancel_hold_dialog.confirmation;" />
         <button id="cancel_btn" label="&staff.hold_list.cancel_hold_dialog.cancel_btn.label;" accesskey="&staff.hold_list.cancel_hold_dialog.cancel_btn.accesskey;" />
         <button id="apply_btn" label="&staff.hold_list.cancel_hold_dialog.apply_btn.label;" accesskey="&staff.hold_list.cancel_hold_dialog.apply_btn.accesskey;" />
     </hbox>

commit b41a615328721bfe1e1e2836e69bac3d1f2e8621
Author: Kyle Tomita <ktomita at catalystitservices.com>
Date:   Wed Mar 27 13:31:03 2013 -0700

    LP1159768 - Client: Holds Client Controls Confusing
    
    The buttons were updated per Jason's suggestions to "No" and "Yes" with
    a question added, "Are you sure you want to cancel the hold(s)?"
    
    Signed-off-by: Kyle Tomita <ktomita at catalystitservices.com>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index b96d4cc..6d6b2e5 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -2636,10 +2636,10 @@
 <!ENTITY staff.hold_list.cancel_hold_dialog.title "Cancel Hold">
 <!ENTITY staff.hold_list.cancel_hold_dialog.header "Cancel Hold">
 <!ENTITY staff.hold_list.cancel_hold_dialog.description "Reason and Notes">
-<!ENTITY staff.hold_list.cancel_hold_dialog.cancel_btn.label "Cancel Action">
-<!ENTITY staff.hold_list.cancel_hold_dialog.cancel_btn.accesskey "C">
-<!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.label "Apply Cancellation">
-<!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.accesskey "A">
+<!ENTITY staff.hold_list.cancel_hold_dialog.cancel_btn.label "No">
+<!ENTITY staff.hold_list.cancel_hold_dialog.cancel_btn.accesskey "N">
+<!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.label "Yes">
+<!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.accesskey "Y">
 <!ENTITY staff.cat.manage_multi_bib_items.caption "Manage Conjoined Items">
 <!ENTITY staff.cat.manage_multi_bib_items.actions.menu.label "Actions for Selected Items">
 <!ENTITY staff.cat.manage_multi_bib_items.actions.menu.accesskey "f">
diff --git a/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul b/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
index d2da173..ca0941b 100644
--- a/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
+++ b/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
@@ -49,6 +49,7 @@
     <textbox id="note_tb" multiline="true" />
     <hbox>
         <spacer flex="1"/>
+        Are you sure you want to cancel the hold(s)?
         <button id="cancel_btn" label="&staff.hold_list.cancel_hold_dialog.cancel_btn.label;" accesskey="&staff.hold_list.cancel_hold_dialog.cancel_btn.accesskey;" />
         <button id="apply_btn" label="&staff.hold_list.cancel_hold_dialog.apply_btn.label;" accesskey="&staff.hold_list.cancel_hold_dialog.apply_btn.accesskey;" />
     </hbox>

commit ce9131a32ad5c19b126f189c76b20c0c65d4aebd
Author: Kyle Tomita <ktomita at catalystitservices.com>
Date:   Wed Mar 27 12:50:59 2013 -0700

    LP1159768 - Client: Holds Client Controls Confusing
    
    Changed the language from "Cancel" to "Cancel Action" and
    "Apply" to "Apply Cancellation".  These need to be translated
    to other supported languages.
    
    Signed-off-by: Kyle Tomita <ktomita at catalystitservices.com>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index c519abf..b96d4cc 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -2636,9 +2636,9 @@
 <!ENTITY staff.hold_list.cancel_hold_dialog.title "Cancel Hold">
 <!ENTITY staff.hold_list.cancel_hold_dialog.header "Cancel Hold">
 <!ENTITY staff.hold_list.cancel_hold_dialog.description "Reason and Notes">
-<!ENTITY staff.hold_list.cancel_hold_dialog.cancel_btn.label "Cancel">
+<!ENTITY staff.hold_list.cancel_hold_dialog.cancel_btn.label "Cancel Action">
 <!ENTITY staff.hold_list.cancel_hold_dialog.cancel_btn.accesskey "C">
-<!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.label "Apply">
+<!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.label "Apply Cancellation">
 <!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.accesskey "A">
 <!ENTITY staff.cat.manage_multi_bib_items.caption "Manage Conjoined Items">
 <!ENTITY staff.cat.manage_multi_bib_items.actions.menu.label "Actions for Selected Items">

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/opac/locale/en-US/lang.dtd            |    9 +++++----
 .../xul/staff_client/server/patron/hold_cancel.xul |    1 +
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS