You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/11/21 12:48:40 UTC
svn commit: r1037428 -
/ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml
Author: jleroux
Date: Sun Nov 21 11:48:39 2010
New Revision: 1037428
URL: http://svn.apache.org/viewvc?rev=1037428&view=rev
Log:
Simpler and better version of the date-time picker i18n
Also I forgot to remove the log labels in r1037424
Modified:
ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml
Modified: ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml?rev=1037428&r1=1037427&r2=1037428&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml Sun Nov 21 11:48:39 2010
@@ -129,9 +129,8 @@ under the License.
<set field="localeFileNameComplete" type="String" value="/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-${initialLocaleComplete}.js"/>
<set field="localeFileNameComplete" type="String" value="${groovy: localeFileNameComplete.replace('_', '-')}"/> <!-- those files are build this way OOTB (ie a - not a _ between language and country -->
<set field="fileNameComplete" type="String" value="${groovy: org.ofbiz.base.location.FlexibleLocation.resolveLocation('component://images/webapp' + localeFileNameComplete)}"/>
- <set field="fileNameComplete" type="String" value="${groovy: fileNameComplete.replace('file:/', '')}"/>
<set field="localeFileName" type="String" value="/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-${initialLocale}.js"/>
- <set field="localeJsFile" type="String" value="${groovy: File localeFileComplete = new File(fileNameComplete); localeFileComplete.exists() ? localeFileNameComplete : localeFileName}"/>
+ <set field="localeJsFile" type="String" value="${groovy: fileNameComplete ? localeFileNameComplete : localeFileName}"/>
<set field="layoutSettings.javaScripts[+0]" value="${localeJsFile}" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.2.min.js" global="true"/>
@@ -217,13 +216,6 @@ under the License.
<!-- render content area -->
<container style="contentarea">
- <label>initialLocaleComplete ${initialLocaleComplete}</label>
- <label>initialLocale ${initialLocale}</label>
- <label>localeFileNameComplete ${localeFileNameComplete}</label>
- <label>localeFileName ${localeFileName}</label>
- <label>localeJsFile ${localeJsFile}</label>
-
-
<decorator-section-include name="pre-body"/>
<decorator-section-include name="body"/>
</container>