Author: andyhot
Date: Tue Nov 7 07:45:18 2006
New Revision: 472143
URL: http://svn.apache.org/viewvc?view=rev&rev=472143
Log:
Many locales have empty country, i.e. en or el. They would become en- and el-
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java?view=diff&rev=472143&r1=472142&r2=472143
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
Tue Nov 7 07:45:18 2006
@@ -83,12 +83,10 @@
dojoConfig.put("preventBackButtonFix", _preventBackButtonFix);
dojoConfig.put("parseWidgets", _parseWidgets);
- Locale locale = cycle.getPage().getLocale();
+ String locale = cycle.getPage().getLocale().toString().toLowerCase();
+ locale = locale.replace('_', '-');
- dojoConfig.put("locale",
- locale.getLanguage().toLowerCase()
- + "-"
- + locale.getCountry().toLowerCase());
+ dojoConfig.put("locale", locale);
StringBuffer str = new StringBuffer("<script
type=\"text/javascript\">");
str.append("djConfig = ").append(dojoConfig.toString())
