codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-02 20:07:25 -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-19 08:37:44 -07:00
commit 7a9158c2e7
8 changed files with 1364 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/core/services/stripe.coffee
View file

@ -1,5 +1,5 @@
publishableKey = if application.isProduction() then 'pk_live_27jQZozjDGN1HSUTnSuM578g' else 'pk_test_zG5UwVu6Ww8YhtE9ZYh0JO6a' publishableKey = if application.isProduction() then 'pk_live_27jQZozjDGN1HSUTnSuM578g' else 'pk_test_zG5UwVu6Ww8YhtE9ZYh0JO6a'
module.exports = handler = StripeCheckout.configure({ module.exports = handler = StripeCheckout.configure({
key: publishableKey key: publishableKey
name: 'CodeCombat' name: 'CodeCombat'
@ -7,4 +7,5 @@ module.exports = handler = StripeCheckout.configure({
image: '/images/pages/base/logo_square_250.png' image: '/images/pages/base/logo_square_250.png'
token: (token) -> token: (token) ->
Backbone.Mediator.publish 'stripe:received-token', { token: token } Backbone.Mediator.publish 'stripe:received-token', { token: token }
}) locale: 'auto'
})

1355
app/locale/eo.coffee Normal file
View file

File diff suppressed because it is too large Load diff

1
app/locale/locale.coffee
View file

@ -31,6 +31,7 @@ module.exports =
'de-AT': { nativeDescription: 'Deutsch (Österreich)', englishDescription: 'German (Austria)' } 'de-AT': { nativeDescription: 'Deutsch (Österreich)', englishDescription: 'German (Austria)' }
'de-CH': { nativeDescription: 'Deutsch (Schweiz)', englishDescription: 'German (Switzerland)' } 'de-CH': { nativeDescription: 'Deutsch (Schweiz)', englishDescription: 'German (Switzerland)' }
'el': { nativeDescription: 'Ελληνικά', englishDescription: 'Greek' } 'el': { nativeDescription: 'Ελληνικά', englishDescription: 'Greek' }
'eo': { nativeDescription: 'Esperanto', englishDescription: 'Esperanto' }
'fa': { nativeDescription: 'فارسی', englishDescription: 'Persian' } 'fa': { nativeDescription: 'فارسی', englishDescription: 'Persian' }
'gl': { nativeDescription: 'Galego', englishDescription: 'Galician' } 'gl': { nativeDescription: 'Galego', englishDescription: 'Galician' }
'ko': { nativeDescription: '한국어', englishDescription: 'Korean' } 'ko': { nativeDescription: '한국어', englishDescription: 'Korean' }

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

@ -53,8 +53,7 @@ module.exports = class InvoicesView extends RootView
amount: @amount amount: @amount
description: @description description: @description
bitcoin: true bitcoin: true
alipay: "auto" alipay: 'auto'
locale: "auto"
onStripeReceivedToken: (e) -> onStripeReceivedToken: (e) ->
data = { data = {

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

@ -194,8 +194,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: "auto" alipay: 'auto'
locale: "auto"
alipayReusable: true alipayReusable: true
} }
@state = 'start subscribe' @state = 'start subscribe'

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

@ -112,8 +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: "auto" alipay: 'auto'
locale: "auto"
alipayReusable: true alipayReusable: true
} }

2
app/views/play/CampaignView.coffee
View file

@ -604,7 +604,7 @@ module.exports = class CampaignView extends RootView
onPollSync.call @ if @poll.loaded onPollSync.call @ if @poll.loaded
activatePoll: -> activatePoll: ->
pollTitle = "#{$.i18n.t 'play.poll'}: #{utils.i18n @poll.attributes, 'name'}" pollTitle = utils.i18n @poll.attributes, 'name'
$pollButton = @$el.find('button.poll').removeClass('hidden').addClass('highlighted').attr(title: pollTitle).addClass('has-tooltip').tooltip title: pollTitle $pollButton = @$el.find('button.poll').removeClass('hidden').addClass('highlighted').attr(title: pollTitle).addClass('has-tooltip').tooltip title: pollTitle
if me.get('lastLevel') is 'shadow-guard' if me.get('lastLevel') is 'shadow-guard'
@showPoll() @showPoll()

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

@ -70,8 +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: "auto" alipay: 'auto'
locale: "auto"
}) })
@productBeingPurchased = product @productBeingPurchased = product