[open-ils-commits] r15221 - in trunk/Open-ILS/xul/staff_client/server: cat locale/en-US patron (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-12-22 10:32:51 -0500 (Tue, 22 Dec 2009)
New Revision: 15221

Modified:
   trunk/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
   trunk/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js
   trunk/Open-ILS/xul/staff_client/server/patron/info_notes.xul
   trunk/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js
Log:
add workstation library shortname as an option for common.initials.format

Modified: trunk/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/cat/copy_notes.xul	2009-12-22 15:26:41 UTC (rev 15220)
+++ trunk/Open-ILS/xul/staff_client/server/cat/copy_notes.xul	2009-12-22 15:32:51 UTC (rev 15221)
@@ -181,7 +181,7 @@
                     note.title( fancy_prompt_data.title );
                     if (fancy_prompt_data.initials) {
                         fancy_prompt_data.note = fancy_prompt_data.note 
-                            + $("commonStrings").getFormattedString('staff.initials.format',[fancy_prompt_data.initials,util.date.formatted_date(new Date(),'%F')]);
+                            + $("commonStrings").getFormattedString('staff.initials.format',[fancy_prompt_data.initials,util.date.formatted_date(new Date(),'%F'), ses('ws_ou_shortname')]);
                     }
                     note.value( fancy_prompt_data.note );
                     note.pub( get_bool( fancy_prompt_data.pub ) ? get_db_true() : get_db_false() );

Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties	2009-12-22 15:26:41 UTC (rev 15220)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties	2009-12-22 15:32:51 UTC (rev 15221)
@@ -28,7 +28,7 @@
 openils.global_util.content_window.error=Error with get_contentWindow(%1$s): %2$s
 openils.global_util.font_size.error=Error adjusting the font size: %1$s
 # Appended to notes with certain settings enabled.  First position is staff initials, and second position is a date for when the initials were added.
-staff.initials.format= [ %1$s %2$s ]
+staff.initials.format= [ %1$s %2$s @ %3$s ]
 staff.acp_label_barcode=Barcode
 staff.acp_label_call_number=Call Number
 staff.acp_label_circ_as_type=Circulate As Type

Modified: trunk/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js	2009-12-22 15:26:41 UTC (rev 15220)
+++ trunk/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js	2009-12-22 15:32:51 UTC (rev 15221)
@@ -94,7 +94,7 @@
                         initials_tb.focus(); return;
                     } else {
                         JSAN.use('util.date');
-                        note = note + commonStrings.getFormattedString('staff.initials.format',[initials_tb.value,util.date.formatted_date(new Date(),'%F')]);
+                        note = note + commonStrings.getFormattedString('staff.initials.format',[initials_tb.value,util.date.formatted_date(new Date(),'%F'), ses('ws_ou_shortname')]);
                     }
                 }
                 update_modal_xulG(

Modified: trunk/Open-ILS/xul/staff_client/server/patron/info_notes.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/info_notes.xul	2009-12-22 15:26:41 UTC (rev 15220)
+++ trunk/Open-ILS/xul/staff_client/server/patron/info_notes.xul	2009-12-22 15:32:51 UTC (rev 15221)
@@ -213,7 +213,7 @@
                     note.title( fancy_prompt_data.title );
                     if (fancy_prompt_data.initials) {
                         fancy_prompt_data.note = fancy_prompt_data.note 
-                            + $("commonStrings").getFormattedString('staff.initials.format',[fancy_prompt_data.initials,util.date.formatted_date(new Date(),'%F')]);
+                            + $("commonStrings").getFormattedString('staff.initials.format',[fancy_prompt_data.initials,util.date.formatted_date(new Date(),'%F'), ses('ws_ou_shortname')]);
                     }
                     note.value( fancy_prompt_data.note );
                     note.pub( get_bool( fancy_prompt_data.pub ) ? get_db_true() : get_db_false() );

Modified: trunk/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js	2009-12-22 15:26:41 UTC (rev 15220)
+++ trunk/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js	2009-12-22 15:32:51 UTC (rev 15221)
@@ -76,7 +76,7 @@
                         initials_tb.focus(); return;
                     } else {
                         JSAN.use('util.date');
-                        note = note + commonStrings.getFormattedString('staff.initials.format',[initials_tb.value,util.date.formatted_date(new Date(),'%F')]);
+                        note = note + commonStrings.getFormattedString('staff.initials.format',[initials_tb.value,util.date.formatted_date(new Date(),'%F'), ses('ws_ou_shortname')]);
                     }
                 }
                 update_modal_xulG(