[open-ils-commits] r9373 - trunk/Open-ILS/web/conify/global/actor

[svn at svn.open-ils.org]

Author: miker
Date: 2008-04-17 14:54:50 -0400 (Thu, 17 Apr 2008)
New Revision: 9373

Modified:
   trunk/Open-ILS/web/conify/global/actor/org_unit.html
   trunk/Open-ILS/web/conify/global/actor/org_unit.js
   trunk/Open-ILS/web/conify/global/actor/org_unit_type.html
Log:
locale parsing based on URL knowledge (because apache is not helping); aou.name translation support

Modified: trunk/Open-ILS/web/conify/global/actor/org_unit.html
===================================================================
--- trunk/Open-ILS/web/conify/global/actor/org_unit.html	2008-04-17 18:04:26 UTC (rev 9372)
+++ trunk/Open-ILS/web/conify/global/actor/org_unit.html	2008-04-17 18:54:50 UTC (rev 9373)
@@ -51,7 +51,16 @@
 		<script language='javascript' src='/opac/common/js/fmall.js' type='text/javascript'></script>
 
 		<!-- Dojo goodness -->
-		<script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+		<script type="text/javascript">
+			var djConfig = { parseOnLoad : true };
+
+			var _url_locale = location.href.replace(/^.*conify\/(.+)\/global.*$/, "$1").toLowerCase().replace(/-/,'_');
+			if (_url_locale) djConfig.locale = _url_locale;
+			else djConfig.locale = '<!--#echo var="locale"-->';
+
+		</script>
+
+		<script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
 		<script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
 
 		<script type="text/javascript" src="org_unit.js"></script>
@@ -155,6 +164,7 @@
 						right_pane_toggler.show();
 
 						current_ou = item;
+						window.current_fm_ou = new aou().fromStoreItem(item);
 
 						highlighter.editor_pane.green.play();
 						status_update( 'Now editing ' + this.store.getValue( item, 'name' ) );
@@ -222,6 +232,7 @@
 											if (current_ou) ou_list_store.setValue( current_ou, "name", this.getValue() );
 										</script>
 									</span>
+									<span dojoType="openils.I18N.translationWidget" targetObject="current_fm_ou" field="name"></span>
 								</td>
 							</tr>
 							<tr>
@@ -530,7 +541,10 @@
 							<div id="billing_address" dojoType="dijit.layout.ContentPane" title="Physical Address">
 								<table class="tundra" style="margin:10px;">
 									<tr>
-										<th>Type</th><td colspan="3"><span jsId="billing_addr_type" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_billing_address.address_type( this.getValue() )"/></td>
+										<th>Type</th>
+										<td colspan="3">
+											<span jsId="billing_addr_type" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_billing_address.address_type( this.getValue() )"/>
+										</td>
 										<th>Valid</th><td>
 											<input
 											  type="checkbox"

Modified: trunk/Open-ILS/web/conify/global/actor/org_unit.js
===================================================================
--- trunk/Open-ILS/web/conify/global/actor/org_unit.js	2008-04-17 18:04:26 UTC (rev 9372)
+++ trunk/Open-ILS/web/conify/global/actor/org_unit.js	2008-04-17 18:54:50 UTC (rev 9373)
@@ -16,6 +16,7 @@
 */
 
 dojo.require('fieldmapper.dojoData');
+dojo.require('openils.I18N');
 dojo.require('dojo.parser');
 dojo.require('dojo.data.ItemFileWriteStore');
 dojo.require('dojo.date.stamp');

Modified: trunk/Open-ILS/web/conify/global/actor/org_unit_type.html
===================================================================
--- trunk/Open-ILS/web/conify/global/actor/org_unit_type.html	2008-04-17 18:04:26 UTC (rev 9372)
+++ trunk/Open-ILS/web/conify/global/actor/org_unit_type.html	2008-04-17 18:54:50 UTC (rev 9373)
@@ -51,7 +51,16 @@
 		<script language='javascript' src='/opac/common/js/fmall.js' type='text/javascript'></script>
 
 		<!-- Dojo goodness -->
-		<script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+		<script type="text/javascript">
+			var djConfig = { parseOnLoad : true };
+
+			var _url_locale = location.href.replace(/^.*conify\/(.+)\/global.*$/, "$1").toLowerCase().replace(/-/,'_');
+			if (_url_locale) djConfig.locale = _url_locale;
+			else djConfig.locale = '<!--#echo var="locale"-->';
+
+		</script>
+
+		<script type="text/javascript" src="/js/dojo/dojo/dojo.js"</script>
 		<script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
 
 		<script type="text/javascript" src="org_unit_type.js"></script>