Merge branch 'currency_format' into staging

assets/javascripts/discourse/components/stripe-card.js.es6

@@ -2,7 +2,14 @@ import { ajax } from 'discourse/lib/ajax';
 import { getRegister } from 'discourse-common/lib/get-owner';
 
 export default Ember.Component.extend({
-  donateAmounts: [1, 5, 10, 25],
+  donateAmounts: [
+    { value: 1, name: '$1.00'},
+    { value: 2, name: '$2.00'},
+    { value: 5, name: '$5.00'},
+    { value: 10, name: '$10.00'},
+    { value: 20, name: '$20.00'},
+    { value: 50, name: '$50.00'}
+  ],
   result: null,
   amount: null,
   stripe: null,

assets/javascripts/discourse/templates/components/stripe-card.hbs

@@ -1,7 +1,10 @@
 <form id="payment-form" class="form-horizontal">
 
-  <div class="control-group" style="width: 550px;">
-    <label class="control-label" for="card-element">{{i18n 'discourse_donations.amount'}}</label>
+  <div class="control-group">
+    <label class="control-label" for="card-element">
+      {{i18n 'discourse_donations.amount'}}
+      {{settings.discourse_donations_currency}}
+    </label>
     <div class="controls controls-dropdown">
       {{combo-box valueAttribute="value" content=donateAmounts value=amount}}
     </div>

plugin.rb

@@ -1,6 +1,6 @@
 # name: discourse-donations
 # about: Integrating Discourse with Stripe for donations
-# version: 1.9.0
+# version: 1.9.1
 # url: https://github.com/choiceaustralia/discourse-donations
 # authors: Rimian Perkins