Changeset 5201

Timestamp:

08/09/06 01:24:37 (2 years ago)

Author:

peller

Message:

i18n for ValidationTextbox?, Spinner widgets

Location:

trunk/src/widget

Files:

• nls (added)
• nls/validate.js (added)
• Spinner.js (modified) (1 diff)
• templates/Spinner.html (modified) (1 diff)
• templates/ValidationTextbox.html (modified) (1 diff)
• validate.js (modified) (6 diffs)

trunk/src/widget/Spinner.js

@@ -218 +218 @@
 
                 postMixInProperties: function(args, frag){
+                        this.inherited("postMixInProperties");
+
                         // set image size before instantiating template;
                         // changing it aftwards doesn't work on FF

trunk/src/widget/templates/Spinner.html

@@ -18 +18 @@
                         </td>
                 </tr>
-        </table><!--
-        --><span dojoAttachPoint='invalidSpan' class='${this.invalidClass}'>${this.invalidMessage}</span><!--
-        --><span dojoAttachPoint='missingSpan' class='${this.missingClass}'>${this.missingMessage}</span><!--
-        --><span dojoAttachPoint='rangeSpan' class='${this.rangeClass}'>${this.rangeMessage}</span><!--
---></span>
+        </table>
+        <span dojoAttachPoint='invalidSpan' class='${this.invalidClass}'>${this.messages.invalidMessage}</span>
+        <span dojoAttachPoint='missingSpan' class='${this.missingClass}'>${this.messages.missingMessage}</span>
+        <span dojoAttachPoint='rangeSpan' class='${this.rangeClass}'>${this.messages.rangeMessage}</span>
+</span>

trunk/src/widget/templates/ValidationTextbox.html

@@ -3 +3 @@
                 id='${this.widgetId}' name='${this.name}' size='${this.size}' maxlength='${this.maxlength}'
                 value='${this.value}' class='${this.className}' style=''>
-        <span dojoAttachPoint='invalidSpan' class='${this.invalidClass}'>${this.invalidMessage}</span>
-        <span dojoAttachPoint='missingSpan' class='${this.missingClass}'>${this.missingMessage}</span>
-        <span dojoAttachPoint='rangeSpan' class='${this.rangeClass}'>${this.rangeMessage}</span>
+        <span dojoAttachPoint='invalidSpan' class='${this.invalidClass}'>${this.messages.invalidMessage}</span>
+        <span dojoAttachPoint='missingSpan' class='${this.missingClass}'>${this.messages.missingMessage}</span>
+        <span dojoAttachPoint='rangeSpan' class='${this.rangeClass}'>${this.messages.rangeMessage}</span>
 </span>

trunk/src/widget/validate.js

@@ -6 +6 @@
 dojo.require("dojo.widget.Parse");
 dojo.require("dojo.xml.Parse");
-dojo.require("dojo.lang");
+dojo.require("dojo.lang.array");
+dojo.require("dojo.lang.common");
 
 dojo.require("dojo.validate.common");
@@ -13 +14 @@
 dojo.require("dojo.validate.web");
 dojo.require("dojo.validate.us");
+
+dojo.require("dojo.i18n.common");
+dojo.requireLocalization("dojo.widget", "validate");
 
 dojo.widget.manager.registerWidgetPackage("dojo.widget.validate");
@@ -138 +142 @@
                 maxlength: "",
                 promptMessage: "",
-                invalidMessage: "* The value entered is not valid.",
-                missingMessage: "* This value is required.",
-                rangeMessage: "* This value out of range.",
+                invalidMessage: "",
+                missingMessage: "",
+                rangeMessage: "",
                 listenOnKeyPress: true,
                 htmlfloat: "none",
@@ -234 +238 @@
                         }
                 },
+
+                postMixInProperties: function(localProperties, frag) {
+                        dojo.widget.validate.ValidationTextbox.superclass.postMixInProperties.apply(this, arguments);
+                        this.messages = dojo.i18n.getLocalization("dojo.widget", "validate");
+                        dojo.lang.forEach(["invalidMessage", "missingMessage", "rangeMessage"], function(prop) {
+                                if(this[prop]){ this.messages[prop] = this[prop]; }
+                        }, this);
+                },
         
                 // FIXME: why are there to fillInTemplate methods defined here?
@@ -370 +382 @@
   Has 5 new properties that can be specified as attributes in the markup.
 
-  @attr cents      The two decimal places for cents.  Can be true or false, optional if omitted.
+  @attr fractional      The decimal places (e.g. for cents).  Can be true or false, optional if omitted.
   @attr symbol     A currency symbol such as Yen "???", Pound "???", or the Euro "???". Default is "$".
   @attr separator  Default is "," instead of no separator as in IntegerTextbox.
@@ -385 +397 @@
         
                         // Get properties from markup attributes, and assign to flags object.
-                        if ( localProperties.cents ) { 
-                                this.flags.cents = ( localProperties.cents == "true" );
+                        if ( localProperties.fractional ) { 
+                                this.flags.fractional = ( localProperties.fractional == "true" );
+                        } else if ( localProperties.cents ) {
+                                dojo.deprecated("dojo.widget.validate.IntegerTextbox", "use fractional attr instead of cents", "0.5");
+                                this.flags.fractional = ( localProperties.cents == "true" );
                         }
                         if ( localProperties.symbol ) {