svn commit: r1178175 - in /ofbiz/trunk: applications/content/webapp/co
Locked
svn commit: r1178175 - in /ofbiz/trunk: applications/content/webapp/co
 
|
Author: jleroux
Date: Sun Oct 2 10:42:39 2011 New Revision: 1178175 URL: http://svn.apache.org/viewvc?rev=1178175&view=rev Log: Closes "i18n for elrte editor" https://issues.apache.org/jira/browse/OFBIZ-4051 Fixes the i18n elrte Editor issue in Freemarker templates (Content and Ebay) Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl ofbiz/trunk/applications/content/widget/WebSiteScreens.xml ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl?rev=1178175&r1=1178174&r2=1178175&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl Sun Oct 2 10:42:39 2011 @@ -18,6 +18,9 @@ --> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/elrte-1.3/js/elrte.min.js</@ofbizContentUrl>"></script> +<#if language?has_content && language != "en"> +<script language="javascript" src="/images/jquery/plugins/elrte-1.3/js/i18n/elrte.${language!"en"}.js" type="text/javascript"></script><#rt/> +</#if> <link href="/images/jquery/plugins/elrte-1.3/css/elrte.min.css" rel="stylesheet" type="text/css"> @@ -364,6 +367,7 @@ var rawdata_errors = [ if($('#cmseditor').length) { var opts = { cssClass : 'el-rte', + lang : '${language}', height : 350, toolbar : 'maxi', doctype : '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">', //'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">', Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=1178175&r1=1178174&r2=1178175&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Sun Oct 2 10:42:39 2011 @@ -186,6 +186,7 @@ under the License. <entity-one entity-name="WebSite" value-field="webSite"/> <script location="component://content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy"/> + <set field="language" from-field="userLogin.lastLocale" default-value="en"/> </actions> <widgets> <screenlet title="${uiLabelMap.PageTitleWebSiteCMSNav}"> Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl?rev=1178175&r1=1178174&r2=1178175&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl (original) +++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl Sun Oct 2 10:42:39 2011 @@ -497,10 +497,14 @@ under the License. <table cellspacing="0"> <tr><td> <script language="javascript" src="/images/jquery/plugins/elrte-1.3/js/elrte.min.js" type="text/javascript"></script> + <#if language?has_content && language != "en"> + <script language="javascript" src="/images/jquery/plugins/elrte-1.3/js/i18n/elrte.${language!"en"}.js" type="text/javascript"></script><#rt/> + </#if> <link href="/images/jquery/plugins/elrte-1.3/css/elrte.min.css" rel="stylesheet" type="text/css"> <script language="javascript" type="text/javascript"> var opts = { cssClass : 'el-rte', + lang : '${language}', toolbar : 'maxi', doctype : '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">', //'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">', cssfiles : ['/images/jquery/plugins/elrte-1.3/css/elrte-inner.css'] Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml?rev=1178175&r1=1178174&r2=1178175&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml Sun Oct 2 10:42:39 2011 @@ -262,6 +262,7 @@ under the License. <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> </entity-one> <script location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy"/> + <set field="language" from-field="userLogin.lastLocale" default-value="en"/> </actions> <widgets> <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |