Patched translation fixes and added a few phrases to locales.

CHANGELOG.md

@@ -1,9 +1,11 @@
 <a name="">My app - Changelog</a>
-#  (2015-05-02)
+#  (2015-05-03)
 
 
 ## Bug Fixes
 
+- **Spring:** WHO IS LESLIE
+  ([6685e935](watch/commits/6685e93554a1274dedb55dae054e787fb80eb440))
 - **invite-friends:** text should be valid for both parties and guilds
   ([54e82a14](watch/commits/54e82a14a252c3b9923449a7ef7cee6033a5d160))
 - **mystery:** It's 2015 now, Sabe
@@ -16,6 +18,8 @@
 
 ## Features
 
+- **Spring:** Flung
+  ([d50d4ad8](watch/commits/d50d4ad8bb0f89e39ceb6562e0f8f392f94b5444))
 - **emails:** add support for weekly recap emails
   ([37f7db3c](watch/commits/37f7db3c4e3859d03fd55a44e63819e273a06442))
 - **i18n:** upload japanese, serbian and chinese (taiwan)

common/locales/en/communityGuidelines.json

@@ -180,5 +180,7 @@
     "commGuideLink07": "The Art Trello",
     "commGuideLink07description": "for submitting pixel art.",
     "commGuideLink08": "The Quest Trello",
-    "commGuideLink08description": "for submitting quest writing."
+    "commGuideLink08description": "for submitting quest writing.",
+
+    "lastUpdated": "Last updated"
 }

common/locales/en/settings.json

@@ -112,5 +112,7 @@
     "benefits": "Benefits",
     "coupon": "Coupon",
     "couponPlaceholder": "Enter Coupon Code",
-    "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)"
+    "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)",
+    "apply": "Apply",
+    "resubscribe": "Resubscribe"
 }

website/views/options/settings.jade

@@ -162,7 +162,7 @@ script(type='text/ng-template', id='partials/options.settings.coupon.html')
         h2= env.t('coupon')
         form.form-inline(role='form',ng-submit='enterCoupon(_couponCode)')
           input.form-control(type='text', ng-model='_couponCode', placeholder=env.t('couponPlaceholder'))
-          button.btn.btn-primary(type='submit') Submit
+          button.btn.btn-primary(type='submit')= env.t('submit')
         div
           small= env.t('couponText')
         div(ng-if='user.contributor.sudo')
@@ -379,12 +379,12 @@ script(id='partials/options.settings.subscription.html',type='text/ng-template')
 
           .form-inline
             .form-group
-              input.form-control(type='text', ng-model='_subscription.coupon', placeholder='Promo Code')
+              input.form-control(type='text', ng-model='_subscription.coupon', placeholder= env.t('couponPlaceholder'))
             .form-group
-              button.btn.btn-small(type='button',ng-click='applyCoupon(_subscription.coupon)') Apply
+              button.btn.btn-small(type='button',ng-click='applyCoupon(_subscription.coupon)')= env.t("apply")
 
-          h3(ng-if='(user.purchased.plan.customerId && user.purchased.plan.dateTerminated)') Resubscribe
-          a.btn.btn-primary(ng-click='Payments.showStripe({subscription:_subscription.key, coupon:_subscription.coupon})', ng-disabled='!_subscription.key') Card
+          h3(ng-if='(user.purchased.plan.customerId && user.purchased.plan.dateTerminated)')= env.t("resubscribe")
+          a.btn.btn-primary(ng-click='Payments.showStripe({subscription:_subscription.key, coupon:_subscription.coupon})', ng-disabled='!_subscription.key')= env.t('card')
           a.btn.btn-warning(href='/paypal/subscribe?_id={{user._id}}&apiToken={{user.apiToken}}&sub={{_subscription.key}}{{_subscription.coupon ? "&coupon="+_subscription.coupon : ""}}', ng-disabled='!_subscription.key') PayPal
         div(ng-if='user.purchased.plan.customerId')
           .btn.btn-primary(ng-if='!user.purchased.plan.dateTerminated && user.purchased.plan.paymentMethod=="Stripe"', ng-click='Payments.showStripeEdit()')=env.t('subUpdateCard')

website/views/static/community-guidelines.jade

@@ -26,7 +26,7 @@ block content
       .page-header
         h1=env.t('communityGuidelines')
       p.pagemeta
-        |Last updated 
+        =env.t('lastUpdated')
         =env.t('February')
         | 9, 2015
       h2=env.t('commGuideHeadingWelcome')

website/views/static/press-kit.jade

@@ -5,7 +5,7 @@ block vars
   - var menuItem = 'pressKit'
 
 block title
-  title Press Kit
+  title= env.t('presskit')
 
 block extraHead
   style.