svn commit: r887166 - in /ofbiz/trunk: framework/common/webcommon/inc
Locked
svn commit: r887166 - in /ofbiz/trunk: framework/common/webcommon/inc
 
|
Author: jleroux
Date: Fri Dec 4 12:07:48 2009 New Revision: 887166 URL: http://svn.apache.org/viewvc?rev=887166&view=rev Log: I realized that in some cases it's better to keep the country part of locale, so this is better than r887164 (Fix a calendar i18n initialization issue in lookup.ftl) And generalized to all FTL files where needed. I only tested for lookups, but should be ok, since the same trick is used in other FTL files. Modified: ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl Modified: ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl?rev=887166&r1=887165&r2=887166&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Fri Dec 4 12:07:48 2009 @@ -18,6 +18,7 @@ --> <#assign docLangAttr = locale.toString()?replace("_", "-")> +<#assign initialLocale = locale.toString()> <#assign langDir = "ltr"> <#if "ar.iw"?contains(docLangAttr?substring(0, 2))> <#assign langDir = "rtl"> @@ -31,7 +32,7 @@ <script language="javascript" src="<@ofbizContentUrl>/images/fieldlookup.js</@ofbizContentUrl>" type="text/javascript"></script> <script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script> <script language="javascript" src="<@ofbizContentUrl>/images/calendarDateSelect/calendar_date_select.js</@ofbizContentUrl>" type="text/javascript"></script> - <script language="javascript" src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale!docLangAttr}.js</@ofbizContentUrl>" type="text/javascript"></script> + <script language="javascript" src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale!initialLocale}.js</@ofbizContentUrl>" type="text/javascript"></script> <#if layoutSettings.javaScripts?has_content> <#--layoutSettings.javaScripts is a list of java scripts. --> <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order --> Modified: ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl?rev=887166&r1=887165&r2=887166&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl (original) +++ ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl Fri Dec 4 12:07:48 2009 @@ -19,6 +19,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> +<#assign initialLocale = locale.toString()> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>${(decoratedContent.subcontent.title.render)?default("CMS Site Generic Title (Set subcontent 'title' on your content!)")}</title> @@ -27,7 +28,7 @@ <script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script> <script language="javascript" src="/images/selectall.js" type="text/javascript"></script> <script language="javascript" src="/images/calendarDateSelect/calendar_date_select.js" type="text/javascript"></script> - <script language="javascript" src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale!"en"}.js</@ofbizContentUrl>" type="text/javascript"></script> + <script language="javascript" src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale!initialLocale}.js</@ofbizContentUrl>" type="text/javascript"></script> <link rel="stylesheet" href="/images/ecommain.css" type="text/css"/> <link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/> <link rel="stylesheet" href="/content/images/contentForum.css" type="text/css"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl?rev=887166&r1=887165&r2=887166&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl Fri Dec 4 12:07:48 2009 @@ -17,6 +17,7 @@ under the License. --> +<#assign initialLocale = locale.toString()> <html> <head> <title>Automation Groups - Main</title> @@ -25,7 +26,7 @@ <script language="javascript" src="<@ofbizContentUrl>/images/fieldlookup.js</@ofbizContentUrl>" type="text/javascript"></script> <script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script> <script language="javascript" src="<@ofbizContentUrl>/images/calendarDateSelect/calendar_date_select.js</@ofbizContentUrl>" type="text/javascript"></script> - <script language="javascript" src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale!"en"}.js</@ofbizContentUrl>" type="text/javascript"></script> + <script language="javascript" src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale!initialLocale}.js</@ofbizContentUrl>" type="text/javascript"></script> <link rel='stylesheet' href='<@ofbizContentUrl>/images/maincss.css</@ofbizContentUrl>' type='text/css'> <link rel='stylesheet' href='<@ofbizContentUrl>/images/tabstyles.css</@ofbizContentUrl>' type='text/css'> <link rel='stylesheet' href='<@ofbizContentUrl>/ecommerce/images/blog.css</@ofbizContentUrl>' type='text/css'> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |