From 7ed46aab06b8dd0e4c9c4a8373421a12ad43ced1 Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <pasi.kallinen@pttk.fi>
Date: Tue, 6 Aug 2013 09:27:26 +0300
Subject: [PATCH] i18n fixes for Closed Dates Editor and reporter

Allow translating the rest of Closed Dates Editor, and make the
"Logged in as" and "Welcome" -messages in Reports and Staff client
properly translatable.

Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
Signed-off-by: Remington Steed <rjs7@calvin.edu>
---
 Open-ILS/web/opac/common/js/utils.js               |  7 +++
 Open-ILS/web/opac/locale/en-US/lang.dtd            | 10 +++--
 Open-ILS/web/opac/locale/en-US/reports.dtd         |  2 +-
 Open-ILS/web/reports/oils_rpt.js                   |  3 +-
 Open-ILS/web/reports/oils_rpt.xhtml                |  2 +-
 Open-ILS/web/reports/oils_rpt_builder.xhtml        |  2 +-
 .../chrome/content/OpenILS/global_util.js          |  7 +++
 .../xul/staff_client/server/admin/closed_dates.js  | 31 +++++++++++++-
 .../staff_client/server/admin/closed_dates.xhtml   | 50 ++++++++++------------
 Open-ILS/xul/staff_client/server/index.xhtml       |  5 ++-
 10 files changed, 82 insertions(+), 37 deletions(-)

diff --git a/Open-ILS/web/opac/common/js/utils.js b/Open-ILS/web/opac/common/js/utils.js
index dae8ef2a16..49d564bc62 100644
--- a/Open-ILS/web/opac/common/js/utils.js
+++ b/Open-ILS/web/opac/common/js/utils.js
@@ -3,6 +3,13 @@ function getId(id) {
 	return document.getElementById(id);
 }
 
