Author: jkuhnert
Date: Sat Nov 4 15:25:17 2006
New Revision: 471295
URL: http://svn.apache.org/viewvc?view=rev&rev=471295
Log:
Final set of fixes for properly specifying locale. The page in the dojo
documentation referenced actually made a
point that the format is NOT that used in the jdk.
(<lowercaselanguage>-<lowercasecountry>)
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/InspectorButton.jwc
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/dojo.js
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestDropdownTimePicker.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/InspectorButton.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/InspectorButton.jwc?view=diff&rev=471295&r1=471294&r2=471295
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/InspectorButton.jwc
(original)
+++
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/InspectorButton.jwc
Sat Nov 4 15:25:17 2006
@@ -42,7 +42,6 @@
<component id="ifNotDisabled" type="If">
<binding name="condition" value="! disabled"/>
- <binding name="element" value="literal:div"/>
</component>
<bean name="renderer"
class="org.apache.tapestry.contrib.link.PopupLinkRenderer">
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=471295&r1=471294&r2=471295
==============================================================================
---
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
Sat Nov 4 15:25:17 2006
@@ -13,6 +13,8 @@
// limitations under the License.
package org.apache.tapestry.dojo;
+import java.util.Locale;
+
import org.apache.hivemind.util.Defense;
import org.apache.tapestry.IAsset;
import org.apache.tapestry.IMarkupWriter;
@@ -80,7 +82,13 @@
dojoConfig.put("preventBackButtonFix", _preventBackButtonFix);
dojoConfig.put("parseWidgets", _parseWidgets);
- dojoConfig.put("locale", cycle.getPage().getLocale().toString());
+
+ Locale locale = cycle.getPage().getLocale();
+
+ dojoConfig.put("locale",
+ locale.getLanguage().toLowerCase()
+ + "-"
+ + locale.getCountry().toLowerCase());
StringBuffer str = new StringBuffer("<script
type=\"text/javascript\">");
str.append("djConfig = ").append(dojoConfig.toString())
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.java?view=diff&rev=471295&r1=471294&r2=471295
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.java
Sat Nov 4 15:25:17 2006
@@ -80,7 +80,6 @@
json.put("inputName", getName());
json.put("iconAlt", getIconAlt());
json.put("displayFormat", translator.getPattern());
- json.put("lang", getPage().getLocale().toString());
if (getValue() != null) {
json.put("value", getValue().getTime());
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.java?view=diff&rev=471295&r1=471294&r2=471295
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.java
Sat Nov 4 15:25:17 2006
@@ -81,7 +81,6 @@
json.put("inputName", getName());
json.put("iconAlt", getIconAlt());
json.put("displayFormat", translator.getPattern());
- json.put("lang", getPage().getLocale());
if (getValue() != null) {
json.put("value",
DateFormatUtils.ISO_TIME_NO_T_TIME_ZONE_FORMAT.format(getValue()));
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java?view=diff&rev=471295&r1=471294&r2=471295
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java
Sat Nov 4 15:25:17 2006
@@ -85,8 +85,6 @@
JSONObject profile = context.getProfile();
context.addInitializationScript(field,
"dojo.require(\"tapestry.form.datetime\");");
- context.addInitializationScript(field,
-
"dojo.requireLocalization(\"dojo.i18n.calendar\",\"gregorian\",\"" +
context.getLocale() + "\");");
if (!profile.has(ValidationConstants.CONSTRAINTS)) {
profile.put(ValidationConstants.CONSTRAINTS, new JSONObject());
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java?view=diff&rev=471295&r1=471294&r2=471295
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java
Sat Nov 4 15:25:17 2006
@@ -91,8 +91,6 @@
JSONObject profile = context.getProfile();
context.addInitializationScript(field,
"dojo.require(\"tapestry.form.datetime\");");
- context.addInitializationScript(field,
-
"dojo.requireLocalization(\"dojo.i18n.calendar\",\"gregorian\",\"" +
context.getLocale() + "\");");
if (!profile.has(ValidationConstants.CONSTRAINTS)) {
profile.put(ValidationConstants.CONSTRAINTS, new JSONObject());
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/dojo.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/dojo.js?view=diff&rev=471295&r1=471294&r2=471295
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/dojo.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/dojo.js Sat Nov 4
15:25:17 2006
@@ -54,7 +54,7 @@
obj=obj[p[i]];}
return true;};dojo.hostenv.normalizeLocale=function(_6e){return
_6e?_6e.toLowerCase():dojo.locale;};dojo.hostenv.searchLocalePath=function(_6f,_70,_71){_6f=dojo.hostenv.normalizeLocale(_6f);var
_72=_6f.split("-");var _73=[];for(var
i=_72.length;i>0;i--){_73.push(_72.slice(0,i).join("-"));}
_73.push(false);if(_70){_73.reverse();}
-for(var j=_73.length-1;j>=0;j--){var loc=_73[j]||"ROOT";var
_77=_71(loc);if(_77){break;}}};dojo.hostenv.localesGenerated=["ROOT","es-es","es","it-it","pt-br","de","fr-fr","zh-cn","pt","en-us","zh","fr","zh-tw","it","en-gb","xx","de-de","ko-kr","ja-jp","ko","en","ja"];dojo.hostenv.registerNlsPrefix=function(){dojo.registerModulePath("nls","nls");};dojo.hostenv.preloadLocalizations=function(){if(dojo.hostenv.localesGenerated){dojo.hostenv.registerNlsPrefix();function
preload(_78){_78=dojo.hostenv.normalizeLocale(_78);dojo.hostenv.searchLocalePath(_78,true,function(loc){for(var
i=0;i<dojo.hostenv.localesGenerated.length;i++){if(dojo.hostenv.localesGenerated[i]==loc){dojo["require"]("nls.dojo_"+loc);return
true;}}
+for(var j=_73.length-1;j>=0;j--){var loc=_73[j]||"ROOT";var
_77=_71(loc);if(_77){break;}}};dojo.hostenv.localesGenerated=["ROOT","es-es","es","it-it","pt-br","de","fr-fr","zh-cn","pt","en-us","zh","fr","zh-tw","it","en-gb","xx","de-de","ko-kr","ja-jp","ko","en","ja"];dojo.hostenv.registerNlsPrefix=function(){dojo.registerModulePath("nls","nls");};dojo.hostenv.preloadLocalizations=function(){if(dojo.hostenv.localesGenerated){dojo.hostenv.registerNlsPrefix();function
preload(_78){dojo.log.debug("locale passed in is " +
_78);_78=dojo.hostenv.normalizeLocale(_78);dojo.hostenv.searchLocalePath(_78,true,function(loc){for(var
i=0;i<dojo.hostenv.localesGenerated.length;i++){if(dojo.hostenv.localesGenerated[i]==loc){dojo["require"]("nls.dojo_"+loc);return
true;}}
return false;});}
preload();var _7b=djConfig.extraLocale||[];for(var
i=0;i<_7b.length;i++){preload(_7b[i]);}}
dojo.hostenv.preloadLocalizations=function(){};};dojo.requireLocalization=function(_7d,_7e,_7f){dojo.hostenv.preloadLocalizations();var
_80=[_7d,"nls",_7e].join(".");var
_81=dojo.hostenv.findModule(_80);if(_81){if(djConfig.localizationComplete&&_81._built){return;}
@@ -1314,4 +1314,4 @@
this.animationInProgress=true;this.toggleObj.hide(this.domNode,this.toggleDuration,null,dojo.lang.hitch(this,this.onHide),this.explodeSrc);},onHide:function(){this.animationInProgress=false;},_isResized:function(w,h){if(!this.isShowing()){return
false;}
var wh=dojo.html.getMarginBox(this.domNode);var _8e7=w||wh.width;var
_8e8=h||wh.height;if(this.width==_8e7&&this.height==_8e8){return false;}
this.width=_8e7;this.height=_8e8;return
true;},checkSize:function(){if(!this._isResized()){return;}
-this.onResized();},resizeTo:function(w,h){dojo.html.setMarginBox(this.domNode,{width:w,height:h});if(this.isShowing()){this.onResized();}},resizeSoon:function(){if(this.isShowing()){dojo.lang.setTimeout(this,this.onResized,0);}},onResized:function(){dojo.lang.forEach(this.children,function(_8eb){if(_8eb.checkSize){_8eb.checkSize();}});}});dojo.provide("dojo.widget.*");
\ No newline at end of file
+this.onResized();},resizeTo:function(w,h){dojo.html.setMarginBox(this.domNode,{width:w,height:h});if(this.isShowing()){this.onResized();}},resizeSoon:function(){if(this.isShowing()){dojo.lang.setTimeout(this,this.onResized,0);}},onResized:function(){dojo.lang.forEach(this.children,function(_8eb){if(_8eb.checkSize){_8eb.checkSize();}});}});dojo.provide("dojo.widget.*");
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java?view=diff&rev=471295&r1=471294&r2=471295
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java
Sat Nov 4 15:25:17 2006
@@ -88,7 +88,7 @@
assertBuffer("<script type=\"text/javascript\">djConfig =
{\"isDebug\":false,"
+
"\"debugAtAllCosts\":false,\"baseRelativePath\":\"http:///dojo/path\",";
-
+"\"preventBackButtonFix\":false,\"parseWidgets\":false,\"locale\":\"en_US\"}
</script>\n" +
+
+"\"preventBackButtonFix\":false,\"parseWidgets\":false,\"locale\":\"en-us\"}
</script>\n" +
"\n" +
" <script type=\"text/javascript\"
src=\"http:///dojo/path/dojo.js\";></script>"
+"<script type=\"text/javascript\"
src=\"http:///tapestry/tapestry.js\";></script>\n" +
@@ -133,7 +133,7 @@
assertBuffer("<script type=\"text/javascript\">djConfig =
{\"isDebug\":false,"
+
"\"debugAtAllCosts\":false,\"baseRelativePath\":\"http:///dojo/path\",";
-
+"\"preventBackButtonFix\":false,\"parseWidgets\":false,\"locale\":\"en_GB\"}
</script>\n" +
+
+"\"preventBackButtonFix\":false,\"parseWidgets\":false,\"locale\":\"en-gb\"}
</script>\n" +
"\n" +
" <script type=\"text/javascript\"
src=\"http:///dojo/path/dojo.js\";></script>"
+"<script type=\"text/javascript\"
src=\"http:///tapestry/tapestry.js\";></script>\n" +
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestDropdownTimePicker.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestDropdownTimePicker.java?view=diff&rev=471295&r1=471294&r2=471295
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestDropdownTimePicker.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestDropdownTimePicker.java
Sat Nov 4 15:25:17 2006
@@ -19,7 +19,6 @@
import static org.easymock.EasyMock.isA;
import java.util.Date;
-import java.util.Locale;
import java.util.Map;
import org.apache.tapestry.IForm;
@@ -94,8 +93,6 @@
delegate.setFormComponent(component);
vfs.renderContributions(component, writer, cycle);
-
- expect(page.getLocale()).andReturn(Locale.ENGLISH);
PageRenderSupport prs = newPageRenderSupport();
trainGetPageRenderSupport(cycle, prs);
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java?view=diff&rev=471295&r1=471294&r2=471295
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java
Sat Nov 4 15:25:17 2006
@@ -158,9 +158,6 @@
expect(context.getProfile()).andReturn(json);
context.addInitializationScript(field,
"dojo.require(\"tapestry.form.datetime\");");
- context.addInitializationScript(field,
-
"dojo.requireLocalization(\"dojo.i18n.calendar\",\"gregorian\",\""
- + locale + "\");");
String strMax = translator.format(field, locale, maxDate);
@@ -207,9 +204,6 @@
expect(context.getProfile()).andReturn(json);
context.addInitializationScript(field,
"dojo.require(\"tapestry.form.datetime\");");
- context.addInitializationScript(field,
-
"dojo.requireLocalization(\"dojo.i18n.calendar\",\"gregorian\",\""
- + locale + "\");");
String strMax = translator.format(field, locale, maxDate);
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java?view=diff&rev=471295&r1=471294&r2=471295
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java
Sat Nov 4 15:25:17 2006
@@ -158,9 +158,6 @@
expect(context.getProfile()).andReturn(json);
context.addInitializationScript(field,
"dojo.require(\"tapestry.form.datetime\");");
- context.addInitializationScript(field,
-
"dojo.requireLocalization(\"dojo.i18n.calendar\",\"gregorian\",\""
- + locale + "\");");
String strMin = translator.format(field, locale, minDate);
@@ -207,9 +204,6 @@
expect(context.getProfile()).andReturn(json);
context.addInitializationScript(field,
"dojo.require(\"tapestry.form.datetime\");");
- context.addInitializationScript(field,
-
"dojo.requireLocalization(\"dojo.i18n.calendar\",\"gregorian\",\""
- + locale + "\");");
String strMin = translator.format(field, locale, minDate);
