From 21b8340f4f0b22935f7fa3d4d3d20a541ef57a21 Mon Sep 17 00:00:00 2001 From: Rimian Perkins Date: Wed, 4 Dec 2019 09:29:13 +1100 Subject: [PATCH] rename the translations --- .../discourse/controllers/s-index.js.es6 | 2 +- .../controllers/s-subscribe-show.js.es6 | 2 +- ...course-subscriptions-products-index.js.es6 | 2 +- ...scourse-subscriptions-products-show.js.es6 | 2 +- ...scourse-subscriptions-subscriptions.js.es6 | 2 +- .../routes/user-subscriptions.js.es6 | 2 +- ...gins-discourse-subscriptions-dashboard.hbs | 10 +++--- ...ns-discourse-subscriptions-plans-index.hbs | 8 ++--- ...discourse-subscriptions-products-index.hbs | 12 +++---- ...subscriptions-products-show-plans-show.hbs | 30 ++++++++-------- ...-discourse-subscriptions-products-show.hbs | 36 +++++++++---------- ...-discourse-subscriptions-subscriptions.hbs | 14 ++++---- .../admin/plugins-discourse-subscriptions.hbs | 8 ++--- .../templates/components/donation-form.hbs | 34 +++++++++--------- .../templates/components/product-list.hbs | 4 +-- .../templates/components/stripe-card.hbs | 2 +- .../connectors/extra-nav-item/subscribe.hbs | 2 +- .../user-main-nav/subscriptions.hbs | 2 +- .../discourse/templates/s/index.hbs | 4 +-- .../discourse/templates/s/subscribe.hbs | 2 +- .../discourse/templates/s/subscribe/show.hbs | 4 +-- .../discourse/templates/user/billing.hbs | 10 +++--- .../discourse/templates/user/invoices.hbs | 10 +++--- .../templates/user/subscriptions.hbs | 14 ++++---- config/locales/client.en.yml | 2 +- plugin.rb | 2 +- 26 files changed, 111 insertions(+), 111 deletions(-) diff --git a/assets/javascripts/discourse/controllers/s-index.js.es6 b/assets/javascripts/discourse/controllers/s-index.js.es6 index 9027ae2..0fac1bf 100644 --- a/assets/javascripts/discourse/controllers/s-index.js.es6 +++ b/assets/javascripts/discourse/controllers/s-index.js.es6 @@ -12,7 +12,7 @@ export default Ember.Controller.extend({ }, paymentSuccessHandler(/* paymentIntentId */) { - bootbox.alert(I18n.t("discourse_patrons.transactions.payment.success")); + bootbox.alert(I18n.t("discourse_subscriptions.transactions.payment.success")); this.transitionToRoute( "user.billing", Discourse.User.current().username.toLowerCase() diff --git a/assets/javascripts/discourse/controllers/s-subscribe-show.js.es6 b/assets/javascripts/discourse/controllers/s-subscribe-show.js.es6 index 08d1483..d042d64 100644 --- a/assets/javascripts/discourse/controllers/s-subscribe-show.js.es6 +++ b/assets/javascripts/discourse/controllers/s-subscribe-show.js.es6 @@ -41,7 +41,7 @@ export default Ember.Controller.extend({ .save() .then(() => { bootbox.alert( - I18n.t("discourse_patrons.transactions.payment.success") + I18n.t("discourse_subscriptions.transactions.payment.success") ); this.transitionToRoute( "user.subscriptions", diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-index.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-index.js.es6 index 8a2d6f1..bd9d389 100644 --- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-index.js.es6 +++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-index.js.es6 @@ -8,7 +8,7 @@ export default Discourse.Route.extend({ actions: { destroyProduct(product) { bootbox.confirm( - I18n.t("discourse_patrons.admin.products.operations.destroy.confirm"), + I18n.t("discourse_subscriptions.admin.products.operations.destroy.confirm"), I18n.t("no_value"), I18n.t("yes_value"), confirmed => { diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show.js.es6 index a9dbdd6..513cefd 100644 --- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show.js.es6 +++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show.js.es6 @@ -20,7 +20,7 @@ export default Discourse.Route.extend({ actions: { destroyPlan(plan) { bootbox.confirm( - I18n.t("discourse_patrons.admin.plans.operations.destroy.confirm"), + I18n.t("discourse_subscriptions.admin.plans.operations.destroy.confirm"), I18n.t("no_value"), I18n.t("yes_value"), confirmed => { diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-subscriptions.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-subscriptions.js.es6 index 9f834e4..c04ae6b 100644 --- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-subscriptions.js.es6 +++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-subscriptions.js.es6 @@ -9,7 +9,7 @@ export default Discourse.Route.extend({ cancelSubscription(subscription) { bootbox.confirm( I18n.t( - "discourse_patrons.user.subscriptions.operations.destroy.confirm" + "discourse_subscriptions.user.subscriptions.operations.destroy.confirm" ), I18n.t("no_value"), I18n.t("yes_value"), diff --git a/assets/javascripts/discourse/routes/user-subscriptions.js.es6 b/assets/javascripts/discourse/routes/user-subscriptions.js.es6 index 1baf8c3..74dc343 100644 --- a/assets/javascripts/discourse/routes/user-subscriptions.js.es6 +++ b/assets/javascripts/discourse/routes/user-subscriptions.js.es6 @@ -17,7 +17,7 @@ export default Discourse.Route.extend({ cancelSubscription(subscription) { bootbox.confirm( I18n.t( - "discourse_patrons.user.subscriptions.operations.destroy.confirm" + "discourse_subscriptions.user.subscriptions.operations.destroy.confirm" ), I18n.t("no_value"), I18n.t("yes_value"), diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-dashboard.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-dashboard.hbs index 1aa2d58..fa04f74 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-dashboard.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-dashboard.hbs @@ -1,16 +1,16 @@ -

{{i18n 'discourse_patrons.admin.dashboard.title'}}

+

{{i18n 'discourse_subscriptions.admin.dashboard.title'}}

{{#load-more selector=".discourse-patrons-table tr" action=(action "loadMore")}} {{#if model}} - - - + + + - + {{#each model as |payment|}} diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-plans-index.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-plans-index.hbs index 1b37a2e..8f8ab58 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-plans-index.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-plans-index.hbs @@ -1,10 +1,10 @@
{{i18n 'discourse_patrons.admin.dashboard.table.head.user'}}{{i18n 'discourse_patrons.admin.dashboard.table.head.payment_intent'}}{{i18n 'discourse_patrons.admin.dashboard.table.head.receipt_email'}}{{i18n 'discourse_subscriptions.admin.dashboard.table.head.user'}}{{i18n 'discourse_subscriptions.admin.dashboard.table.head.payment_intent'}}{{i18n 'discourse_subscriptions.admin.dashboard.table.head.receipt_email'}} {{i18n 'created'}}{{i18n 'discourse_patrons.admin.dashboard.table.head.amount'}}{{i18n 'discourse_subscriptions.admin.dashboard.table.head.amount'}}
- - - - + + + + {{#each model as |plan|}} diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-index.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-index.hbs index 605f161..b703734 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-index.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-index.hbs @@ -2,17 +2,17 @@

{{#link-to 'adminPlugins.discourse-subscriptions.products.show' 'new' class="btn btn-primary"}} {{d-icon "plus"}} - {{i18n 'discourse_patrons.admin.products.operations.new'}} + {{i18n 'discourse_subscriptions.admin.products.operations.new'}} {{/link-to}}

{{#if model}}
{{i18n 'discourse_patrons.admin.plans.plan.plan_id'}}{{i18n 'discourse_patrons.admin.plans.plan.nickname.title'}}{{i18n 'discourse_patrons.admin.plans.plan.interval'}}{{i18n 'discourse_patrons.admin.plans.plan.amount'}}{{i18n 'discourse_subscriptions.admin.plans.plan.plan_id'}}{{i18n 'discourse_subscriptions.admin.plans.plan.nickname.title'}}{{i18n 'discourse_subscriptions.admin.plans.plan.interval'}}{{i18n 'discourse_subscriptions.admin.plans.plan.amount'}}
- - - - + + + + {{#each model as |product|}} @@ -36,6 +36,6 @@
{{i18n 'discourse_patrons.admin.products.product.name'}}{{i18n 'discourse_patrons.admin.products.product.created_at'}}{{i18n 'discourse_patrons.admin.products.product.updated_at'}}{{i18n 'discourse_patrons.admin.products.product.active'}}{{i18n 'discourse_subscriptions.admin.products.product.name'}}{{i18n 'discourse_subscriptions.admin.products.product.created_at'}}{{i18n 'discourse_subscriptions.admin.products.product.updated_at'}}{{i18n 'discourse_subscriptions.admin.products.product.active'}}
{{else}}

- {{i18n 'discourse_patrons.admin.products.product_help'}} + {{i18n 'discourse_subscriptions.admin.products.product_help'}}

{{/if}} diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.hbs index 869d670..6f03936 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.hbs @@ -1,27 +1,27 @@ -

{{i18n 'discourse_patrons.admin.plans.title'}}

+

{{i18n 'discourse_subscriptions.admin.plans.title'}}

- + {{input type="text" name="product_name" value=model.product.name disabled=true}}

- + {{input type="text" name="name" value=model.plan.nickname}}

- {{i18n 'discourse_patrons.admin.plans.plan.nickname_help'}} + {{i18n 'discourse_subscriptions.admin.plans.plan.nickname_help'}}

- + {{combo-box valueAttribute="name" content=model.groups value=model.plan.metadata.group_name}}

- {{i18n 'discourse_patrons.admin.plans.plan.group_help'}} + {{i18n 'discourse_subscriptions.admin.plans.plan.group_help'}}

- + {{#if planFieldDisabled}} {{input class="plan-amount plan-currency" disabled=true value=model.plan.currency}} {{else}} @@ -31,23 +31,23 @@

{{input type="text" name="trial" value=model.plan.trial_period_days}}

- {{i18n 'discourse_patrons.admin.plans.plan.trial_help'}} + {{i18n 'discourse_subscriptions.admin.plans.plan.trial_help'}}

{{combo-box valueAttribute="value" content=model.plan.intervals value=model.plan.interval}}

{{input type="checkbox" name="active" checked=model.plan.active}}

@@ -57,16 +57,16 @@

- {{i18n 'discourse_patrons.admin.plans.operations.create_help'}} + {{i18n 'discourse_subscriptions.admin.plans.operations.create_help'}}

{{d-button label="cancel" action=(action "cancelPlan" model.plan.product) icon="times"}} {{#if model.plan.isNew}} - {{d-button label="discourse_patrons.admin.plans.operations.create" action="createPlan" icon="plus" class="btn btn-primary"}} + {{d-button label="discourse_subscriptions.admin.plans.operations.create" action="createPlan" icon="plus" class="btn btn-primary"}} {{else}} - {{d-button label="discourse_patrons.admin.plans.operations.update" action="updatePlan" icon="check" class="btn btn-primary"}} + {{d-button label="discourse_subscriptions.admin.plans.operations.update" action="updatePlan" icon="check" class="btn btn-primary"}} {{/if}}
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show.hbs index 33771aa..48d8fd7 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show.hbs @@ -1,49 +1,49 @@ -

{{i18n 'discourse_patrons.admin.products.title'}}

+

{{i18n 'discourse_subscriptions.admin.products.title'}}

- + {{input type="text" name="name" value=model.product.name}}

{{textarea name="description" value=model.product.metadata.description class="discourse-patrons-admin-textarea"}}

- {{i18n 'discourse_patrons.admin.products.product.description_help'}} + {{i18n 'discourse_subscriptions.admin.products.product.description_help'}}

{{input type="text" name="statement_descriptor" value=model.product.statement_descriptor}}

- {{i18n 'discourse_patrons.admin.products.product.statement_descriptor_help'}} + {{i18n 'discourse_subscriptions.admin.products.product.statement_descriptor_help'}}

- + {{input type="checkbox" name="active" checked=model.product.active}}

{{#unless model.product.isNew}} -

{{i18n 'discourse_patrons.admin.plans.title'}}

+

{{i18n 'discourse_subscriptions.admin.plans.title'}}

- - - - - - + + + + + + @@ -72,7 +72,7 @@ {{/unless}} @@ -83,9 +83,9 @@
{{d-button label="cancel" action=(action "cancelProduct") icon="times"}} {{#if model.product.isNew}} - {{d-button label="discourse_patrons.admin.products.operations.create" action="createProduct" icon="plus" class="btn btn-primary"}} + {{d-button label="discourse_subscriptions.admin.products.operations.create" action="createProduct" icon="plus" class="btn btn-primary"}} {{else}} - {{d-button label="discourse_patrons.admin.products.operations.update" action="updateProduct" icon="check" class="btn btn-primary"}} + {{d-button label="discourse_subscriptions.admin.products.operations.update" action="updateProduct" icon="check" class="btn btn-primary"}} {{/if}}
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-subscriptions.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-subscriptions.hbs index f19200d..b349abe 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-subscriptions.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-subscriptions.hbs @@ -2,13 +2,13 @@
{{i18n 'discourse_patrons.admin.plans.plan.nickname'}}{{i18n 'discourse_patrons.admin.plans.plan.interval'}}{{i18n 'discourse_patrons.admin.plans.plan.created_at'}}{{i18n 'discourse_patrons.admin.plans.plan.group'}}{{i18n 'discourse_patrons.admin.plans.plan.active'}}{{i18n 'discourse_patrons.admin.plans.plan.amount'}}{{i18n 'discourse_subscriptions.admin.plans.plan.nickname'}}{{i18n 'discourse_subscriptions.admin.plans.plan.interval'}}{{i18n 'discourse_subscriptions.admin.plans.plan.created_at'}}{{i18n 'discourse_subscriptions.admin.plans.plan.group'}}{{i18n 'discourse_subscriptions.admin.plans.plan.active'}}{{i18n 'discourse_subscriptions.admin.plans.plan.amount'}} {{#link-to "adminPlugins.discourse-subscriptions.products.show.plans.show" model.product.id "new" class="btn"}} - {{i18n 'discourse_patrons.admin.plans.operations.add'}} + {{i18n 'discourse_subscriptions.admin.plans.operations.add'}} {{/link-to}}
- {{i18n 'discourse_patrons.admin.products.product.plan_help'}} + {{i18n 'discourse_subscriptions.admin.products.product.plan_help'}}
- - - - - - - + + + + + + + diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions.hbs index 66b4c30..ecd4775 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions.hbs @@ -1,10 +1,10 @@ -

{{i18n 'discourse_patrons.title' site_name=siteSettings.title}}

+

{{i18n 'discourse_subscriptions.title' site_name=siteSettings.title}}

diff --git a/assets/javascripts/discourse/templates/components/donation-form.hbs b/assets/javascripts/discourse/templates/components/donation-form.hbs index 313abac..6a060f2 100644 --- a/assets/javascripts/discourse/templates/components/donation-form.hbs +++ b/assets/javascripts/discourse/templates/components/donation-form.hbs @@ -1,20 +1,20 @@ {{#if confirmation}} - {{#d-modal closeModal=(action "closeModal") modalStyle="inline-modal" title=(i18n "discourse_patrons.one_time.payment.payment_confirmation")}} + {{#d-modal closeModal=(action "closeModal") modalStyle="inline-modal" title=(i18n "discourse_subscriptions.one_time.payment.payment_confirmation")}} {{#d-modal-body}}
{{i18n 'discourse_patrons.admin.subscriptions.subscription.user'}}{{i18n 'discourse_patrons.admin.subscriptions.subscription.subscription_id'}}{{i18n 'discourse_patrons.admin.subscriptions.subscription.customer'}}{{i18n 'discourse_patrons.admin.subscriptions.subscription.product'}}{{i18n 'discourse_patrons.admin.subscriptions.subscription.plan'}}{{i18n 'discourse_patrons.admin.subscriptions.subscription.status'}}{{i18n 'discourse_patrons.admin.subscriptions.subscription.created_at'}}{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.user'}}{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.subscription_id'}}{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.customer'}}{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.product'}}{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.plan'}}{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.status'}}{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.created_at'}}
- + - + - +
{{i18n 'discourse_patrons.billing.name'}}{{i18n 'discourse_subscriptions.billing.name'}} {{billing.name}}
{{i18n 'discourse_patrons.billing.email'}}{{i18n 'discourse_subscriptions.billing.email'}} {{billing.email}}
{{i18n 'discourse_patrons.billing.phone'}}{{i18n 'discourse_subscriptions.billing.phone'}} {{billing.phone}}
@@ -22,11 +22,11 @@

- + - +
{{i18n 'discourse_patrons.confirmation.amount'}}{{i18n 'discourse_subscriptions.confirmation.amount'}} {{format-curency amount}}
{{i18n 'discourse_patrons.confirmation.last4'}}{{i18n 'discourse_subscriptions.confirmation.last4'}} .... .... .... {{last4}}
@@ -36,7 +36,7 @@
{{#d-button action="confirmStripeCard" class="btn btn-primary btn-payment btn-discourse-patrons"}} - {{i18n 'discourse_patrons.buttons.confirm_payment'}} {{format-curency amount}} + {{i18n 'discourse_subscriptions.buttons.confirm_payment'}} {{format-curency amount}} {{/d-button}}
@@ -51,47 +51,47 @@ {{else}}
-

{{i18n 'discourse_patrons.one_time.payment.your_information'}}

+

{{i18n 'discourse_subscriptions.one_time.payment.your_information'}}

- {{i18n 'discourse_patrons.billing.name'}} + {{i18n 'discourse_subscriptions.billing.name'}}
{{input value=billing.name}} -
{{i18n 'discourse_patrons.one_time.payment.optional'}}
+
{{i18n 'discourse_subscriptions.one_time.payment.optional'}}
- {{i18n 'discourse_patrons.billing.email'}} + {{i18n 'discourse_subscriptions.billing.email'}}
{{input type="email" value=billing.email}} -
{{i18n 'discourse_patrons.one_time.payment.receipt_info'}}
+
{{i18n 'discourse_subscriptions.one_time.payment.receipt_info'}}
- {{i18n 'discourse_patrons.billing.phone'}} + {{i18n 'discourse_subscriptions.billing.phone'}}
{{input value=billing.phone}} -
{{i18n 'discourse_patrons.one_time.payment.optional'}}
+
{{i18n 'discourse_subscriptions.one_time.payment.optional'}}
-

{{i18n 'discourse_patrons.one_time.payment.payment_information'}}

+

{{i18n 'discourse_subscriptions.one_time.payment.payment_information'}}

- {{i18n 'discourse_patrons.one_time.amount'}} - {{siteSettings.discourse_patrons_currency}} + {{i18n 'discourse_subscriptions.one_time.amount'}} + {{siteSettings.discourse_subscriptions_currency}}
{{combo-box valueAttribute="value" content=amounts value=amount}} diff --git a/assets/javascripts/discourse/templates/components/product-list.hbs b/assets/javascripts/discourse/templates/components/product-list.hbs index 50f94c6..fbef764 100644 --- a/assets/javascripts/discourse/templates/components/product-list.hbs +++ b/assets/javascripts/discourse/templates/components/product-list.hbs @@ -10,7 +10,7 @@ {{#if currentUser}}
{{#link-to "s.subscribe.show" product.id disabled=product.subscribed class="btn btn-primary"}} - {{i18n 'discourse_patrons.subscribe.title'}} + {{i18n 'discourse_subscriptions.subscribe.title'}} {{/link-to}}
{{/if}} @@ -19,6 +19,6 @@ {{#unless currentUser}}

- {{i18n 'discourse_patrons.subscribe.unauthenticated'}} + {{i18n 'discourse_subscriptions.subscribe.unauthenticated'}}

{{/unless}} diff --git a/assets/javascripts/discourse/templates/components/stripe-card.hbs b/assets/javascripts/discourse/templates/components/stripe-card.hbs index 48ff7c4..3a4b520 100644 --- a/assets/javascripts/discourse/templates/components/stripe-card.hbs +++ b/assets/javascripts/discourse/templates/components/stripe-card.hbs @@ -3,7 +3,7 @@
{{#d-button action="submitStripeCard" class="btn btn-primary btn-payment btn-discourse-patrons"}} - {{i18n 'discourse_patrons.buttons.make_payment'}} {{format-curency amount}} + {{i18n 'discourse_subscriptions.buttons.make_payment'}} {{format-curency amount}} {{/d-button}} {{#if cardError}} diff --git a/assets/javascripts/discourse/templates/connectors/extra-nav-item/subscribe.hbs b/assets/javascripts/discourse/templates/connectors/extra-nav-item/subscribe.hbs index 2709b64..d3182ec 100644 --- a/assets/javascripts/discourse/templates/connectors/extra-nav-item/subscribe.hbs +++ b/assets/javascripts/discourse/templates/connectors/extra-nav-item/subscribe.hbs @@ -1,5 +1,5 @@ {{#if (show-extra-nav)}} {{#link-to 's.subscribe' class='discourse-patrons-subscribe'}} - {{i18n 'discourse_patrons.navigation.subscribe'}} + {{i18n 'discourse_subscriptions.navigation.subscribe'}} {{/link-to}} {{/if}} diff --git a/assets/javascripts/discourse/templates/connectors/user-main-nav/subscriptions.hbs b/assets/javascripts/discourse/templates/connectors/user-main-nav/subscriptions.hbs index 66370fd..3efebfb 100644 --- a/assets/javascripts/discourse/templates/connectors/user-main-nav/subscriptions.hbs +++ b/assets/javascripts/discourse/templates/connectors/user-main-nav/subscriptions.hbs @@ -1,3 +1,3 @@ {{#if (user-viewing-self model)}} - {{#link-to 'user.subscriptions'}}{{d-icon "credit-card"}}{{I18n 'discourse_patrons.navigation.subscriptions'}}{{/link-to}} + {{#link-to 'user.subscriptions'}}{{d-icon "credit-card"}}{{I18n 'discourse_subscriptions.navigation.subscriptions'}}{{/link-to}} {{/if}} diff --git a/assets/javascripts/discourse/templates/s/index.hbs b/assets/javascripts/discourse/templates/s/index.hbs index 969d5b0..58967eb 100644 --- a/assets/javascripts/discourse/templates/s/index.hbs +++ b/assets/javascripts/discourse/templates/s/index.hbs @@ -1,8 +1,8 @@ -

{{i18n 'discourse_patrons.one_time.heading.payment' site_name=siteSettings.title}}

+

{{i18n 'discourse_subscriptions.one_time.heading.payment' site_name=siteSettings.title}}

- {{cook-text siteSettings.discourse_patrons_payment_page}} + {{cook-text siteSettings.discourse_subscriptions_payment_page}}

diff --git a/assets/javascripts/discourse/templates/s/subscribe.hbs b/assets/javascripts/discourse/templates/s/subscribe.hbs index 42e43d5..c84bfdc 100644 --- a/assets/javascripts/discourse/templates/s/subscribe.hbs +++ b/assets/javascripts/discourse/templates/s/subscribe.hbs @@ -2,7 +2,7 @@

- {{i18n 'discourse_patrons.subscribe.title'}} + {{i18n 'discourse_subscriptions.subscribe.title'}}

diff --git a/assets/javascripts/discourse/templates/s/subscribe/show.hbs b/assets/javascripts/discourse/templates/s/subscribe/show.hbs index 521a616..dce5b9d 100644 --- a/assets/javascripts/discourse/templates/s/subscribe/show.hbs +++ b/assets/javascripts/discourse/templates/s/subscribe/show.hbs @@ -11,7 +11,7 @@
{{#unless model.product.subscribed}}

- {{i18n 'discourse_patrons.subscribe.card.title'}} + {{i18n 'discourse_subscriptions.subscribe.card.title'}}

{{subscribe-card cardElement=cardElement}} @@ -25,7 +25,7 @@ disabled=loading action="stripePaymentHandler" class="btn btn-primary btn-payment btn-discourse-patrons pull-right"}} - {{i18n 'discourse_patrons.subscribe.buttons.subscribe'}} + {{i18n 'discourse_subscriptions.subscribe.buttons.subscribe'}} {{/d-button}} {{/if}} diff --git a/assets/javascripts/discourse/templates/user/billing.hbs b/assets/javascripts/discourse/templates/user/billing.hbs index 575ebfe..fc690e5 100644 --- a/assets/javascripts/discourse/templates/user/billing.hbs +++ b/assets/javascripts/discourse/templates/user/billing.hbs @@ -1,12 +1,12 @@ -

{{i18n 'discourse_patrons.user.billing.title'}}

+

{{i18n 'discourse_subscriptions.user.billing.title'}}

{{#if model}} - - - + + + {{#each model as |invoice|}} @@ -23,5 +23,5 @@ {{/each}}
{{i18n 'discourse_patrons.user.billing.invoices.amount'}}{{i18n 'discourse_patrons.user.billing.invoices.number'}}{{i18n 'discourse_patrons.user.billing.invoices.created_at'}}{{i18n 'discourse_subscriptions.user.billing.invoices.amount'}}{{i18n 'discourse_subscriptions.user.billing.invoices.number'}}{{i18n 'discourse_subscriptions.user.billing.invoices.created_at'}}
{{else}} -

{{i18n 'discourse_patrons.user.billing_help'}}

+

{{i18n 'discourse_subscriptions.user.billing_help'}}

{{/if}} diff --git a/assets/javascripts/discourse/templates/user/invoices.hbs b/assets/javascripts/discourse/templates/user/invoices.hbs index 575ebfe..fc690e5 100644 --- a/assets/javascripts/discourse/templates/user/invoices.hbs +++ b/assets/javascripts/discourse/templates/user/invoices.hbs @@ -1,12 +1,12 @@ -

{{i18n 'discourse_patrons.user.billing.title'}}

+

{{i18n 'discourse_subscriptions.user.billing.title'}}

{{#if model}} - - - + + + {{#each model as |invoice|}} @@ -23,5 +23,5 @@ {{/each}}
{{i18n 'discourse_patrons.user.billing.invoices.amount'}}{{i18n 'discourse_patrons.user.billing.invoices.number'}}{{i18n 'discourse_patrons.user.billing.invoices.created_at'}}{{i18n 'discourse_subscriptions.user.billing.invoices.amount'}}{{i18n 'discourse_subscriptions.user.billing.invoices.number'}}{{i18n 'discourse_subscriptions.user.billing.invoices.created_at'}}
{{else}} -

{{i18n 'discourse_patrons.user.billing_help'}}

+

{{i18n 'discourse_subscriptions.user.billing_help'}}

{{/if}} diff --git a/assets/javascripts/discourse/templates/user/subscriptions.hbs b/assets/javascripts/discourse/templates/user/subscriptions.hbs index 8370eae..4f22b63 100644 --- a/assets/javascripts/discourse/templates/user/subscriptions.hbs +++ b/assets/javascripts/discourse/templates/user/subscriptions.hbs @@ -1,14 +1,14 @@ -{{i18n 'discourse_patrons.user.subscriptions.title'}} +{{i18n 'discourse_subscriptions.user.subscriptions.title'}} {{#if model}} - - - - - + + + + + {{#each model as |subscription|}} @@ -29,5 +29,5 @@ {{/each}}
{{i18n 'discourse_patrons.user.subscriptions.id'}}{{i18n 'discourse_patrons.user.plans.product'}}{{i18n 'discourse_patrons.user.plans.rate'}}{{i18n 'discourse_patrons.user.subscriptions.status'}}{{i18n 'discourse_patrons.user.subscriptions.created_at'}}{{i18n 'discourse_subscriptions.user.subscriptions.id'}}{{i18n 'discourse_subscriptions.user.plans.product'}}{{i18n 'discourse_subscriptions.user.plans.rate'}}{{i18n 'discourse_subscriptions.user.subscriptions.status'}}{{i18n 'discourse_subscriptions.user.subscriptions.created_at'}}
{{else}} -

{{i18n 'discourse_patrons.user.subscriptions_help'}}

+

{{i18n 'discourse_subscriptions.user.subscriptions_help'}}

{{/if}} diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 912a46b..19a151b 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -14,7 +14,7 @@ en: errors: discourse_patrons_amount_must_be_currency: "Currency amounts must be currencies without dollar symbol (eg 1.50)" js: - discourse_patrons: + discourse_subscriptions: title: Discourse Subscriptions admin_navigation: Subscriptions optional: Optional diff --git a/plugin.rb b/plugin.rb index b9458b4..0b6f98e 100644 --- a/plugin.rb +++ b/plugin.rb @@ -24,7 +24,7 @@ extend_content_security_policy( script_src: ['https://js.stripe.com/v3/'] ) -add_admin_route 'discourse_patrons.admin_navigation', 'discourse-subscriptions.products' +add_admin_route 'discourse_subscriptions.admin_navigation', 'discourse-subscriptions.products' Discourse::Application.routes.append do get '/admin/plugins/discourse-subscriptions' => 'admin/plugins#index'