From 40443b19f176d9cf4cfa8fbbad2f40d698d4b55a Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Fri, 7 Sep 2018 17:50:27 +0800 Subject: [PATCH 1/5] Add translations for headers in enterprise index This is for the view when logged in as enterprise manager. The translations added are: * Producer? * Package * Status --- config/locales/en.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index f34706ca29..bdf68fadfa 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -821,6 +821,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. From 86f4a118dd1507c6959d8332f0b14554182ee4b1 Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Fri, 7 Sep 2018 17:58:34 +0800 Subject: [PATCH 2/5] Translate placeholder for order cycle name filter --- app/views/admin/order_cycles/_filters.html.haml | 2 +- config/locales/en.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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/config/locales/en.yml b/config/locales/en.yml index bdf68fadfa..a8b7243eb1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -867,6 +867,8 @@ en: save_reload: Save and Reload Page coordinator_fees: add: Add coordinator fee + filters: + search_by_order_cycle_name: "Search by Order Cycle name..." form: incoming: Incoming supplier: Supplier From c64acf47ab0efc743b9da91334efb33c32908feb Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Fri, 7 Sep 2018 18:08:20 +0800 Subject: [PATCH 3/5] Fix translation key for "involving" in OC filters --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index a8b7243eb1..2eb472b652 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -869,6 +869,7 @@ en: add: Add coordinator fee filters: search_by_order_cycle_name: "Search by Order Cycle name..." + involving: "Involving" form: incoming: Incoming supplier: Supplier @@ -883,7 +884,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 From fc79aae17c868c47cbb39ce69cd2b78735f425e5 Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Fri, 7 Sep 2018 18:18:34 +0800 Subject: [PATCH 4/5] Translate authorized shops headers in account page --- app/views/spree/users/_authorised_shops.html.haml | 4 ++-- config/locales/en.yml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) 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 2eb472b652..217fdbb687 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2819,5 +2819,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. From 9dcdb67352760090fd87927ed1508056fd68a010 Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Sat, 8 Sep 2018 01:37:51 +0800 Subject: [PATCH 5/5] Translate inherits_properties label in product form --- .../add_producer_properties_warning_and_table.html.haml.deface | 2 +- config/locales/en.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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/config/locales/en.yml b/config/locales/en.yml index 217fdbb687..b06fdb80dc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2595,6 +2595,9 @@ See the %{link} to find out more about %{sitename}'s features and to start using date: "Date" time: "Time" admin: + product_properties: + index: + inherits_properties_checkbox_hint: "Inherit properties from %{supplier}? (unless overridden above)" orders: invoice: issued_on: Issued on