Changeset 135

Timestamp:

02/28/07 17:58:23 (3 years ago)

Author:

tobi

Message:

• Added private property localeGetter assigned with default method for retrieving the locale
• Added public setter and getter methods setLocaleGetter and getLocaleGetter for writing and reading localeGetter
• Replaced occurrences of res.meta.locale with getLocaleGetter()() (fixes #11)

Files:

• trunk/code/I18n.js (modified) (4 diffs)

trunk/code/I18n.js

@@ -47 +47 @@
    
    /**
+    * The default method for retrieving the locale.
+    * @ignore
+    */
+   var localeGetter = function() {
+      return java.util.Locale.getDefault();
+   };
+   
+   /**
     * Overwrite the default object containing
     * the messages (ie. a vanilla EcmaScript object).
@@ -62 +70 @@
    this.getMessages = function() {
       return messages;
+   };
+   
+   /**
+    * Set the method for retrieving the locale.
+    * @param {Function} func The getter method
+    */
+   this.setLocaleGetter = function(func) {
+      if (func && func.constructor == Function) {
+         localeGetter = func;
+      } else {
+         throw Error("Getter method to retrieve locale must be a function");
+      }
+      return;
+   };
+   
+   /**
+    * Get the method for retrieving the locale.
+    * @returns The getter method
+    * @type Function
+    */
+   this.getLocaleGetter = function() {
+      return localeGetter;
    };
    
@@ -127 +157 @@
    var translation = null;
    if (singularKey) {
-      // use either the locale defined in res.meta.locale or the jvm default
-      var locale = res.meta.locale || java.util.Locale.getDefault();
+      // use the getter method for retrieving the locale
+      var locale = this.getLocaleGetter()();
       var catalog, key;
       if ((catalog = jala.i18n.getCatalog(locale))) {
@@ -204 +234 @@
          }
       }
-      // use either the locale defined in res.meta.locale or the jvm default
-      var locale = res.meta.locale || java.util.Locale.getDefault();
+      // use the getter method for retrieving the locale
+      var locale = this.getLocaleGetter()();
       // format the message
       try {