From 598426a5e9a4f3e48f263324c022fb33ed448318 Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 18 Oct 2019 22:18:54 -0700 Subject: [PATCH 1/3] Add Save Changes button translation --- app/views/admin/variant_overrides/_products.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/variant_overrides/_products.html.haml b/app/views/admin/variant_overrides/_products.html.haml index 1acbfd2924..e8d239b803 100644 --- a/app/views/admin/variant_overrides/_products.html.haml +++ b/app/views/admin/variant_overrides/_products.html.haml @@ -1,6 +1,6 @@ %form{ name: 'variant_overrides_form', ng: { show: "views.inventory.visible" } } %save-bar{ dirty: "customers_form.$dirty", persist: "false" } - %input.red{ type: "button", value: "Save Changes", ng: { click: "update()", disabled: "!variant_overrides_form.$dirty" } } + %input.red{ type: "button", value: t(:save_changes), ng: { click: "update()", disabled: "!variant_overrides_form.$dirty" } } %table.index.bulk#variant-overrides %col.producer{ width: "20%", ng: { show: 'columns.producer.visible' } } %col.product{ width: "20%", ng: { show: 'columns.product.visible' } } From deb17f47a79140c3d92637e43e7f90c177191122 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sat, 19 Oct 2019 16:33:31 -0700 Subject: [PATCH 2/3] Add default_stock to en.yml and _products_variants --- app/views/admin/variant_overrides/_products_variants.html.haml | 2 +- config/locales/en.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/admin/variant_overrides/_products_variants.html.haml b/app/views/admin/variant_overrides/_products_variants.html.haml index ff8e5ab186..00d746b0b0 100644 --- a/app/views/admin/variant_overrides/_products_variants.html.haml +++ b/app/views/admin/variant_overrides/_products_variants.html.haml @@ -14,7 +14,7 @@ %td.reset{ ng: { show: 'columns.reset.visible' } } %input{name: 'variant-overrides-{{ variant.id }}-resettable', type: 'checkbox', ng: {model: 'variantOverrides[hub_id][variant.id].resettable'}, placeholder: '{{ variant.resettable }}', 'ofn-track-variant-override' => 'resettable'} %td.reset{ ng: { show: 'columns.reset.visible' } } - %input{name: 'variant-overrides-{{ variant.id }}-default_stock', type: 'text', ng: {model: 'variantOverrides[hub_id][variant.id].default_stock'}, placeholder: '{{ variant.default_stock ? variant.default_stock : "Default stock"}}', 'ofn-track-variant-override' => 'default_stock'} + %input{name: 'variant-overrides-{{ variant.id }}-default_stock', type: 'text', ng: {model: 'variantOverrides[hub_id][variant.id].default_stock'}, placeholder: '{{ variant.default_stock ? variant.default_stock : t(admin.variant_overrides.index.default_stock)}}', 'ofn-track-variant-override' => 'default_stock'} %td.inheritance{ ng: { show: 'columns.inheritance.visible' } } %input.field{ :type => 'checkbox', name: 'variant-overrides-{{ variant.id }}-inherit', ng: { model: 'inherit' }, 'track-inheritance' => true } %td.tags{ ng: { show: 'columns.tags.visible' } } diff --git a/config/locales/en.yml b/config/locales/en.yml index 975cbad3db..26d41fc7f1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -592,6 +592,7 @@ en: title: Inventory description: Use this page to manage inventories for your enterprises. Any product details set here will override those set on the 'Products' page enable_reset?: Enable Stock Reset? + default_stock: "Default stock" inherit?: Inherit? add: Add hide: Hide From 3372339907ca8a04bbb5fb893713308c4c3f0d05 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 22 Oct 2019 17:29:04 +0100 Subject: [PATCH 3/3] Fix default stock translation by using t filter instead of t function --- app/views/admin/variant_overrides/_products_variants.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/variant_overrides/_products_variants.html.haml b/app/views/admin/variant_overrides/_products_variants.html.haml index 00d746b0b0..33f9fb9a61 100644 --- a/app/views/admin/variant_overrides/_products_variants.html.haml +++ b/app/views/admin/variant_overrides/_products_variants.html.haml @@ -14,7 +14,7 @@ %td.reset{ ng: { show: 'columns.reset.visible' } } %input{name: 'variant-overrides-{{ variant.id }}-resettable', type: 'checkbox', ng: {model: 'variantOverrides[hub_id][variant.id].resettable'}, placeholder: '{{ variant.resettable }}', 'ofn-track-variant-override' => 'resettable'} %td.reset{ ng: { show: 'columns.reset.visible' } } - %input{name: 'variant-overrides-{{ variant.id }}-default_stock', type: 'text', ng: {model: 'variantOverrides[hub_id][variant.id].default_stock'}, placeholder: '{{ variant.default_stock ? variant.default_stock : t(admin.variant_overrides.index.default_stock)}}', 'ofn-track-variant-override' => 'default_stock'} + %input{name: 'variant-overrides-{{ variant.id }}-default_stock', type: 'text', ng: {model: 'variantOverrides[hub_id][variant.id].default_stock'}, placeholder: '{{ variant.default_stock ? variant.default_stock : ("admin.variant_overrides.index.default_stock" | t)}}', 'ofn-track-variant-override' => 'default_stock'} %td.inheritance{ ng: { show: 'columns.inheritance.visible' } } %input.field{ :type => 'checkbox', name: 'variant-overrides-{{ variant.id }}-inherit', ng: { model: 'inherit' }, 'track-inheritance' => true } %td.tags{ ng: { show: 'columns.tags.visible' } }