diff --git a/app/overrides/spree/admin/product_properties/index/add_producer_properties_warning_and_table.html.haml.deface b/app/overrides/spree/admin/product_properties/index/add_producer_properties_warning_and_table.html.haml.deface index c31a74b9e4..149f72015a 100644 --- a/app/overrides/spree/admin/product_properties/index/add_producer_properties_warning_and_table.html.haml.deface +++ b/app/overrides/spree/admin/product_properties/index/add_producer_properties_warning_and_table.html.haml.deface @@ -1,7 +1,7 @@ / insert_after 'table.index.sortable' =f.check_box :inherits_properties -=f.label :inherits_properties, "Inherit properties from #{@product.supplier.name}? (unless overridden above)" +=f.label :inherits_properties, t(".inherits_properties_checkbox_hint", supplier: @product.supplier.name) %br %br diff --git a/app/views/admin/order_cycles/_filters.html.haml b/app/views/admin/order_cycles/_filters.html.haml index 4f0df00455..dad49a5232 100644 --- a/app/views/admin/order_cycles/_filters.html.haml +++ b/app/views/admin/order_cycles/_filters.html.haml @@ -2,7 +2,7 @@ .filter.four.columns.alpha %label{ :for => 'query' }=t('admin.quick_search') %br - %input.fullwidth{ :type => "text", :id => 'query', ng: { model: 'query' }, placeholder: "Search by Order Cycle name..." } + %input.fullwidth{ :type => "text", :id => 'query', ng: { model: 'query' }, placeholder: t(".search_by_order_cycle_name") } .filter_select.four.columns %label{ :for => 'involving_filter' }=t('.involving') %br diff --git a/app/views/spree/users/_authorised_shops.html.haml b/app/views/spree/users/_authorised_shops.html.haml index 692c953f12..a1cdd58a91 100644 --- a/app/views/spree/users/_authorised_shops.html.haml +++ b/app/views/spree/users/_authorised_shops.html.haml @@ -1,7 +1,7 @@ %table %tr - %th= t(:shop_title) - %th= t(:allow_charges?) + %th= t(".shop_name") + %th= t(".allow_charges?") %tr.customer{ id: "customer{{ customer.id }}", ng: { repeat: "customer in customers" } } %td.shop{ ng: { bind: 'shopsByID[customer.enterprise_id].name' } } %td.allow_charges diff --git a/config/locales/en.yml b/config/locales/en.yml index 8c0e9c5d98..723d4c8cf1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -839,6 +839,9 @@ en: search_placeholder: Search By Name manage: Manage manage_link: Settings + producer?: "Producer?" + package: "Package" + status: "Status" new_form: owner: Owner owner_tip: The primary user responsible for this enterprise. @@ -882,6 +885,9 @@ en: save_reload: Save and Reload Page coordinator_fees: add: Add coordinator fee + filters: + search_by_order_cycle_name: "Search by Order Cycle name..." + involving: "Involving" form: incoming: Incoming supplier: Supplier @@ -896,7 +902,6 @@ en: delivery_details: Pickup / Delivery details debug_info: Debug information index: - involving: Involving schedule: Schedule schedules: Schedules adding_a_new_schedule: Adding A New Schedule @@ -2613,6 +2618,9 @@ See the %{link} to find out more about %{sitename}'s features and to start using header: store: Store admin: + product_properties: + index: + inherits_properties_checkbox_hint: "Inherit properties from %{supplier}? (unless overridden above)" orders: invoice: issued_on: Issued on @@ -2839,5 +2847,8 @@ See the %{link} to find out more about %{sitename}'s features and to start using authorised_shops: Authorised Shops authorised_shops_popover: This is the list of shops which are permitted to charge your default credit card for any subscriptions (ie. repeating orders) you may have. Your card details will be kept secure and will not be shared with shop owners. You will always be notified when you are charged. saved_cards_popover: This is the list of cards you have opted to save for later use. Your 'default' will be selected automatically when you checkout an order, and can be charged by any shops you have allowed to do so (see right). + authorised_shops: + shop_name: "Shop Name" + allow_charges?: "Allow Charges?" localized_number: invalid_format: has an invalid format. Please enter a number.