Author: jleroux
Date: Fri Dec 4 23:38:25 2009
New Revision: 887454
URL: http://svn.apache.org/viewvc?rev=887454&view=rev
Log:
Complete calendar i18n initialization
Modified:
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=887454&r1=887453&r2=887454&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Fri Dec 4 23:38:25
2009
@@ -112,14 +112,15 @@
<!-- Global decorator for General Screens/Pages -->
<screen name="GlobalDecorator">
<section>
- <actions>
+ <actions>
<!-- The default (global) java scripts -->
<set field="layoutSettings.javaScripts[+0]"
value="/images/prototypejs/scriptaculous.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]"
value="/images/prototypejs/prototype.js" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/images/calendarDateSelect/calendar_date_select.js" global="true"/>
- <set field="layoutSettings.javaScripts[]"
value="/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale}.js"
global="true"/>
+ <set field="initialLocale" type="String"
value="${parameters.userLogin.lastLocale}"
default-value="${groovy:locale.toString()}"/>
+ <set field="layoutSettings.javaScripts[]"
value="/images/calendarDateSelect/locale/${initialLocale}.js" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/images/GooglemapMarkers.js" global="true"/>
<set field="layoutSettings.commonHeaderImageLinkUrl"
from-field="layoutSettings.commonHeaderImageLinkUrl" default-value="main"
global="true"/>
<set field="visualThemeId"
from-field="userPreferences.VISUAL_THEME" default-value="BIZZNESS_TIME"
global="true"/>
@@ -291,7 +292,8 @@
<set field="layoutSettings.javaScripts[]"
value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/images/prototypejs/prototype.js" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/images/calendarDateSelect/calendar_date_select.js" global="true"/>
- <set field="layoutSettings.javaScripts[]"
value="/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale}.js"
global="true"/>
+ <set field="initialLocale" type="String"
value="${parameters.userLogin.lastLocale}"
default-value="${groovy:locale.toString()}"/>
+ <set field="layoutSettings.javaScripts[]"
value="/images/calendarDateSelect/locale/${initialLocale}.js" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/images/GooglemapSimple.js" global="true"/>
<!-- The default (global) shortcut icon -->
<set field="layoutSettings.shortcutIcon"
value="/images/ofbiz.ico" global="true"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=887454&r1=887453&r2=887454&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Fri Dec 4
23:38:25 2009
@@ -42,7 +42,8 @@
<set field="layoutSettings.javaScripts[]"
value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/images/calendarDateSelect/calendar_date_select.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]"
value="/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale}.js"
global="true"/>
+ <set field="initialLocale" type="String"
value="${parameters.userLogin.lastLocale}"
default-value="${groovy:locale.toString()}"/>
+ <set field="layoutSettings.javaScripts[]"
value="/images/calendarDateSelect/locale/${initialLocale}.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]"
value="/images/prototypejs/effects.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]"
value="/images/prototypejs/validation.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]"
value="/images/prototypejs/prototype.js" global="true"/>
@@ -246,7 +247,8 @@
<set field="layoutSettings.javaScripts[]"
value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/images/calendarDateSelect/calendar_date_select.js" global="true"/>
- <set field="layoutSettings.javaScripts[]"
value="/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale}.js"
default-value="en.js" global="true"/>
+ <set field="initialLocale" type="String"
value="${parameters.userLogin.lastLocale}"
default-value="${groovy:locale.toString()}"/>
+ <set field="layoutSettings.javaScripts[]"
value="/images/calendarDateSelect/locale/${initialLocale}.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]"
value="/images/prototypejs/effects.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]"
value="/images/prototypejs/validation.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]"
value="/images/prototypejs/prototype.js" global="true"/>
