Discource-C
/
discourse-subscriptions
mirror of https://github.com/discourse/discourse-subscriptions.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename the translations

This commit is contained in:
Rimian Perkins 2019-12-04 09:29:13 +11:00
parent d8a3ae5554
commit 21b8340f4f
26 changed files with 111 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/javascripts/discourse/controllers/s-index.js.es6
View File

@ -12,7 +12,7 @@ export default Ember.Controller.extend({
}, },
paymentSuccessHandler(/* paymentIntentId */) { paymentSuccessHandler(/* paymentIntentId */) {
bootbox.alert(I18n.t("discourse_patrons.transactions.payment.success")); bootbox.alert(I18n.t("discourse_subscriptions.transactions.payment.success"));
this.transitionToRoute( this.transitionToRoute(
"user.billing", "user.billing",
Discourse.User.current().username.toLowerCase() Discourse.User.current().username.toLowerCase()

2
assets/javascripts/discourse/controllers/s-subscribe-show.js.es6
View File

@ -41,7 +41,7 @@ export default Ember.Controller.extend({
.save() .save()
.then(() => { .then(() => {
bootbox.alert( bootbox.alert(
I18n.t("discourse_patrons.transactions.payment.success") I18n.t("discourse_subscriptions.transactions.payment.success")
); );
this.transitionToRoute( this.transitionToRoute(
"user.subscriptions", "user.subscriptions",

2
assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-index.js.es6
View File

@ -8,7 +8,7 @@ export default Discourse.Route.extend({
actions: { actions: {
destroyProduct(product) { destroyProduct(product) {
bootbox.confirm( 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("no_value"),
I18n.t("yes_value"), I18n.t("yes_value"),
confirmed => { confirmed => {

2
assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show.js.es6
View File

@ -20,7 +20,7 @@ export default Discourse.Route.extend({
actions: { actions: {
destroyPlan(plan) { destroyPlan(plan) {
bootbox.confirm( 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("no_value"),
I18n.t("yes_value"), I18n.t("yes_value"),
confirmed => { confirmed => {

2
assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-subscriptions.js.es6
View File

@ -9,7 +9,7 @@ export default Discourse.Route.extend({
cancelSubscription(subscription) { cancelSubscription(subscription) {
bootbox.confirm( bootbox.confirm(
I18n.t( I18n.t(
"discourse_patrons.user.subscriptions.operations.destroy.confirm" "discourse_subscriptions.user.subscriptions.operations.destroy.confirm"
), ),
I18n.t("no_value"), I18n.t("no_value"),
I18n.t("yes_value"), I18n.t("yes_value"),

2
assets/javascripts/discourse/routes/user-subscriptions.js.es6
View File

@ -17,7 +17,7 @@ export default Discourse.Route.extend({
cancelSubscription(subscription) { cancelSubscription(subscription) {
bootbox.confirm( bootbox.confirm(
I18n.t( I18n.t(
"discourse_patrons.user.subscriptions.operations.destroy.confirm" "discourse_subscriptions.user.subscriptions.operations.destroy.confirm"
), ),
I18n.t("no_value"), I18n.t("no_value"),
I18n.t("yes_value"), I18n.t("yes_value"),

10
assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-dashboard.hbs
View File

@ -1,16 +1,16 @@
<h3>{{i18n 'discourse_patrons.admin.dashboard.title'}}</h3> <h3>{{i18n 'discourse_subscriptions.admin.dashboard.title'}}</h3>
{{#load-more selector=".discourse-patrons-table tr" action=(action "loadMore")}} {{#load-more selector=".discourse-patrons-table tr" action=(action "loadMore")}}
{{#if model}} {{#if model}}
<table class="table discourse-patrons-table"> <table class="table discourse-patrons-table">
<thead> <thead>
<tr> <tr>
<th>{{i18n 'discourse_patrons.admin.dashboard.table.head.user'}}</th> <th>{{i18n 'discourse_subscriptions.admin.dashboard.table.head.user'}}</th>
<th>{{i18n 'discourse_patrons.admin.dashboard.table.head.payment_intent'}}</th> <th>{{i18n 'discourse_subscriptions.admin.dashboard.table.head.payment_intent'}}</th>
<th>{{i18n 'discourse_patrons.admin.dashboard.table.head.receipt_email'}}</th> <th>{{i18n 'discourse_subscriptions.admin.dashboard.table.head.receipt_email'}}</th>
<th onclick={{action "orderPayments" "created_at"}} class="sortable">{{i18n 'created'}}</th> <th onclick={{action "orderPayments" "created_at"}} class="sortable">{{i18n 'created'}}</th>
<th class="amount" onclick={{action "orderPayments" "amount"}} class="sortable amount">{{i18n 'discourse_patrons.admin.dashboard.table.head.amount'}}</th> <th class="amount" onclick={{action "orderPayments" "amount"}} class="sortable amount">{{i18n 'discourse_subscriptions.admin.dashboard.table.head.amount'}}</th>
</tr> </tr>
</thead> </thead>
{{#each model as |payment|}} {{#each model as |payment|}}

8
assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-plans-index.hbs
View File

@ -1,10 +1,10 @@
<table class="table discourse-patrons-table"> <table class="table discourse-patrons-table">
<thead> <thead>
<th>{{i18n 'discourse_patrons.admin.plans.plan.plan_id'}}</th> <th>{{i18n 'discourse_subscriptions.admin.plans.plan.plan_id'}}</th>
<th>{{i18n 'discourse_patrons.admin.plans.plan.nickname.title'}}</th> <th>{{i18n 'discourse_subscriptions.admin.plans.plan.nickname.title'}}</th>
<th>{{i18n 'discourse_patrons.admin.plans.plan.interval'}}</th> <th>{{i18n 'discourse_subscriptions.admin.plans.plan.interval'}}</th>
<th>{{i18n 'discourse_patrons.admin.plans.plan.amount'}}</th> <th>{{i18n 'discourse_subscriptions.admin.plans.plan.amount'}}</th>
<th></th> <th></th>
</thead> </thead>
{{#each model as |plan|}} {{#each model as |plan|}}

12
assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-index.hbs
View File

@ -2,17 +2,17 @@
<p class="btn-right"> <p class="btn-right">
{{#link-to 'adminPlugins.discourse-subscriptions.products.show' 'new' class="btn btn-primary"}} {{#link-to 'adminPlugins.discourse-subscriptions.products.show' 'new' class="btn btn-primary"}}
{{d-icon "plus"}} {{d-icon "plus"}}
<span>{{i18n 'discourse_patrons.admin.products.operations.new'}}</span> <span>{{i18n 'discourse_subscriptions.admin.products.operations.new'}}</span>
{{/link-to}} {{/link-to}}
</p> </p>
{{#if model}} {{#if model}}
<table class="table discourse-patrons-table"> <table class="table discourse-patrons-table">
<thead> <thead>
<th>{{i18n 'discourse_patrons.admin.products.product.name'}}</th> <th>{{i18n 'discourse_subscriptions.admin.products.product.name'}}</th>
<th>{{i18n 'discourse_patrons.admin.products.product.created_at'}}</th> <th>{{i18n 'discourse_subscriptions.admin.products.product.created_at'}}</th>
<th>{{i18n 'discourse_patrons.admin.products.product.updated_at'}}</th> <th>{{i18n 'discourse_subscriptions.admin.products.product.updated_at'}}</th>
<th class="td-right">{{i18n 'discourse_patrons.admin.products.product.active'}}</th> <th class="td-right">{{i18n 'discourse_subscriptions.admin.products.product.active'}}</th>
<th></th> <th></th>
</thead> </thead>
{{#each model as |product|}} {{#each model as |product|}}
@ -36,6 +36,6 @@
</table> </table>
{{else}} {{else}}
<p> <p>
{{i18n 'discourse_patrons.admin.products.product_help'}} {{i18n 'discourse_subscriptions.admin.products.product_help'}}
</p> </p>
{{/if}} {{/if}}

30
assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.hbs
View File

@ -1,27 +1,27 @@
<h4>{{i18n 'discourse_patrons.admin.plans.title'}}</h4> <h4>{{i18n 'discourse_subscriptions.admin.plans.title'}}</h4>
<form class="form-horizontal"> <form class="form-horizontal">
<p> <p>
<label for="product">{{i18n 'discourse_patrons.admin.products.product.name'}}</label> <label for="product">{{i18n 'discourse_subscriptions.admin.products.product.name'}}</label>
{{input type="text" name="product_name" value=model.product.name disabled=true}} {{input type="text" name="product_name" value=model.product.name disabled=true}}
</p> </p>
<p> <p>
<label for="name">{{i18n 'discourse_patrons.admin.plans.plan.nickname'}}</label> <label for="name">{{i18n 'discourse_subscriptions.admin.plans.plan.nickname'}}</label>
{{input type="text" name="name" value=model.plan.nickname}} {{input type="text" name="name" value=model.plan.nickname}}
<div class="control-instructions"> <div class="control-instructions">
{{i18n 'discourse_patrons.admin.plans.plan.nickname_help'}} {{i18n 'discourse_subscriptions.admin.plans.plan.nickname_help'}}
</div> </div>
</p> </p>
<p> <p>
<label for="interval">{{i18n 'discourse_patrons.admin.plans.plan.group'}}</label> <label for="interval">{{i18n 'discourse_subscriptions.admin.plans.plan.group'}}</label>
{{combo-box valueAttribute="name" content=model.groups value=model.plan.metadata.group_name}} {{combo-box valueAttribute="name" content=model.groups value=model.plan.metadata.group_name}}
<div class="control-instructions"> <div class="control-instructions">
{{i18n 'discourse_patrons.admin.plans.plan.group_help'}} {{i18n 'discourse_subscriptions.admin.plans.plan.group_help'}}
</div> </div>
</p> </p>
<p> <p>
<label for="amount">{{i18n 'discourse_patrons.admin.plans.plan.amount'}}</label> <label for="amount">{{i18n 'discourse_subscriptions.admin.plans.plan.amount'}}</label>
{{#if planFieldDisabled}} {{#if planFieldDisabled}}
{{input class="plan-amount plan-currency" disabled=true value=model.plan.currency}} {{input class="plan-amount plan-currency" disabled=true value=model.plan.currency}}
{{else}} {{else}}
@ -31,23 +31,23 @@
</p> </p>
<p> <p>
<label for="trial"> <label for="trial">
{{i18n 'discourse_patrons.admin.plans.plan.trial'}} {{i18n 'discourse_subscriptions.admin.plans.plan.trial'}}
({{i18n 'discourse_patrons.optional'}}) ({{i18n 'discourse_subscriptions.optional'}})
</label> </label>
{{input type="text" name="trial" value=model.plan.trial_period_days}} {{input type="text" name="trial" value=model.plan.trial_period_days}}
<div class="control-instructions"> <div class="control-instructions">
{{i18n 'discourse_patrons.admin.plans.plan.trial_help'}} {{i18n 'discourse_subscriptions.admin.plans.plan.trial_help'}}
</div> </div>
</p> </p>
<p> <p>
<label for="interval"> <label for="interval">
{{i18n 'discourse_patrons.admin.plans.plan.interval'}} {{i18n 'discourse_subscriptions.admin.plans.plan.interval'}}
</label> </label>
{{combo-box valueAttribute="value" content=model.plan.intervals value=model.plan.interval}} {{combo-box valueAttribute="value" content=model.plan.intervals value=model.plan.interval}}
</p> </p>
<p> <p>
<label for="active"> <label for="active">
{{i18n 'discourse_patrons.admin.plans.plan.active'}} {{i18n 'discourse_subscriptions.admin.plans.plan.active'}}
</label> </label>
{{input type="checkbox" name="active" checked=model.plan.active}} {{input type="checkbox" name="active" checked=model.plan.active}}
</p> </p>
@ -57,16 +57,16 @@
<hr> <hr>
<p class="control-instructions"> <p class="control-instructions">
{{i18n 'discourse_patrons.admin.plans.operations.create_help'}} {{i18n 'discourse_subscriptions.admin.plans.operations.create_help'}}
</p> </p>
<div class="pull-right"> <div class="pull-right">
{{d-button label="cancel" action=(action "cancelPlan" model.plan.product) icon="times"}} {{d-button label="cancel" action=(action "cancelPlan" model.plan.product) icon="times"}}
{{#if model.plan.isNew}} {{#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}} {{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}} {{/if}}
</div> </div>

36
assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show.hbs
View File

@ -1,49 +1,49 @@
<h4>{{i18n 'discourse_patrons.admin.products.title'}}</h4> <h4>{{i18n 'discourse_subscriptions.admin.products.title'}}</h4>
<form class="form-horizontal"> <form class="form-horizontal">
<p> <p>
<label for="name">{{i18n 'discourse_patrons.admin.products.product.name'}}</label> <label for="name">{{i18n 'discourse_subscriptions.admin.products.product.name'}}</label>
{{input type="text" name="name" value=model.product.name}} {{input type="text" name="name" value=model.product.name}}
</p> </p>
<p> <p>
<label for="description"> <label for="description">
{{i18n 'discourse_patrons.admin.products.product.description'}} {{i18n 'discourse_subscriptions.admin.products.product.description'}}
</label> </label>
{{textarea name="description" value=model.product.metadata.description class="discourse-patrons-admin-textarea"}} {{textarea name="description" value=model.product.metadata.description class="discourse-patrons-admin-textarea"}}
<div class="control-instructions"> <div class="control-instructions">
{{i18n 'discourse_patrons.admin.products.product.description_help'}} {{i18n 'discourse_subscriptions.admin.products.product.description_help'}}
</div> </div>
</p> </p>
<p> <p>
<label for="statement_descriptor"> <label for="statement_descriptor">
{{i18n 'discourse_patrons.admin.products.product.statement_descriptor'}} {{i18n 'discourse_subscriptions.admin.products.product.statement_descriptor'}}
</label> </label>
{{input type="text" name="statement_descriptor" value=model.product.statement_descriptor}} {{input type="text" name="statement_descriptor" value=model.product.statement_descriptor}}
<div class="control-instructions"> <div class="control-instructions">
{{i18n 'discourse_patrons.admin.products.product.statement_descriptor_help'}} {{i18n 'discourse_subscriptions.admin.products.product.statement_descriptor_help'}}
</div> </div>
</p> </p>
<p> <p>
<label for="active">{{i18n 'discourse_patrons.admin.products.product.active'}}</label> <label for="active">{{i18n 'discourse_subscriptions.admin.products.product.active'}}</label>
{{input type="checkbox" name="active" checked=model.product.active}} {{input type="checkbox" name="active" checked=model.product.active}}
</p> </p>
</form> </form>
{{#unless model.product.isNew}} {{#unless model.product.isNew}}
<h4>{{i18n 'discourse_patrons.admin.plans.title'}}</h4> <h4>{{i18n 'discourse_subscriptions.admin.plans.title'}}</h4>
<p> <p>
<table class="table discourse-patrons-table"> <table class="table discourse-patrons-table">
<thead> <thead>
<th>{{i18n 'discourse_patrons.admin.plans.plan.nickname'}}</th> <th>{{i18n 'discourse_subscriptions.admin.plans.plan.nickname'}}</th>
<th>{{i18n 'discourse_patrons.admin.plans.plan.interval'}}</th> <th>{{i18n 'discourse_subscriptions.admin.plans.plan.interval'}}</th>
<th>{{i18n 'discourse_patrons.admin.plans.plan.created_at'}}</th> <th>{{i18n 'discourse_subscriptions.admin.plans.plan.created_at'}}</th>
<th>{{i18n 'discourse_patrons.admin.plans.plan.group'}}</th> <th>{{i18n 'discourse_subscriptions.admin.plans.plan.group'}}</th>
<th>{{i18n 'discourse_patrons.admin.plans.plan.active'}}</th> <th>{{i18n 'discourse_subscriptions.admin.plans.plan.active'}}</th>
<th class="td-right">{{i18n 'discourse_patrons.admin.plans.plan.amount'}}</th> <th class="td-right">{{i18n 'discourse_subscriptions.admin.plans.plan.amount'}}</th>
<th class="td-right"> <th class="td-right">
{{#link-to "adminPlugins.discourse-subscriptions.products.show.plans.show" model.product.id "new" class="btn"}} {{#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}} {{/link-to}}
</th> </th>
</thead> </thead>
@ -72,7 +72,7 @@
<tr> <tr>
<td colspan="8"> <td colspan="8">
<hr> <hr>
{{i18n 'discourse_patrons.admin.products.product.plan_help'}} {{i18n 'discourse_subscriptions.admin.products.product.plan_help'}}
</td> </td>
</tr> </tr>
{{/unless}} {{/unless}}
@ -83,9 +83,9 @@
<div class="pull-right"> <div class="pull-right">
{{d-button label="cancel" action=(action "cancelProduct") icon="times"}} {{d-button label="cancel" action=(action "cancelProduct") icon="times"}}
{{#if model.product.isNew}} {{#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}} {{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}} {{/if}}
</div> </div>

14
assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-subscriptions.hbs
View File

@ -2,13 +2,13 @@
<table class="table discourse-patrons-table"> <table class="table discourse-patrons-table">
<thead> <thead>
<tr> <tr>
<th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.user'}}</th> <th>{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.user'}}</th>
<th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.subscription_id'}}</th> <th>{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.subscription_id'}}</th>
<th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.customer'}}</th> <th>{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.customer'}}</th>
<th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.product'}}</th> <th>{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.product'}}</th>
<th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.plan'}}</th> <th>{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.plan'}}</th>
<th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.status'}}</th> <th>{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.status'}}</th>
<th class="td-right">{{i18n 'discourse_patrons.admin.subscriptions.subscription.created_at'}}</th> <th class="td-right">{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.created_at'}}</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>

8
assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions.hbs
View File

@ -1,10 +1,10 @@
<h2>{{i18n 'discourse_patrons.title' site_name=siteSettings.title}}</h2> <h2>{{i18n 'discourse_subscriptions.title' site_name=siteSettings.title}}</h2>
<ul class="nav nav-pills"> <ul class="nav nav-pills">
{{!-- {{nav-item route='adminPlugins.discourse-subscriptions.dashboard' label='discourse_patrons.admin.dashboard.title'}} --}} {{!-- {{nav-item route='adminPlugins.discourse-subscriptions.dashboard' label='discourse_subscriptions.admin.dashboard.title'}} --}}
{{nav-item route='adminPlugins.discourse-subscriptions.products' label='discourse_patrons.admin.products.title'}} {{nav-item route='adminPlugins.discourse-subscriptions.products' label='discourse_subscriptions.admin.products.title'}}
{{nav-item route='adminPlugins.discourse-subscriptions.subscriptions' label='discourse_patrons.admin.subscriptions.title'}} {{nav-item route='adminPlugins.discourse-subscriptions.subscriptions' label='discourse_subscriptions.admin.subscriptions.title'}}
</ul> </ul>
<hr> <hr>

34
assets/javascripts/discourse/templates/components/donation-form.hbs
View File

@ -1,20 +1,20 @@
{{#if confirmation}} {{#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}} {{#d-modal-body}}
<div class="discourse-patrons-section-columns"> <div class="discourse-patrons-section-columns">
<div class="section-column discourse-patrons-confirmation-billing"> <div class="section-column discourse-patrons-confirmation-billing">
<table class="discourse-patrons-confirmation"> <table class="discourse-patrons-confirmation">
<tr> <tr>
<td>{{i18n 'discourse_patrons.billing.name'}}</td> <td>{{i18n 'discourse_subscriptions.billing.name'}}</td>
<td>{{billing.name}}</td> <td>{{billing.name}}</td>
</tr> </tr>
<tr> <tr>
<td>{{i18n 'discourse_patrons.billing.email'}}</td> <td>{{i18n 'discourse_subscriptions.billing.email'}}</td>
<td>{{billing.email}}</td> <td>{{billing.email}}</td>
</tr> </tr>
<tr> <tr>
<td>{{i18n 'discourse_patrons.billing.phone'}}</td> <td>{{i18n 'discourse_subscriptions.billing.phone'}}</td>
<td>{{billing.phone}}</td> <td>{{billing.phone}}</td>
</tr> </tr>
</table> </table>
@ -22,11 +22,11 @@
<div class="section-column"> <div class="section-column">
<table class="discourse-patrons-confirmation"> <table class="discourse-patrons-confirmation">
<tr> <tr>
<td>{{i18n 'discourse_patrons.confirmation.amount'}}</td> <td>{{i18n 'discourse_subscriptions.confirmation.amount'}}</td>
<td class="discourse-donations-amount">{{format-curency amount}}</td> <td class="discourse-donations-amount">{{format-curency amount}}</td>
</tr> </tr>
<tr> <tr>
<td>{{i18n 'discourse_patrons.confirmation.last4'}}</td> <td>{{i18n 'discourse_subscriptions.confirmation.last4'}}</td>
<td class="discourse-patrons-last4">.... .... .... {{last4}}</td> <td class="discourse-patrons-last4">.... .... .... {{last4}}</td>
</tr> </tr>
</table> </table>
@ -36,7 +36,7 @@
<div class='modal-footer'> <div class='modal-footer'>
{{#d-button action="confirmStripeCard" class="btn btn-primary btn-payment btn-discourse-patrons"}} {{#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}} {{/d-button}}
</div> </div>
@ -51,47 +51,47 @@
{{else}} {{else}}
<div class="discourse-patrons-section-columns discourse-patrons-payment-details"> <div class="discourse-patrons-section-columns discourse-patrons-payment-details">
<div class="section-column"> <div class="section-column">
<h3>{{i18n 'discourse_patrons.one_time.payment.your_information'}}</h3> <h3>{{i18n 'discourse_subscriptions.one_time.payment.your_information'}}</h3>
<div class="user-controls discourse-patrons-fields discourse-patrons-billing"> <div class="user-controls discourse-patrons-fields discourse-patrons-billing">
<div class="display-row"> <div class="display-row">
<div class="field"> <div class="field">
{{i18n 'discourse_patrons.billing.name'}} {{i18n 'discourse_subscriptions.billing.name'}}
</div> </div>
<div class="value"> <div class="value">
{{input value=billing.name}} {{input value=billing.name}}
<div class="desc">{{i18n 'discourse_patrons.one_time.payment.optional'}}</div> <div class="desc">{{i18n 'discourse_subscriptions.one_time.payment.optional'}}</div>
</div> </div>
</div> </div>
<div class="display-row"> <div class="display-row">
<div class="field"> <div class="field">
{{i18n 'discourse_patrons.billing.email'}} {{i18n 'discourse_subscriptions.billing.email'}}
</div> </div>
<div class="value"> <div class="value">
{{input type="email" value=billing.email}} {{input type="email" value=billing.email}}
<div class="desc">{{i18n 'discourse_patrons.one_time.payment.receipt_info'}}</div> <div class="desc">{{i18n 'discourse_subscriptions.one_time.payment.receipt_info'}}</div>
</div> </div>
</div> </div>
<div class="display-row"> <div class="display-row">
<div class="field"> <div class="field">
{{i18n 'discourse_patrons.billing.phone'}} {{i18n 'discourse_subscriptions.billing.phone'}}
</div> </div>
<div class="value"> <div class="value">
{{input value=billing.phone}} {{input value=billing.phone}}
<div class="desc">{{i18n 'discourse_patrons.one_time.payment.optional'}}</div> <div class="desc">{{i18n 'discourse_subscriptions.one_time.payment.optional'}}</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="section-column"> <div class="section-column">
<h3>{{i18n 'discourse_patrons.one_time.payment.payment_information'}}</h3> <h3>{{i18n 'discourse_subscriptions.one_time.payment.payment_information'}}</h3>
<div class="user-controls discourse-patrons-fields"> <div class="user-controls discourse-patrons-fields">
<div class="display-row"> <div class="display-row">
<div class="field"> <div class="field">
{{i18n 'discourse_patrons.one_time.amount'}} {{i18n 'discourse_subscriptions.one_time.amount'}}
{{siteSettings.discourse_patrons_currency}} {{siteSettings.discourse_subscriptions_currency}}
</div> </div>
<div class="value"> <div class="value">
{{combo-box valueAttribute="value" content=amounts value=amount}} {{combo-box valueAttribute="value" content=amounts value=amount}}

4
assets/javascripts/discourse/templates/components/product-list.hbs
View File

@ -10,7 +10,7 @@
{{#if currentUser}} {{#if currentUser}}
<div class="pull-right"> <div class="pull-right">
{{#link-to "s.subscribe.show" product.id disabled=product.subscribed class="btn btn-primary"}} {{#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}} {{/link-to}}
</div> </div>
{{/if}} {{/if}}
@ -19,6 +19,6 @@
{{#unless currentUser}} {{#unless currentUser}}
<p> <p>
{{i18n 'discourse_patrons.subscribe.unauthenticated'}} {{i18n 'discourse_subscriptions.subscribe.unauthenticated'}}
</p> </p>
{{/unless}} {{/unless}}

2
assets/javascripts/discourse/templates/components/stripe-card.hbs
View File

@ -3,7 +3,7 @@
<div id="card-element"></div> <div id="card-element"></div>
<div id="card-action"> <div id="card-action">
{{#d-button action="submitStripeCard" class="btn btn-primary btn-payment btn-discourse-patrons"}} {{#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}} {{/d-button}}
{{#if cardError}} {{#if cardError}}

2
assets/javascripts/discourse/templates/connectors/extra-nav-item/subscribe.hbs
View File

@ -1,5 +1,5 @@
{{#if (show-extra-nav)}} {{#if (show-extra-nav)}}
{{#link-to 's.subscribe' class='discourse-patrons-subscribe'}} {{#link-to 's.subscribe' class='discourse-patrons-subscribe'}}
{{i18n 'discourse_patrons.navigation.subscribe'}} {{i18n 'discourse_subscriptions.navigation.subscribe'}}
{{/link-to}} {{/link-to}}
{{/if}} {{/if}}

2
assets/javascripts/discourse/templates/connectors/user-main-nav/subscriptions.hbs
View File

@ -1,3 +1,3 @@
{{#if (user-viewing-self model)}} {{#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}} {{/if}}

4
assets/javascripts/discourse/templates/s/index.hbs
View File

@ -1,8 +1,8 @@
<h3>{{i18n 'discourse_patrons.one_time.heading.payment' site_name=siteSettings.title}}</h3> <h3>{{i18n 'discourse_subscriptions.one_time.heading.payment' site_name=siteSettings.title}}</h3>
<p> <p>
{{cook-text siteSettings.discourse_patrons_payment_page}} {{cook-text siteSettings.discourse_subscriptions_payment_page}}
</p> </p>
<div class="donations-page-payment"> <div class="donations-page-payment">

2
assets/javascripts/discourse/templates/s/subscribe.hbs
View File

@ -2,7 +2,7 @@
<div class="container"> <div class="container">
<div class="title-wrapper"> <div class="title-wrapper">
<h1> <h1>
{{i18n 'discourse_patrons.subscribe.title'}} {{i18n 'discourse_subscriptions.subscribe.title'}}
</h1> </h1>
</div> </div>

4
assets/javascripts/discourse/templates/s/subscribe/show.hbs
View File

@ -11,7 +11,7 @@
<div class="section-column"> <div class="section-column">
{{#unless model.product.subscribed}} {{#unless model.product.subscribed}}
<h2> <h2>
{{i18n 'discourse_patrons.subscribe.card.title'}} {{i18n 'discourse_subscriptions.subscribe.card.title'}}
</h2> </h2>
{{subscribe-card cardElement=cardElement}} {{subscribe-card cardElement=cardElement}}
@ -25,7 +25,7 @@
disabled=loading disabled=loading
action="stripePaymentHandler" action="stripePaymentHandler"
class="btn btn-primary btn-payment btn-discourse-patrons pull-right"}} 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}} {{/d-button}}
{{/if}} {{/if}}

10
assets/javascripts/discourse/templates/user/billing.hbs
View File

@ -1,12 +1,12 @@
<h3>{{i18n 'discourse_patrons.user.billing.title'}}</h3> <h3>{{i18n 'discourse_subscriptions.user.billing.title'}}</h3>
{{#if model}} {{#if model}}
<table class="topic-list"> <table class="topic-list">
<thead> <thead>
<th>{{i18n 'discourse_patrons.user.billing.invoices.amount'}}</th> <th>{{i18n 'discourse_subscriptions.user.billing.invoices.amount'}}</th>
<th>{{i18n 'discourse_patrons.user.billing.invoices.number'}}</th> <th>{{i18n 'discourse_subscriptions.user.billing.invoices.number'}}</th>
<th>{{i18n 'discourse_patrons.user.billing.invoices.created_at'}}</th> <th>{{i18n 'discourse_subscriptions.user.billing.invoices.created_at'}}</th>
<th></th> <th></th>
</thead> </thead>
{{#each model as |invoice|}} {{#each model as |invoice|}}
@ -23,5 +23,5 @@
{{/each}} {{/each}}
</table> </table>
{{else}} {{else}}
<p>{{i18n 'discourse_patrons.user.billing_help'}}</p> <p>{{i18n 'discourse_subscriptions.user.billing_help'}}</p>
{{/if}} {{/if}}

10
assets/javascripts/discourse/templates/user/invoices.hbs
View File

@ -1,12 +1,12 @@
<h3>{{i18n 'discourse_patrons.user.billing.title'}}</h3> <h3>{{i18n 'discourse_subscriptions.user.billing.title'}}</h3>
{{#if model}} {{#if model}}
<table class="topic-list"> <table class="topic-list">
<thead> <thead>
<th>{{i18n 'discourse_patrons.user.billing.invoices.amount'}}</th> <th>{{i18n 'discourse_subscriptions.user.billing.invoices.amount'}}</th>
<th>{{i18n 'discourse_patrons.user.billing.invoices.number'}}</th> <th>{{i18n 'discourse_subscriptions.user.billing.invoices.number'}}</th>
<th>{{i18n 'discourse_patrons.user.billing.invoices.created_at'}}</th> <th>{{i18n 'discourse_subscriptions.user.billing.invoices.created_at'}}</th>
<th></th> <th></th>
</thead> </thead>
{{#each model as |invoice|}} {{#each model as |invoice|}}
@ -23,5 +23,5 @@
{{/each}} {{/each}}
</table> </table>
{{else}} {{else}}
<p>{{i18n 'discourse_patrons.user.billing_help'}}</p> <p>{{i18n 'discourse_subscriptions.user.billing_help'}}</p>
{{/if}} {{/if}}

14
assets/javascripts/discourse/templates/user/subscriptions.hbs
View File

@ -1,14 +1,14 @@
{{i18n 'discourse_patrons.user.subscriptions.title'}} {{i18n 'discourse_subscriptions.user.subscriptions.title'}}
{{#if model}} {{#if model}}
<table class="table discourse-patrons-user-table"> <table class="table discourse-patrons-user-table">
<thead> <thead>
<th>{{i18n 'discourse_patrons.user.subscriptions.id'}}</th> <th>{{i18n 'discourse_subscriptions.user.subscriptions.id'}}</th>
<th>{{i18n 'discourse_patrons.user.plans.product'}}</th> <th>{{i18n 'discourse_subscriptions.user.plans.product'}}</th>
<th>{{i18n 'discourse_patrons.user.plans.rate'}}</th> <th>{{i18n 'discourse_subscriptions.user.plans.rate'}}</th>
<th>{{i18n 'discourse_patrons.user.subscriptions.status'}}</th> <th>{{i18n 'discourse_subscriptions.user.subscriptions.status'}}</th>
<th>{{i18n 'discourse_patrons.user.subscriptions.created_at'}}</th> <th>{{i18n 'discourse_subscriptions.user.subscriptions.created_at'}}</th>
<th></th> <th></th>
</thead> </thead>
{{#each model as |subscription|}} {{#each model as |subscription|}}
@ -29,5 +29,5 @@
{{/each}} {{/each}}
</table> </table>
{{else}} {{else}}
<p>{{i18n 'discourse_patrons.user.subscriptions_help'}}</p> <p>{{i18n 'discourse_subscriptions.user.subscriptions_help'}}</p>
{{/if}} {{/if}}

2
config/locales/client.en.yml
View File

@ -14,7 +14,7 @@ en:
errors: errors:
discourse_patrons_amount_must_be_currency: "Currency amounts must be currencies without dollar symbol (eg 1.50)" discourse_patrons_amount_must_be_currency: "Currency amounts must be currencies without dollar symbol (eg 1.50)"
js: js:
discourse_patrons: discourse_subscriptions:
title: Discourse Subscriptions title: Discourse Subscriptions
admin_navigation: Subscriptions admin_navigation: Subscriptions
optional: Optional optional: Optional

2
plugin.rb
View File

@ -24,7 +24,7 @@ extend_content_security_policy(
script_src: ['https://js.stripe.com/v3/'] 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 Discourse::Application.routes.append do
get '/admin/plugins/discourse-subscriptions' => 'admin/plugins#index' get '/admin/plugins/discourse-subscriptions' => 'admin/plugins#index'