+function format_string() {
+    var str = arguments[0];
+    for (var i = 1; i < arguments.length; i++)
+        str = str.replace(new RegExp("\\[_"+i+"\\]", "g"), arguments[i].toString());
+    return str;
+}
+
 function swapCSSClass(obj, old, newc ) {
 	removeCSSClass(obj, old );
 	addCSSClass(obj, newc );
diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 6e9e3a5df4..7f4b4ba6a3 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -2151,13 +2151,13 @@
 <!ENTITY staff.server.admin.cash.desk "Desk Payments">
 <!ENTITY staff.server.admin.cash.user "User Payments">
 <!ENTITY staff.server.admin.closed_dates.title "Evergreen: Library Closed Dates Editor">
-<!ENTITY staff.server.admin.closed_dates.welcome "Welcome ">
+<!ENTITY staff.server.admin.closed_dates.welcome "Welcome [_1]">
 <!ENTITY staff.server.admin.closed_dates.editor.title " Closed Dates Editor ">
 <!ENTITY staff.server.admin.closed_dates.editor.for "Edit Closed Dates for: ">
 <!ENTITY staff.server.admin.closed_dates.editor.duration "Closed Duration">
 <!ENTITY staff.server.admin.closed_dates.editor.reason "Reason for Closing">
 <!ENTITY staff.server.admin.closed_dates.editor.delete "Delete">
-<!ENTITY staff.server.admin.closed_dates.editor.allmultiday.delete "delete">
+<!ENTITY staff.server.admin.closed_dates.editor.delete_btn "delete">
 <!-- Translators: do not translate "<b>YYYY-MM-DD</b>" or "<b>HH:MM</b>" -->
 <!ENTITY staff.server.admin.closed_dates.editor.allmultiday.format "Note: All dates must have the form <b>YYYY-MM-DD</b>.  Times must have the form <b>HH:MM</b>">
 <!ENTITY staff.server.admin.closed_dates.add.allday "Add Single Day Closing">
@@ -2167,6 +2167,10 @@
 <!ENTITY staff.server.admin.closed_dates.time.start "Start Time">
 <!ENTITY staff.server.admin.closed_dates.date.end "End Date">
 <!ENTITY staff.server.admin.closed_dates.time.end "End Time">
+<!ENTITY staff.server.admin.closed_dates.allmultiday.label "All Day From [_1] Through [_2]">
+<!ENTITY staff.server.admin.closed_dates.row.label "From [_1] at [_2] through [_3] at [_4]">
+<!ENTITY staff.server.admin.closed_dates.allday_row.label "All Day [_1]">
+<!ENTITY staff.server.admin.closed_dates.allmultiday_row.label "Every Day From [_1] through [_2]">
 <!ENTITY staff.server.admin.closed_dates.allday.label "All Day">
 <!ENTITY staff.server.admin.closed_dates.editor.reason.label "Reason for closing: ">
 <!ENTITY staff.server.admin.closed_dates.apply_all "Apply to all of my libraries">
@@ -3806,7 +3810,7 @@
 <!ENTITY staff.printing.advanced.html_templates.warning.text "If using Receipt Templates with either the DOS LPT1 Print strategy or the Custom/External Print strategy (with &quot;receipt.txt&quot;), the client will try to translate any HTML markup to text, but this process may be imperfect, and for the best fidelity you should consider reworking your templates to be plain text if you are using a plain text print strategy.  However, if using a plain text print strategy with HTML markup, you may include special character codes in 2-digit hexadecimal in a &quot;hex&quot; attribute for any given element.  Such codes will be converted to actual characters and inserted at the place of the tag.  For example, &lt;p hex=&quot;0C&quot;&gt;Hello World&lt;/p&gt; will translate to form feed control character + Hello World. &lt;p&gt;Hello World&lt;/p hex=&quot;0C&quot;&gt; will translate to Hello World + form feed control character.">
 <!ENTITY staff.client.portal.title "Evergreen Staff Client Portal">
 <!ENTITY staff.client.portal.tab_name "Portal">
-<!ENTITY staff.client.portal.welcome "Welcome to Evergreen">
+<!ENTITY staff.client.portal.welcome "Welcome to Evergreen, [_1]">
 <!ENTITY staff.client.portal.circpatron "Circulation and Patrons">
 <!ENTITY staff.client.portal.checkout "Check Out Items">
 <!ENTITY staff.client.portal.checkout.description "Check Out Items">
diff --git a/Open-ILS/web/opac/locale/en-US/reports.dtd b/Open-ILS/web/opac/locale/en-US/reports.dtd
index 09a721bcb6..8a7c5bab72 100644
--- a/Open-ILS/web/opac/locale/en-US/reports.dtd
+++ b/Open-ILS/web/opac/locale/en-US/reports.dtd
@@ -1,5 +1,5 @@
 <!-- Common Entities -->
-<!ENTITY reports.common.logged_in_as "You are logged in as ">
+<!ENTITY reports.common.logged_in_as "You are logged in as [_1]">
 <!ENTITY reports.common.loading "Loading...">
 
 <!ENTITY reports.oils_rpt.title "Evergreen: Reports">
diff --git a/Open-ILS/web/reports/oils_rpt.js b/Open-ILS/web/reports/oils_rpt.js
index 67d6654338..3c0793ee16 100644
--- a/Open-ILS/web/reports/oils_rpt.js
+++ b/Open-ILS/web/reports/oils_rpt.js
@@ -11,7 +11,8 @@ function oilsInitReports() {
 
 	var cgi = new CGI();
 	fetchUser(cgi.param('ses'));
-	DOM.oils_rpt_user.appendChild(text(USER.usrname()));
+	var weu = document.getElementById('oils_rpt_user');
+	weu.innerHTML = format_string(weu.textContent, '<b>' + USER.usrname() + '</b>');
 
 	if( cgi.param('dbg') ) oilsRptDebugEnabled = true;
 
diff --git a/Open-ILS/web/reports/oils_rpt.xhtml b/Open-ILS/web/reports/oils_rpt.xhtml
index 9aa70a554d..77e3e7e028 100644
--- a/Open-ILS/web/reports/oils_rpt.xhtml
+++ b/Open-ILS/web/reports/oils_rpt.xhtml
@@ -27,7 +27,7 @@
 
 	<body>
 		<div class='welcome_box'>
-			<span>&reports.common.logged_in_as;</span><b><span id='oils_rpt_user'></span></b>
+			<span id='oils_rpt_user'>&reports.common.logged_in_as;</span>
 		</div>
 
 		<div id='oils_rpt_permission_denied' class='hide_me'>
diff --git a/Open-ILS/web/reports/oils_rpt_builder.xhtml b/Open-ILS/web/reports/oils_rpt_builder.xhtml
index 3107750720..3f37f0e8cb 100644
--- a/Open-ILS/web/reports/oils_rpt_builder.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_builder.xhtml
@@ -24,7 +24,7 @@
 	<body>
 
 		<div class='welcome_box'>
-			<span>&reports.common.logged_in_as;</span><b><span id='oils_rpt_user'></span></b>
+			<span id='oils_rpt_user'>&reports.common.logged_in_as;</span>
 		</div>
 
 		<div>
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js b/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
index d1be18631d..b58262ca07 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
@@ -4,6 +4,13 @@
 
     function $(id) { return document.getElementById(id); }
 
+    function format_string() {
+	var str = arguments[0];
+	for (var i = 1; i < arguments.length; i++)
+	    str = str.replace(new RegExp("\\[_"+i+"\\]", "g"), arguments[i].toString());
+	return str;
+    }
+
     function oils_unsaved_data_V() {
         JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
         data.stash_retrieve();
diff --git a/Open-ILS/xul/staff_client/server/admin/closed_dates.js b/Open-ILS/xul/staff_client/server/admin/closed_dates.js
index d784ff6627..b8b1f49e82 100644
--- a/Open-ILS/xul/staff_client/server/admin/closed_dates.js
+++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.js
@@ -23,6 +23,34 @@ var myPerms = [
 
 function cdEditorInit() {
 
+    var re = $('staff.server.admin.closed_dates.allmultiday.label');
+    var p1 = $('cd_allmultiday_param_1');
+    var p2 = $('cd_allmultiday_param_2');
+    re.innerHTML = format_string(re.textContent,
+				 p1.parentNode.removeChild(p1).innerHTML,
+				 p2.parentNode.removeChild(p2).innerHTML
+				);
+
+
+    re = $('cd_row').firstElementChild;
+    re.innerHTML = format_string($('cd_row_data_text').textContent,
+				 "<b name='start_date'></b>",
+				 "<b name='start_time'/></b>",
+				 "<b name='end_date'/></b>",
+				 "<b name='end_time'/></b>"
+				);
+
+    re = $('cd_allday_row').firstElementChild;
+    re.innerHTML = format_string($('cd_allday_row_data_text').textContent,
+				 "<b name='start_date'></b>"
+				);
+
+    re = $('cd_allmultiday_row').firstElementChild;
+    re.innerHTML = format_string($('cd_allmultiday_row_data_text').textContent,
+				 "<b name='start_date'></b>",
+				 "<b name='end_date'/></b>"
+				);
+
     /* set the various template rows */
     cdTbody = $('cd_tbody');
     cdRowTemplate                    = cdTbody.removeChild($('cd_row'));
@@ -32,7 +60,8 @@ function cdEditorInit() {
     cdInitCals();
 
     fetchUser();
-    $('cd_user').appendChild(text(USER.usrname()));
+    var we = $('cd_user');
+    we.innerHTML = format_string(we.textContent, '<b>' + USER.usrname() + '</b>');
 
     setTimeout( 
         function() { 
diff --git a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
index c831f7d999..cf81ad00cc 100644
--- a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
@@ -42,7 +42,7 @@
     <body onload='try{cdEditorInit();}catch(e){alert(js2JSON(e));}'>
 
         <div class='welcome_box'>
-            <span>&staff.server.admin.closed_dates.welcome;</span><b><span id='cd_user'></span></b>
+            <span id='cd_user'>&staff.server.admin.closed_dates.welcome;</span>
         </div>
 
         <center>
@@ -63,31 +63,22 @@
                 <tbody id='cd_tbody'>
 
                     <tr id='cd_row'>
-                        <td align='left'>
-                            From
-                            <b name='start_date'/> at <b name='start_time'/>
-                            <span> through </span>
-                            <b name='end_date'/> at <b name='end_time'/>
-                        </td>
+                        <td align='left'></td>
                         <td><div name='note'></div></td>
-                        <td><button name='delete'>delete</button></td>
+                        <td><button name='delete'>&staff.server.admin.closed_dates.editor.delete_btn;</button></td>
                     </tr>
 
                     <tr id='cd_allday_row'>
-                        <td align='left'>
-                            All Day <b name='start_date'/>
-                        </td>
+                        <td align='left'></td>
                         <td><div name='note'></div></td>
-                        <td><button name='delete'>delete</button></td>
+                        <td><button name='delete'>&staff.server.admin.closed_dates.editor.delete_btn;</button></td>
                     </tr>
 
 
                     <tr id='cd_allmultiday_row'>
-                        <td align='left'>
-                            Every Day From <b name='start_date'/> through <b name='end_date'/>
-                        </td>
+                        <td align='left'></td>
                         <td><div name='note'></div></td>
-                        <td><button name='delete'>&staff.server.admin.closed_dates.editor.allmultiday.delete;</button></td>
+                        <td><button name='delete'>&staff.server.admin.closed_dates.editor.delete_btn;</button></td>
                     </tr>
 
                 </tbody>
@@ -184,17 +175,7 @@
         
                     <tr id='cd_edit_allmultiday_row' class='hide_me'>
                         <td>    
-
-                            <span> All Day From </span>
-                            <input id='cd_edit_allmultiday_start_date' type='text' size='10' maxlength='10'/>
-                            <img src="/opac/common/js/jscalendar/img.gif"  
-                                id='cd_edit_allmultiday_start_date_img' class='cal_img'/>
-
-                            <span> Through</span>
-
-                            <input id='cd_edit_allmultiday_end_date' type='text' size='10' maxlength='10'/>
-                            <img src="/opac/common/js/jscalendar/img.gif"  
-                                id='cd_edit_allmultiday_end_date_img' class='cal_img'/>
+                            <span id='staff.server.admin.closed_dates.allmultiday.label'>&staff.server.admin.closed_dates.allmultiday.label;</span>
                         </td>
                     </tr>
 
@@ -227,6 +208,21 @@
             <span class='hide_me' id='cd_update_success'>&staff.server.admin.closed_dates.success;</span>
             <span class='hide_me' id='cd_invalid_date_span'>&staff.server.admin.closed_dates.date_span.invalid;</span>
         
+            <span class='hide_me' id='cd_row_data_text'>&staff.server.admin.closed_dates.row.label;</span>
+            <span class='hide_me' id='cd_allday_row_data_text'>&staff.server.admin.closed_dates.allday_row.label;</span>
+            <span class='hide_me' id='cd_allmultiday_row_data_text'>&staff.server.admin.closed_dates.allmultiday_row.label;</span>
+
+            <span id='cd_strformat_params' class='hide_me'>
+            <span class='hide_me' id='cd_allmultiday_param_1'>
+              <input id='cd_edit_allmultiday_start_date' type='text' size='10' maxlength='10'/>
+              <img src='/opac/common/js/jscalendar/img.gif' id='cd_edit_allmultiday_start_date_img' class='cal_img'/>
+            </span>
+            <span class='hide_me' id='cd_allmultiday_param_2'>
+              <input id='cd_edit_allmultiday_end_date' type='text' size='10' maxlength='10'/>
+              <img src='/opac/common/js/jscalendar/img.gif' id='cd_edit_allmultiday_end_date_img' class='cal_img'/>
+            </span>
+            </span>
+
         </center>
     </body>
 </html>
diff --git a/Open-ILS/xul/staff_client/server/index.xhtml b/Open-ILS/xul/staff_client/server/index.xhtml
index 6421e392bb..a1ae357752 100644
--- a/Open-ILS/xul/staff_client/server/index.xhtml
+++ b/Open-ILS/xul/staff_client/server/index.xhtml
@@ -92,7 +92,8 @@
                         JSAN.use('OpenILS.data'); 
                         var data = new OpenILS.data(); 
                         data.stash_retrieve(); 
-                        document.getElementById('staffname').innerHTML = ", " + data.list.au[0].first_given_name(); 
+                        var we = $('staffname');
+                        we.innerHTML = format_string(we.textContent, data.list.au[0].first_given_name());
                         home_ou_id = data.list.au[0].ws_ou();
                         xulG.set_tab_name(get_i18n_str('staff.client.portal.tab_name'));
                 }
@@ -348,7 +349,7 @@
 <body class="c4" onload="init();">
   <div class="c1">
     <img src="skin/media/images/portal/logo.png" height="121" width="396" alt="Evergreen logo" /><br />
-    &staff.client.portal.welcome;<span id="staffname"></span><br />
+    <span id="staffname">&staff.client.portal.welcome;</span><br />
     <br />
   </div>
 
-- 
2.11.0