Merge branch 'master' into production

app/core/services/stripe.coffee

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

app/locale/locale.coffee

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

app/views/account/InvoicesView.coffee

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

app/views/account/SubscriptionView.coffee

@@ -194,8 +194,7 @@ class RecipientSubs
     options = {
       description: "#{@recipientEmails.length} " + $.i18n.t('subscribe.stripe_description', defaultValue: 'Monthly Subscriptions')
       amount: amount
-      alipay: "auto"
-      locale: "auto"
+      alipay: 'auto'
       alipayReusable: true
     }
     @state = 'start subscribe'

app/views/core/SubscribeModal.coffee

@@ -112,8 +112,7 @@ module.exports = class SubscribeModal extends ModalView
     options = {
       description: $.i18n.t('subscribe.stripe_description')
       amount: @product.amount
-      alipay: "auto"
-      locale: "auto"
+      alipay: 'auto'
       alipayReusable: true
     }
 

app/views/play/CampaignView.coffee

@@ -604,7 +604,7 @@ module.exports = class CampaignView extends RootView
     onPollSync.call @ if @poll.loaded
 
   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
     if me.get('lastLevel') is 'shadow-guard'
       @showPoll()

app/views/play/modal/BuyGemsModal.coffee

@@ -70,8 +70,7 @@ module.exports = class BuyGemsModal extends ModalView
         description: $.t(product.i18n)
         amount: product.amount
         bitcoin: true
-        alipay: "auto"
-        locale: "auto"
+        alipay: 'auto'
       })
 
     @productBeingPurchased = product