Changeset 1414

Show
Ignore:
Timestamp:
14/12/09 14:43:35 (3 months ago)
Author:
karel
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1373 r1414  
    186186         
    187187        if (!formValid) { 
    188             alert("This is not a valid form. \nSubmit canceled."); 
     188            alert(kf.Message.build("i18n:This is not a valid form.\nSubmit canceled.", [], "Formatter.fail")); 
    189189            return false; 
    190190        } 

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

    r1413 r1414  
    3535    } 
    3636 
    37     var I18N_PREFIX_REGEX = /^i18n:(.*)$/; 
     37    var I18N_PREFIX_REGEX = /^i18n:/; 
    3838    /** 
    3939     * Builds up the message by applying i18n lookups and argument-formatting 
    …… 
    4646        var text = key; 
    4747        if (I18N_PREFIX_REGEX.test(key)) { 
    48             text = locale.getMessage(RegExp.$1); 
     48            text = locale.getMessage(key.replace(I18N_PREFIX_REGEX, '')); 
    4949        } 
    5050