Changeset 1414

Timestamp:

12/14/09 14:43:35 (9 months ago)

Author:

karel

Message:

i18n for general invalid-form message & handle multiline message keys

Location:

trunk/modules

Files:

• kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/form.js (modified) (1 diff)
• kauri-jquery/src/main/kauri/static-{build}.key/kauri.util/locale.js (modified) (2 diffs)

trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/form.js

@@ -186 +186 @@
         
         if (!formValid) {
-            alert("This is not a valid form. \nSubmit canceled.");
+            alert(kf.Message.build("i18n:This is not a valid form.\nSubmit canceled.", [], "Formatter.fail"));
             return false;
         }

trunk/modules/kauri-jquery/src/main/kauri/static-{build}.key/kauri.util/locale.js

@@ -35 +35 @@
     }
 
-    var I18N_PREFIX_REGEX = /^i18n:(.*)$/;
+    var I18N_PREFIX_REGEX = /^i18n:/;
     /**
      * Builds up the message by applying i18n lookups and argument-formatting
@@ -46 +46 @@
         var text = key;
         if (I18N_PREFIX_REGEX.test(key)) {
-            text = locale.getMessage(RegExp.$1);
+            text = locale.getMessage(key.replace(I18N_PREFIX_REGEX, ''));
         }