Merge branch 'settings' into staging

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

@@ -1,13 +1,17 @@
 import { ajax } from 'discourse/lib/ajax';
+import { getRegister } from 'discourse-common/lib/get-owner';
 
 export default Ember.Component.extend({
+  donateAmounts: [1, 5, 10, 25],
   result: null,
-  donateAmounts: [5, 10],
   amount: null,
+  stripe: null,
 
-  stripe: function() {
-    return Stripe(Discourse.discourse_donations_public_key);
-  }.property('stripe'),
+  init() {
+    this._super();
+    var public_key = getRegister(this).lookup('site-settings:main').discourse_donations_public_key
+    this.set('stripe', Stripe(public_key));
+  },
 
   card: function() {
     var elements = this.get('stripe').elements();

config/locales/client.de.yml

@@ -6,5 +6,3 @@ en:
       card: Kreditkarte oder Bankkarte
       success: Bezahlung erfolgreich !
       submit: Spende bezahlen
-      secret_key: Secret Key
-      public_key: Public Key

config/locales/client.en.yml

@@ -6,5 +6,3 @@ en:
       card: Credit or debit card
       success: Payment Successful!
       submit: Make Payment
-      secret_key: Secret Key
-      public_key: Public Key

config/locales/server.en.yml

@@ -1,3 +1,5 @@
 en:
   site_settings:
-    discourse_donations_enabled: "Enable the discourse donations plugin."
+    discourse_donations_enabled: Enable the discourse donations plugin.
+    discourse_donations_secret_key: Stripe Secret Key
+    discourse_donations_public_key: Stripe Public Key