diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/mod_new_channel.js | 13 | ||||
| -rwxr-xr-x | view/tpl/js_strings.tpl | 12 |
2 files changed, 19 insertions, 6 deletions
diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js index c01029046..10a94796c 100644 --- a/view/js/mod_new_channel.js +++ b/view/js/mod_new_channel.js @@ -43,19 +43,20 @@ $("#nick_help_loading").show(); $("#nick_help_text").hide(); + var zreg_name = $("#id_name").val(); var zreg_nick = $("#id_nickname").val(); - $.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) { + $.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick) + '&name=' + encodeURIComponent(zreg_name),function(data) { $("#id_nickname").val(data); if(data !== zreg_nick) { $("#id_nickname").addClass('is-validated'); $("#help_nickname").addClass('text-danger').removeClass('text-muted'); - $("#help_nickname").html('Your chosen nickname was either already taken or not valid. Please use our suggestion (' + data + ') or enter a new one.'); + $("#help_nickname").html(aStr['nick_invld1'] + data + aStr['nick_invld2']); $("#id_nickname").focus(); } else { $("#id_nickname").addClass('is-validated'); $("#help_nickname").addClass('text-success').removeClass('text-muted').removeClass('text-danger'); - $("#help_nickname").html("Thank you, this nickname is valid."); + $("#help_nickname").html(aStr['nick_valid']); } $("#nick_help_loading").hide(); $("#nick_help_text").show(); @@ -69,18 +70,18 @@ if($("#id_name").hasClass('is-validated')) return true; - var verbs = ['lovely', 'wonderful', 'gorgeous', 'great']; + var verbs = [ aStr['lovely'], aStr['wonderful'], aStr['fantastic'], aStr['great'] ]; var verb = verbs[Math.floor((Math.random() * 4) + 0)]; if(! $("#id_name").val()) { $("#id_name").focus(); $("#help_name").addClass('text-danger').removeClass('text-muted'); - $("#help_name").html("A channel name is required."); + $("#help_name").html(aStr['name_empty']); return false; } else { $("#help_name").addClass('text-success').removeClass('text-muted').removeClass('text-danger'); - $("#help_name").html('This is a ' + verb + ' channel name.'); + $("#help_name").html(aStr['name_ok1'] + verb + aStr['name_ok2']); $("#id_name").addClass('is-validated'); return true; } diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 4243c2ea5..01fc3f993 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -23,6 +23,18 @@ 'linkurl' : "{{$linkurl}}", 'leavethispage' : "{{$leavethispage}}", 'location' : "{{$location}}", + 'lovely' : "{{$lovely}}", + 'wonderful' : "{{$wonderful}}", + 'fantastic' : "{{$fantastic}}", + 'great' : "{{$great}}", + 'nick_invld1' : "{{$nick_invld1}}", + 'nick_invld2' : "{{$nick_invld2}}", + 'nick_valid' : "{{$nick_valid}}", + 'name_empty' : "{{$name_empty}}", + 'name_ok1' : "{{$name_ok1}}", + 'name_ok2' : "{{$name_ok2}}", + + 't01' : "{{$t01}}", 't02' : "{{$t02}}", |