Merge branch 'messages' into staging

2017-03-13 15:29:17 +11:00 · 2017-03-13 15:29:17 +11:00 · 5b982cf1d6
parent 3dd9f8c393 a80272caff
commit 5b982cf1d6
3 changed files with 3 additions and 1 deletions
--- a/assets/javascripts/discourse/templates/connectors/extra-nav-item/donate.hbs
+++ b/assets/javascripts/discourse/templates/connectors/extra-nav-item/donate.hbs
@ -1,5 +1,5 @@
 {{#if currentUser.username}}
  <a href="/users/{{currentUser.username}}/payments">
-    {{i18n 'discourse_donations.title'}}
+    {{i18n 'discourse_donations.nav_item'}}
  </a>
 {{/if}}
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@ -2,6 +2,7 @@ en:
  js:
    discourse_donations:
      title: Spenden
+      nav_item: Spenden
      amount: Betrag
      card: Kreditkarte oder Bankkarte
      submit: Spende bezahlen
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@ -2,6 +2,7 @@ en:
  js:
    discourse_donations:
      title: Donate
+      nav_item: Donate
      amount: Amount
      card: Credit or debit card
      submit: Make Payment