codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 10:35:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2015-10-12 13:12:45 -07:00
commit a187307545
5 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/locale/zh-HANS.coffee
View file

@ -304,7 +304,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
tip_morale_improves: "在士气提升之前会一直进行加载。" tip_morale_improves: "在士气提升之前会一直进行加载。"
tip_all_species: "我们相信每一个人都有同等的机会学习编程" tip_all_species: "我们相信每一个人都有同等的机会学习编程"
tip_reticulating: "网格状锯齿。(指Maxis开发的许多游戏，如《模拟城市》、《孢子》中，加载进程中跑动时出现的卡顿现象)" tip_reticulating: "网格状锯齿。(指Maxis开发的许多游戏，如《模拟城市》、《孢子》中，加载进程中跑动时出现的卡顿现象)"
tip_harry: "巫师, " tip_harry: "你是一名巫师, "
tip_great_responsibility: "更强的编程技巧也意味着有更高的责任来进行调试。" tip_great_responsibility: "更强的编程技巧也意味着有更高的责任来进行调试。"
tip_munchkin: "如果您不吃掉您的蔬菜, 一个小矮人将在您睡着之后来找您。" tip_munchkin: "如果您不吃掉您的蔬菜, 一个小矮人将在您睡着之后来找您。"
tip_binary: "这个世界上只有10种人: 那些懂二进制的, 还有那些不懂二进制的。" tip_binary: "这个世界上只有10种人: 那些懂二进制的, 还有那些不懂二进制的。"
@ -464,7 +464,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
was_free_until: "您有过一个免费订阅，直到" was_free_until: "您有过一个免费订阅，直到"
managed_subs: "管理订阅" managed_subs: "管理订阅"
managed_subs_desc: "为其他玩家（学生、儿童等）添加订阅。" managed_subs_desc: "为其他玩家（学生、儿童等）添加订阅。"
managed_subs_desc_2: "收件人必须有一个与您提供的电子邮件地址相关联的codecombat帐户。" managed_subs_desc_2: "收件人必须有一个与您提供的电子邮件地址相关联的CodeCombat帐户。"
group_discounts: "团购价" group_discounts: "团购价"
group_discounts_1: "我们还为批量订阅提供团购价" group_discounts_1: "我们还为批量订阅提供团购价"
group_discounts_1st: "1个订阅" group_discounts_1st: "1个订阅"
@ -673,7 +673,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
under: "低于" under: "低于"
other: "其他:" other: "其他:"
amount_students: "请问您有多少学生需要教导？" amount_students: "请问您有多少学生需要教导？"
hear_about: "您是怎么知道CodeComabat的？" hear_about: "您是怎么知道CodeCombat的？"
fill_fields: "请填写所有问题。" fill_fields: "请填写所有问题。"
thanks: "非常感谢！我们会很快寄给您设置说明。" thanks: "非常感谢！我们会很快寄给您设置说明。"
@ -1207,7 +1207,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
recently_played: "最近玩过的关卡" recently_played: "最近玩过的关卡"
no_recent_games: "最近两个星期没有玩过游戏。" no_recent_games: "最近两个星期没有玩过游戏。"
payments: "支付方式" payments: "支付方式"
# prepaid: "Prepaid" prepaid: "预付费"
purchased: "已购买" purchased: "已购买"
sale: "促销" sale: "促销"
subscription: "订阅" subscription: "订阅"

2
app/locale/zh-HANT.coffee
View file

@ -673,7 +673,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
under: "低於" under: "低於"
other: "其他:" other: "其他:"
amount_students: "請問您有多少學生需要教導？" amount_students: "請問您有多少學生需要教導？"
hear_about: "您是怎麼知道CodeComabat的？" hear_about: "您是怎麼知道CodeCombat的？"
fill_fields: "請填寫所有問題。" fill_fields: "請填寫所有問題。"
thanks: "非常感謝！我們會很快寄給您設置說明。" thanks: "非常感謝！我們會很快寄給您設置說明。"

5
app/views/account/PrepaidView.coffee
View file

@ -37,10 +37,7 @@ module.exports = class PrepaidView extends RootView
@updateTotal() @updateTotal()
@codes = new CocoCollection([], { url: '/db/user/'+me.id+'/prepaid_codes', model: Prepaid }) @codes = new CocoCollection([], { url: '/db/user/'+me.id+'/prepaid_codes', model: Prepaid })
@codes.on 'add', (code) => @codes.on 'sync', (code) => @render?()
@render?()
@codes.on 'sync', (code) =>
@render?()
@supermodel.loadCollection(@codes, 'prepaid', {cache: false}) @supermodel.loadCollection(@codes, 'prepaid', {cache: false})
@ppc = utils.getQueryVariable('_ppc') ? '' @ppc = utils.getQueryVariable('_ppc') ? ''

1
server_config.coffee
View file

@ -53,7 +53,6 @@ config.mail =
username: process.env.COCO_MAIL_SERVICE_USERNAME or '' username: process.env.COCO_MAIL_SERVICE_USERNAME or ''
supportPrimary: process.env.COCO_MAIL_SUPPORT_PRIMARY or '' supportPrimary: process.env.COCO_MAIL_SUPPORT_PRIMARY or ''
supportPremium: process.env.COCO_MAIL_SUPPORT_PREMIUM or '' supportPremium: process.env.COCO_MAIL_SUPPORT_PREMIUM or ''
username: process.env.COCO_MAIL_SERVICE_USERNAME or ''
mailchimpAPIKey: process.env.COCO_MAILCHIMP_API_KEY or '' mailchimpAPIKey: process.env.COCO_MAILCHIMP_API_KEY or ''
mailchimpWebhook: process.env.COCO_MAILCHIMP_WEBHOOK or '/mail/webhook' mailchimpWebhook: process.env.COCO_MAILCHIMP_WEBHOOK or '/mail/webhook'
sendwithusAPIKey: process.env.COCO_SENDWITHUS_API_KEY or '' sendwithusAPIKey: process.env.COCO_SENDWITHUS_API_KEY or ''

1
server_setup.coffee
View file

@ -86,7 +86,6 @@ setupCountryRedirectMiddleware = (app, country="china", countryCode="CN", langua
ip = req.headers['x-forwarded-for'] or req.connection.remoteAddress 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. ip = ip?.split(/,? /)[0] # If there are two IP addresses, say because of CloudFlare, we just take the first.
geo = geoip.lookup(ip) geo = geoip.lookup(ip)
geo = country: 'CN'
#if speaksLanguage or geo?.country is countryCode #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}") # 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 return geo?.country is countryCode and speaksLanguage