diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee index 43cde0212..bbfe6b9a6 100644 --- a/app/locale/zh-HANS.coffee +++ b/app/locale/zh-HANS.coffee @@ -673,7 +673,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese under: "低于" other: "其他:" amount_students: "请问您有多少学生需要教导?" - hear_about: "您是怎么知道CodeComabat的?" + hear_about: "您是怎么知道CodeCombat的?" fill_fields: "请填写所有问题。" thanks: "非常感谢!我们会很快寄给您设置说明。" diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee index 4193e8fdf..b6d4dfad4 100644 --- a/app/locale/zh-HANT.coffee +++ b/app/locale/zh-HANT.coffee @@ -673,7 +673,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese under: "低於" other: "其他:" amount_students: "請問您有多少學生需要教導?" - hear_about: "您是怎麼知道CodeComabat的?" + hear_about: "您是怎麼知道CodeCombat的?" fill_fields: "請填寫所有問題。" thanks: "非常感謝!我們會很快寄給您設置說明。" diff --git a/server_setup.coffee b/server_setup.coffee index 0096001c0..fd2d52618 100644 --- a/server_setup.coffee +++ b/server_setup.coffee @@ -86,7 +86,6 @@ setupCountryRedirectMiddleware = (app, country="china", countryCode="CN", langua ip = req.headers['x-forwarded-for'] or req.connection.remoteAddress ip = ip?.split(/,? /)[0] # If there are two IP addresses, say because of CloudFlare, we just take the first. geo = geoip.lookup(ip) - geo = country: 'CN' #if speaksLanguage or geo?.country is countryCode # log.info("Should we redirect to #{serverID} server? speaksLanguage: #{speaksLanguage}, firstLanguage: #{firstLanguage}, ip: #{ip}, geo: #{geo} -- so redirecting? #{geo?.country is 'CN' and speaksLanguage}") return geo?.country is countryCode and speaksLanguage