Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5579 missing translation subscriptions #5847

Merged
merged 2 commits into from Aug 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/admin/subscriptions/_form.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
%a.button{ href: main_app.admin_subscriptions_path, ng: { show: "['details','review'].indexOf(view) >= 0" } }= t(:cancel)
%input{ type: "button", value: t(:back), ng: { click: 'back()', show: '!!backCallbacks[view]'} }
%input.red{ type: "button", value: t(:next), ng: { click: 'next()', show: '!!nextCallbacks[view]' } }
%input.red{ type: "submit", value: t('admin.subscriptions.create'), ng: { show: "view == 'review'" } }
%input.red{ type: "submit", value: t('.create'), ng: { show: "view == 'review'" } }
%div{ ng: { show: 'subscription.id' } }
%a.button{ href: main_app.admin_subscriptions_path }= t(:close)
%input.red{ type: "button", value: t(:review), ng: { click: "setView('review')", show: "view != 'review'" } }
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/subscriptions/edit.html.haml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- content_for :page_title do
=t('admin.subscriptions.edit')
=t('.title')

-# - content_for :page_actions do
-# %li= button_link_to "Back to subscriptions list", main_app.admin_subscriptions_path, icon: 'icon-arrow-left'
Expand Down
4 changes: 2 additions & 2 deletions app/views/admin/subscriptions/index.html.haml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
- content_for :page_title do
= t('admin.subscriptions.subscriptions')
= t('.title')

- content_for :main_ng_app_name do
= "admin.subscriptions"

- content_for :page_actions do
%li
%a.button.icon-plus#new-subscription{ href: "javascript:void(0)", "new-subscription-dialog" => true }
= t('admin.subscriptions.new')
= t('.new')

= render :partial => 'spree/admin/shared/order_sub_menu'

Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/subscriptions/new.html.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-# = render :partial => 'spree/shared/error_messages', :locals => { :target => @enterprise }

- content_for :page_title do
=t('admin.subscriptions.new')
=t('.title')

-# - content_for :page_actions do
-# %li= button_link_to "Back to subscriptions list", main_app.admin_subscriptions_path, icon: 'icon-arrow-left'
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/subscriptions/setup_explanation.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%h1.text-center.margin-bottom-30= t('admin.subscription.subscriptions')
%h1.text-center.margin-bottom-30= t('.title')

.row
.four.columns.alpha  
Expand Down
14 changes: 10 additions & 4 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1091,10 +1091,13 @@ en:
name: "Enterprise Fee Summary"
description: "Summary of Enterprise Fees collected"
subscriptions:
subscriptions: Subscriptions
new: New Subscription
create: Create Subscription
edit: Edit Subscription
index:
title: "Subscriptions"
new: "New Subscription"
new:
title: "New Subscription"
edit:
title: "Edit Subscription"
table:
edit_subscription: Edit Subscription
pause_subscription: Pause Subscription
Expand All @@ -1103,6 +1106,7 @@ en:
filters:
query_placeholder: "Search by email..."
setup_explanation:
title: "Subscriptions"
just_a_few_more_steps: 'Just a few more steps before you can begin:'
enable_subscriptions: "Enable subscriptions for at least one of your shops"
enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
Expand All @@ -1116,6 +1120,8 @@ en:
create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
reload_this_page: reload this page
form:
create: "Create Subscription"
steps:
details: 1. Basic Details
address: 2. Address
Expand Down