diff --git a/dump.rdb b/dump.rdb index c303963..cdd10f0 100644 Binary files a/dump.rdb and b/dump.rdb differ diff --git a/www/index.html b/www/index.html index 4474b54..76b0016 100644 --- a/www/index.html +++ b/www/index.html @@ -6,6 +6,7 @@ + @@ -13,6 +14,10 @@
+ Language:

diff --git a/www/js/en.lang.js b/www/js/en.lang.js index 9ad80c8..1fb919b 100644 --- a/www/js/en.lang.js +++ b/www/js/en.lang.js @@ -1,4 +1,5 @@ hotjs.i18n.put('en', { + 'language': 'Language', 'fastsignup': 'Fast Sign Up', 'signup': 'Sign Up', 'login': 'Login', diff --git a/www/js/hotjs-i18n.js b/www/js/hotjs-i18n.js index 46c66b5..468b907 100644 --- a/www/js/hotjs-i18n.js +++ b/www/js/hotjs-i18n.js @@ -59,9 +59,8 @@ hotjs.i18n = { setLang : function(lang, cook) { this.lang = lang; if (cook) { - var wl = window.location, now = new Date(), time = now.getTime(); - time += this.cookievalid; - now.setTime(time); + var wl = window.location, now = new Date(); + now.setTime( now.getTime() + this.cookievalid ); document.cookie = 'lang=' + lang + ';path=' + wl.pathname + ';domain=' + wl.host + ';expires=' + now.toGMTString(); } return this; diff --git a/www/js/jquery.cookie.js b/www/js/jquery.cookie.js new file mode 100644 index 0000000..feb62e9 --- /dev/null +++ b/www/js/jquery.cookie.js @@ -0,0 +1,117 @@ +/*! + * jQuery Cookie Plugin v1.4.1 + * https://github.com/carhartl/jquery-cookie + * + * Copyright 2006, 2014 Klaus Hartl + * Released under the MIT license + */ +(function (factory) { + if (typeof define === 'function' && define.amd) { + // AMD + define(['jquery'], factory); + } else if (typeof exports === 'object') { + // CommonJS + factory(require('jquery')); + } else { + // Browser globals + factory(jQuery); + } +}(function ($) { + + var pluses = /\+/g; + + function encode(s) { + return config.raw ? s : encodeURIComponent(s); + } + + function decode(s) { + return config.raw ? s : decodeURIComponent(s); + } + + function stringifyCookieValue(value) { + return encode(config.json ? JSON.stringify(value) : String(value)); + } + + function parseCookieValue(s) { + if (s.indexOf('"') === 0) { + // This is a quoted cookie as according to RFC2068, unescape... + s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); + } + + try { + // Replace server-side written pluses with spaces. + // If we can't decode the cookie, ignore it, it's unusable. + // If we can't parse the cookie, ignore it, it's unusable. + s = decodeURIComponent(s.replace(pluses, ' ')); + return config.json ? JSON.parse(s) : s; + } catch(e) {} + } + + function read(s, converter) { + var value = config.raw ? s : parseCookieValue(s); + return $.isFunction(converter) ? converter(value) : value; + } + + var config = $.cookie = function (key, value, options) { + + // Write + + if (arguments.length > 1 && !$.isFunction(value)) { + options = $.extend({}, config.defaults, options); + + if (typeof options.expires === 'number') { + var days = options.expires, t = options.expires = new Date(); + t.setTime(+t + days * 864e+5); + } + + return (document.cookie = [ + encode(key), '=', stringifyCookieValue(value), + options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE + options.path ? '; path=' + options.path : '', + options.domain ? '; domain=' + options.domain : '', + options.secure ? '; secure' : '' + ].join('')); + } + + // Read + + var result = key ? undefined : {}; + + // To prevent the for loop in the first place assign an empty array + // in case there are no cookies at all. Also prevents odd result when + // calling $.cookie(). + var cookies = document.cookie ? document.cookie.split('; ') : []; + + for (var i = 0, l = cookies.length; i < l; i++) { + var parts = cookies[i].split('='); + var name = decode(parts.shift()); + var cookie = parts.join('='); + + if (key && key === name) { + // If second argument (value) is a function it's a converter... + result = read(cookie, value); + break; + } + + // Prevent storing a cookie that we couldn't decode. + if (!key && (cookie = read(cookie)) !== undefined) { + result[name] = cookie; + } + } + + return result; + }; + + config.defaults = {}; + + $.removeCookie = function (key, options) { + if ($.cookie(key) === undefined) { + return false; + } + + // Must not alter options, thus extending a fresh object... + $.cookie(key, '', $.extend({}, options, { expires: -1 })); + return !$.cookie(key); + }; + +})); diff --git a/www/js/zh.lang.js b/www/js/zh.lang.js index c1da8c1..1dbaa2f 100644 --- a/www/js/zh.lang.js +++ b/www/js/zh.lang.js @@ -1,4 +1,5 @@ hotjs.i18n.put('zh', { + 'language': '语言', 'fastsignup': '快速注册', 'signup': '注册', 'login': '登录', diff --git a/www/main.js b/www/main.js index e78c242..3e1c8f1 100644 --- a/www/main.js +++ b/www/main.js @@ -7,8 +7,6 @@ var Client = require('../lib/client'), var client = null; -//hotjs.i18n.setLang('zh'); - Poker.toHTML = function(cards) { var html = ''; for(var i=0; i + @@ -13,6 +14,10 @@
+ Language:

diff --git a/wwwsrc/js/en.lang.js b/wwwsrc/js/en.lang.js index 9ad80c8..1fb919b 100644 --- a/wwwsrc/js/en.lang.js +++ b/wwwsrc/js/en.lang.js @@ -1,4 +1,5 @@ hotjs.i18n.put('en', { + 'language': 'Language', 'fastsignup': 'Fast Sign Up', 'signup': 'Sign Up', 'login': 'Login', diff --git a/wwwsrc/js/hotjs-i18n.js b/wwwsrc/js/hotjs-i18n.js index 46c66b5..468b907 100644 --- a/wwwsrc/js/hotjs-i18n.js +++ b/wwwsrc/js/hotjs-i18n.js @@ -59,9 +59,8 @@ hotjs.i18n = { setLang : function(lang, cook) { this.lang = lang; if (cook) { - var wl = window.location, now = new Date(), time = now.getTime(); - time += this.cookievalid; - now.setTime(time); + var wl = window.location, now = new Date(); + now.setTime( now.getTime() + this.cookievalid ); document.cookie = 'lang=' + lang + ';path=' + wl.pathname + ';domain=' + wl.host + ';expires=' + now.toGMTString(); } return this; diff --git a/wwwsrc/js/jquery.cookie.js b/wwwsrc/js/jquery.cookie.js new file mode 100644 index 0000000..feb62e9 --- /dev/null +++ b/wwwsrc/js/jquery.cookie.js @@ -0,0 +1,117 @@ +/*! + * jQuery Cookie Plugin v1.4.1 + * https://github.com/carhartl/jquery-cookie + * + * Copyright 2006, 2014 Klaus Hartl + * Released under the MIT license + */ +(function (factory) { + if (typeof define === 'function' && define.amd) { + // AMD + define(['jquery'], factory); + } else if (typeof exports === 'object') { + // CommonJS + factory(require('jquery')); + } else { + // Browser globals + factory(jQuery); + } +}(function ($) { + + var pluses = /\+/g; + + function encode(s) { + return config.raw ? s : encodeURIComponent(s); + } + + function decode(s) { + return config.raw ? s : decodeURIComponent(s); + } + + function stringifyCookieValue(value) { + return encode(config.json ? JSON.stringify(value) : String(value)); + } + + function parseCookieValue(s) { + if (s.indexOf('"') === 0) { + // This is a quoted cookie as according to RFC2068, unescape... + s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); + } + + try { + // Replace server-side written pluses with spaces. + // If we can't decode the cookie, ignore it, it's unusable. + // If we can't parse the cookie, ignore it, it's unusable. + s = decodeURIComponent(s.replace(pluses, ' ')); + return config.json ? JSON.parse(s) : s; + } catch(e) {} + } + + function read(s, converter) { + var value = config.raw ? s : parseCookieValue(s); + return $.isFunction(converter) ? converter(value) : value; + } + + var config = $.cookie = function (key, value, options) { + + // Write + + if (arguments.length > 1 && !$.isFunction(value)) { + options = $.extend({}, config.defaults, options); + + if (typeof options.expires === 'number') { + var days = options.expires, t = options.expires = new Date(); + t.setTime(+t + days * 864e+5); + } + + return (document.cookie = [ + encode(key), '=', stringifyCookieValue(value), + options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE + options.path ? '; path=' + options.path : '', + options.domain ? '; domain=' + options.domain : '', + options.secure ? '; secure' : '' + ].join('')); + } + + // Read + + var result = key ? undefined : {}; + + // To prevent the for loop in the first place assign an empty array + // in case there are no cookies at all. Also prevents odd result when + // calling $.cookie(). + var cookies = document.cookie ? document.cookie.split('; ') : []; + + for (var i = 0, l = cookies.length; i < l; i++) { + var parts = cookies[i].split('='); + var name = decode(parts.shift()); + var cookie = parts.join('='); + + if (key && key === name) { + // If second argument (value) is a function it's a converter... + result = read(cookie, value); + break; + } + + // Prevent storing a cookie that we couldn't decode. + if (!key && (cookie = read(cookie)) !== undefined) { + result[name] = cookie; + } + } + + return result; + }; + + config.defaults = {}; + + $.removeCookie = function (key, options) { + if ($.cookie(key) === undefined) { + return false; + } + + // Must not alter options, thus extending a fresh object... + $.cookie(key, '', $.extend({}, options, { expires: -1 })); + return !$.cookie(key); + }; + +})); diff --git a/wwwsrc/js/zh.lang.js b/wwwsrc/js/zh.lang.js index c1da8c1..1dbaa2f 100644 --- a/wwwsrc/js/zh.lang.js +++ b/wwwsrc/js/zh.lang.js @@ -1,4 +1,5 @@ hotjs.i18n.put('zh', { + 'language': '语言', 'fastsignup': '快速注册', 'signup': '注册', 'login': '登录', diff --git a/wwwsrc/main.js b/wwwsrc/main.js index 104a110..d2cc740 100644 --- a/wwwsrc/main.js +++ b/wwwsrc/main.js @@ -6,8 +6,6 @@ var Client = require('../lib/client'), var client = null; -//hotjs.i18n.setLang('zh'); - Poker.toHTML = function(cards) { var html = ''; for(var i=0; i