From 8155204aa5f6c90edd20a4945dd9dace8656993b Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 22 Dec 2009 15:32:51 +0000
Subject: [PATCH] add workstation library shortname as an option for
common.initials.format
git-svn-id: svn://svn.open-ils.org/ILS/trunk@15221 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
Open-ILS/xul/staff_client/server/cat/copy_notes.xul | 2 +-
Open-ILS/xul/staff_client/server/locale/en-US/common.properties | 2 +-
Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js | 2 +-
Open-ILS/xul/staff_client/server/patron/info_notes.xul | 2 +-
Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_notes.xul b/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
index a3dd7b2b9a..855dcd1bad 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
@@ -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() );
diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
index 03b1174b8f..968d52c4a9 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
@@ -28,7 +28,7 @@ openils.global_util.content_window_jsobject.error=Error with get_contentWindow(%
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
diff --git a/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js b/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js
index 5a4fff06b1..4d22dae235 100644
--- a/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js
+++ b/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js
@@ -94,7 +94,7 @@ function edit_penalty_init() {
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(
diff --git a/Open-ILS/xul/staff_client/server/patron/info_notes.xul b/Open-ILS/xul/staff_client/server/patron/info_notes.xul
index f856cba5f6..988b18f7cb 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_notes.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_notes.xul
@@ -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() );
diff --git a/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js b/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js
index c1ac8aab4e..a49cac71a7 100644
--- a/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js
+++ b/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js
@@ -76,7 +76,7 @@ function new_penalty_init() {
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(
--
2.11.0