From 7ebb2d0200b9f688bffab5a601e242f99ca04b80 Mon Sep 17 00:00:00 2001
From: Nick Winter <livelily@gmail.com>
Date: Tue, 24 Mar 2015 15:39:35 -0700
Subject: [PATCH] Actually committing my Super Important Fixes. I must have
 been crazy yesterday. Also, populate i18n may work in the level editor now.

---
 app/views/account/InvoicesView.coffee       | 2 +-
 app/views/account/SubscriptionView.coffee   | 2 +-
 app/views/core/SubscribeModal.coffee        | 2 +-
 app/views/editor/level/LevelEditView.coffee | 2 +-
 app/views/play/modal/BuyGemsModal.coffee    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/account/InvoicesView.coffee b/app/views/account/InvoicesView.coffee
index 119d3af3b..0302e553d 100644
--- a/app/views/account/InvoicesView.coffee
+++ b/app/views/account/InvoicesView.coffee
@@ -53,7 +53,7 @@ module.exports = class InvoicesView extends RootView
       amount: @amount
       description: @description
       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) ->
     data = {
diff --git a/app/views/account/SubscriptionView.coffee b/app/views/account/SubscriptionView.coffee
index d89d7299a..317b4fc19 100644
--- a/app/views/account/SubscriptionView.coffee
+++ b/app/views/account/SubscriptionView.coffee
@@ -247,7 +247,7 @@ class RecipientSubs
     options = {
       description: "#{@recipientEmails.length} " + $.i18n.t('subscribe.stripe_description', defaultValue: 'Monthly Subscriptions')
       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
     }
     @state = 'start subscribe'
diff --git a/app/views/core/SubscribeModal.coffee b/app/views/core/SubscribeModal.coffee
index ac7057ae7..547c5dd37 100644
--- a/app/views/core/SubscribeModal.coffee
+++ b/app/views/core/SubscribeModal.coffee
@@ -112,7 +112,7 @@ module.exports = class SubscribeModal extends ModalView
     options = {
       description: $.i18n.t('subscribe.stripe_description')
       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
     }
 
diff --git a/app/views/editor/level/LevelEditView.coffee b/app/views/editor/level/LevelEditView.coffee
index 79f526377..7e53803fa 100644
--- a/app/views/editor/level/LevelEditView.coffee
+++ b/app/views/editor/level/LevelEditView.coffee
@@ -187,7 +187,7 @@ module.exports = class LevelEditView extends RootView
   onPopulateI18N: ->
     @level.populateI18N()
     f = -> document.location.reload()
-    setTimeout(f, 200)
+    setTimeout(f, 2000)
 
   toggleTab: (e) ->
     @renderScrollbar()
diff --git a/app/views/play/modal/BuyGemsModal.coffee b/app/views/play/modal/BuyGemsModal.coffee
index 17d927770..1ed6bdd8f 100644
--- a/app/views/play/modal/BuyGemsModal.coffee
+++ b/app/views/play/modal/BuyGemsModal.coffee
@@ -70,7 +70,7 @@ module.exports = class BuyGemsModal extends ModalView
         description: $.t(product.i18n)
         amount: product.amount
         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