codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 10:06:08 -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-03-24 15:40:04 -07:00
commit 94cec4c9e6
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/account/InvoicesView.coffee
View file

@ -53,7 +53,7 @@ module.exports = class InvoicesView extends RootView
amount: @amount amount: @amount
description: @description description: @description
bitcoin: true bitcoin: true
alipay: if me.get('chinaVersion') or me.get('preferredLanguage')[...2] is 'zh' then true else 'auto' alipay: if me.get('chinaVersion') or (me.get('preferredLanguage') or 'en-US')[...2] is 'zh' then true else 'auto'
onStripeReceivedToken: (e) -> onStripeReceivedToken: (e) ->
data = { data = {

2
app/views/account/SubscriptionView.coffee
View file

@ -247,7 +247,7 @@ class RecipientSubs
options = { options = {
description: "#{@recipientEmails.length} " + $.i18n.t('subscribe.stripe_description', defaultValue: 'Monthly Subscriptions') description: "#{@recipientEmails.length} " + $.i18n.t('subscribe.stripe_description', defaultValue: 'Monthly Subscriptions')
amount: amount amount: amount
alipay: if me.get('chinaVersion') or me.get('preferredLanguage')[...2] is 'zh' then true else 'auto' alipay: if me.get('chinaVersion') or (me.get('preferredLanguage') or 'en-US')[...2] is 'zh' then true else 'auto'
alipayReusable: true alipayReusable: true
} }
@state = 'start subscribe' @state = 'start subscribe'

2
app/views/core/SubscribeModal.coffee
View file

@ -112,7 +112,7 @@ module.exports = class SubscribeModal extends ModalView
options = { options = {
description: $.i18n.t('subscribe.stripe_description') description: $.i18n.t('subscribe.stripe_description')
amount: @product.amount amount: @product.amount
alipay: if me.get('chinaVersion') or me.get('preferredLanguage')?[...2] is 'zh' then true else 'auto' alipay: if me.get('chinaVersion') or (me.get('preferredLanguage') or 'en-US')[...2] is 'zh' then true else 'auto'
alipayReusable: true alipayReusable: true
} }

2
app/views/editor/level/LevelEditView.coffee
View file

@ -187,7 +187,7 @@ module.exports = class LevelEditView extends RootView
onPopulateI18N: -> onPopulateI18N: ->
@level.populateI18N() @level.populateI18N()
f = -> document.location.reload() f = -> document.location.reload()
setTimeout(f, 200) setTimeout(f, 2000)
toggleTab: (e) -> toggleTab: (e) ->
@renderScrollbar() @renderScrollbar()

2
app/views/play/modal/BuyGemsModal.coffee
View file

@ -70,7 +70,7 @@ module.exports = class BuyGemsModal extends ModalView
description: $.t(product.i18n) description: $.t(product.i18n)
amount: product.amount amount: product.amount
bitcoin: true bitcoin: true
alipay: if me.get('chinaVersion') or me.get('preferredLanguage')[...2] is 'zh' then true else 'auto' alipay: if me.get('chinaVersion') or (me.get('preferredLanguage') or 'en-US')[...2] is 'zh' then true else 'auto'
}) })
@productBeingPurchased = product @productBeingPurchased = product