From 3b7a682611b940a2b20128f814af4ff0874b5712 Mon Sep 17 00:00:00 2001 From: Peretz Cohen Date: Mon, 20 Jun 2022 07:20:20 -0700 Subject: [PATCH 01/86] Add video button aria label (#1728) --- sections/collage.liquid | 2 +- sections/video.liquid | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sections/collage.liquid b/sections/collage.liquid index ee52bffcb82..a888a49ed66 100644 --- a/sections/collage.liquid +++ b/sections/collage.liquid @@ -95,7 +95,7 @@
- {%- endform -%}
+ +{% schema %} +{ + "name": "t:sections.main-activate-account.name", + "settings": [ + { + "type": "header", + "content": "t:sections.all.padding.section_padding_heading" + }, + { + "type": "range", + "id": "padding_top", + "min": 0, + "max": 100, + "step": 4, + "unit": "px", + "label": "t:sections.all.padding.padding_top", + "default": 36 + }, + { + "type": "range", + "id": "padding_bottom", + "min": 0, + "max": 100, + "step": 4, + "unit": "px", + "label": "t:sections.all.padding.padding_bottom", + "default": 36 + } + ] +} +{% endschema %} diff --git a/templates/customers/addresses.liquid b/sections/main-addresses.liquid similarity index 92% rename from templates/customers/addresses.liquid rename to sections/main-addresses.liquid index 1ebb3611cba..68e069ab708 100644 --- a/templates/customers/addresses.liquid +++ b/sections/main-addresses.liquid @@ -2,8 +2,22 @@ +{%- style -%} + .section-{{ section.id }}-padding { + padding-top: {{ section.settings.padding_top | times: 0.75 | round: 0 }}px; + padding-bottom: {{ section.settings.padding_bottom | times: 0.75 | round: 0 }}px; + } + + @media screen and (min-width: 750px) { + .section-{{ section.id }}-padding { + padding-top: {{ section.settings.padding_top }}px; + padding-bottom: {{ section.settings.padding_bottom }}px; + } + } +{%- endstyle -%} + {%- paginate customer.addresses by 5 -%} -
+
@@ -262,3 +276,35 @@ typeof CustomerAddresses !== 'undefined' && new CustomerAddresses(); } + +{% schema %} +{ + "name": "t:sections.main-addresses.name", + "settings": [ + { + "type": "header", + "content": "t:sections.all.padding.section_padding_heading" + }, + { + "type": "range", + "id": "padding_top", + "min": 0, + "max": 100, + "step": 4, + "unit": "px", + "label": "t:sections.all.padding.padding_top", + "default": 36 + }, + { + "type": "range", + "id": "padding_bottom", + "min": 0, + "max": 100, + "step": 4, + "unit": "px", + "label": "t:sections.all.padding.padding_bottom", + "default": 36 + } + ] +} +{% endschema %} diff --git a/templates/customers/login.liquid b/sections/main-login.liquid similarity index 84% rename from templates/customers/login.liquid rename to sections/main-login.liquid index 8825b32dc4c..83d299ab833 100644 --- a/templates/customers/login.liquid +++ b/sections/main-login.liquid @@ -1,6 +1,20 @@ {{ 'customer.css' | asset_url | stylesheet_tag }} - + +{% schema %} +{ + "name": "t:sections.main-login.name", + "settings": [ + { + "type": "header", + "content": "t:sections.all.padding.section_padding_heading" + }, + { + "type": "range", + "id": "padding_top", + "min": 0, + "max": 100, + "step": 4, + "unit": "px", + "label": "t:sections.all.padding.padding_top", + "default": 36 + }, + { + "type": "range", + "id": "padding_bottom", + "min": 0, + "max": 100, + "step": 4, + "unit": "px", + "label": "t:sections.all.padding.padding_bottom", + "default": 36 + } + ] +} +{% endschema %} diff --git a/templates/customers/order.liquid b/sections/main-order.liquid similarity index 92% rename from templates/customers/order.liquid rename to sections/main-order.liquid index 8faf28efb93..dc416ef7221 100644 --- a/templates/customers/order.liquid +++ b/sections/main-order.liquid @@ -1,13 +1,27 @@ {{ 'customer.css' | asset_url | stylesheet_tag }} -
+{%- style -%} + .section-{{ section.id }}-padding { + padding-top: {{ section.settings.padding_top | times: 0.75 | round: 0 }}px; + padding-bottom: {{ section.settings.padding_bottom | times: 0.75 | round: 0 }}px; + } + + @media screen and (min-width: 750px) { + .section-{{ section.id }}-padding { + padding-top: {{ section.settings.padding_top }}px; + padding-bottom: {{ section.settings.padding_bottom }}px; + } + } +{%- endstyle -%} + +
@@ -282,3 +296,35 @@
+ +{% schema %} +{ + "name": "t:sections.main-order.name", + "settings": [ + { + "type": "header", + "content": "t:sections.all.padding.section_padding_heading" + }, + { + "type": "range", + "id": "padding_top", + "min": 0, + "max": 100, + "step": 4, + "unit": "px", + "label": "t:sections.all.padding.padding_top", + "default": 36 + }, + { + "type": "range", + "id": "padding_bottom", + "min": 0, + "max": 100, + "step": 4, + "unit": "px", + "label": "t:sections.all.padding.padding_bottom", + "default": 36 + } + ] +} +{% endschema %} diff --git a/templates/customers/register.liquid b/sections/main-register.liquid similarity index 80% rename from templates/customers/register.liquid rename to sections/main-register.liquid index d900df0b077..220cbfffaae 100644 --- a/templates/customers/register.liquid +++ b/sections/main-register.liquid @@ -1,6 +1,20 @@ {{ 'customer.css' | asset_url | stylesheet_tag }} -
+{%- style -%} + .section-{{ section.id }}-padding { + padding-top: {{ section.settings.padding_top | times: 0.75 | round: 0 }}px; + padding-bottom: {{ section.settings.padding_bottom | times: 0.75 | round: 0 }}px; + } + + @media screen and (min-width: 750px) { + .section-{{ section.id }}-padding { + padding-top: {{ section.settings.padding_top }}px; + padding-bottom: {{ section.settings.padding_bottom }}px; + } + } +{%- endstyle -%} + +
@@ -118,3 +132,36 @@ {%- endform -%}
+ + +{% schema %} +{ + "name": "t:sections.main-register.name", + "settings": [ + { + "type": "header", + "content": "t:sections.all.padding.section_padding_heading" + }, + { + "type": "range", + "id": "padding_top", + "min": 0, + "max": 100, + "step": 4, + "unit": "px", + "label": "t:sections.all.padding.padding_top", + "default": 36 + }, + { + "type": "range", + "id": "padding_bottom", + "min": 0, + "max": 100, + "step": 4, + "unit": "px", + "label": "t:sections.all.padding.padding_bottom", + "default": 36 + } + ] +} +{% endschema %} diff --git a/templates/customers/reset_password.liquid b/sections/main-reset-password.liquid similarity index 76% rename from templates/customers/reset_password.liquid rename to sections/main-reset-password.liquid index 3efb8c3a36f..5b7c8e495e0 100644 --- a/templates/customers/reset_password.liquid +++ b/sections/main-reset-password.liquid @@ -1,6 +1,20 @@ {{ 'customer.css' | asset_url | stylesheet_tag }} -
+{%- style -%} + .section-{{ section.id }}-padding { + padding-top: {{ section.settings.padding_top | times: 0.75 | round: 0 }}px; + padding-bottom: {{ section.settings.padding_bottom | times: 0.75 | round: 0 }}px; + } + + @media screen and (min-width: 750px) { + .section-{{ section.id }}-padding { + padding-top: {{ section.settings.padding_top }}px; + padding-bottom: {{ section.settings.padding_bottom }}px; + } + } +{%- endstyle -%} + +
@@ -13,7 +27,7 @@ {{ 'customer.reset_password.title' | t }}

- {{ 'customer.reset_password.subtext' | t: email: email }} + {{ 'customer.reset_password.subtext' | t }}

{%- form 'reset_customer_password' -%} {%- if form.errors -%} @@ -95,3 +109,35 @@ {%- endform -%}
+ +{% schema %} +{ + "name": "t:sections.main-reset-password.name", + "settings": [ + { + "type": "header", + "content": "t:sections.all.padding.section_padding_heading" + }, + { + "type": "range", + "id": "padding_top", + "min": 0, + "max": 100, + "step": 4, + "unit": "px", + "label": "t:sections.all.padding.padding_top", + "default": 36 + }, + { + "type": "range", + "id": "padding_bottom", + "min": 0, + "max": 100, + "step": 4, + "unit": "px", + "label": "t:sections.all.padding.padding_bottom", + "default": 36 + } + ] +} +{% endschema %} diff --git a/templates/customers/account.json b/templates/customers/account.json new file mode 100644 index 00000000000..b9c23984945 --- /dev/null +++ b/templates/customers/account.json @@ -0,0 +1,10 @@ +{ + "sections": { + "main": { + "type": "main-account" + } + }, + "order": [ + "main" + ] +} diff --git a/templates/customers/activate_account.json b/templates/customers/activate_account.json new file mode 100644 index 00000000000..43c41411eb7 --- /dev/null +++ b/templates/customers/activate_account.json @@ -0,0 +1,10 @@ +{ + "sections": { + "main": { + "type": "main-activate-account" + } + }, + "order": [ + "main" + ] +} diff --git a/templates/customers/addresses.json b/templates/customers/addresses.json new file mode 100644 index 00000000000..fc30f2a34e9 --- /dev/null +++ b/templates/customers/addresses.json @@ -0,0 +1,10 @@ +{ + "sections": { + "main": { + "type": "main-addresses" + } + }, + "order": [ + "main" + ] +} diff --git a/templates/customers/login.json b/templates/customers/login.json new file mode 100644 index 00000000000..ece53782e3b --- /dev/null +++ b/templates/customers/login.json @@ -0,0 +1,10 @@ +{ + "sections": { + "main": { + "type": "main-login" + } + }, + "order": [ + "main" + ] +} diff --git a/templates/customers/order.json b/templates/customers/order.json new file mode 100644 index 00000000000..b23bc48a5ae --- /dev/null +++ b/templates/customers/order.json @@ -0,0 +1,10 @@ +{ + "sections": { + "main": { + "type": "main-order" + } + }, + "order": [ + "main" + ] +} diff --git a/templates/customers/register.json b/templates/customers/register.json new file mode 100644 index 00000000000..3d82f084fd3 --- /dev/null +++ b/templates/customers/register.json @@ -0,0 +1,10 @@ +{ + "sections": { + "main": { + "type": "main-register" + } + }, + "order": [ + "main" + ] +} diff --git a/templates/customers/reset_password.json b/templates/customers/reset_password.json new file mode 100644 index 00000000000..cf74f5bdda2 --- /dev/null +++ b/templates/customers/reset_password.json @@ -0,0 +1,10 @@ +{ + "sections": { + "main": { + "type": "main-reset-password" + } + }, + "order": [ + "main" + ] +} From bf4e7d305038c5bff351de60ee1acd5b43aa7b09 Mon Sep 17 00:00:00 2001 From: "translation-platform[bot]" <34770790+translation-platform[bot]@users.noreply.github.com> Date: Fri, 8 Jul 2022 12:59:18 -0400 Subject: [PATCH 22/86] Update translations: merchant (#1843) * Update 20 translation files * Update 1 translation file * Update 20 translation files Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> --- locales/cs.schema.json | 8 ++++---- locales/da.schema.json | 8 ++++---- locales/de.schema.json | 22 ++++++++++++---------- locales/es.schema.json | 8 ++++---- locales/fi.schema.json | 12 ++++++------ locales/fr.schema.json | 8 ++++---- locales/it.schema.json | 8 ++++---- locales/ja.schema.json | 8 ++++---- locales/ko.schema.json | 8 ++++---- locales/nb.schema.json | 22 +++++++++++----------- locales/nl.schema.json | 10 +++++----- locales/pl.schema.json | 8 ++++---- locales/pt-BR.schema.json | 8 ++++---- locales/pt-PT.schema.json | 10 +++++----- locales/sv.schema.json | 8 ++++---- locales/th.schema.json | 8 ++++---- locales/tr.schema.json | 8 ++++---- locales/vi.schema.json | 10 +++++----- locales/zh-CN.schema.json | 8 ++++---- locales/zh-TW.schema.json | 8 ++++---- 20 files changed, 100 insertions(+), 98 deletions(-) diff --git a/locales/cs.schema.json b/locales/cs.schema.json index ed11d61f164..d8f878effe9 100644 --- a/locales/cs.schema.json +++ b/locales/cs.schema.json @@ -385,14 +385,14 @@ "label": "Text" }, "text_alignment": { - "label": "Zarovnání obsahu na počítači", - "options_1": { + "label": "Zarovnání textu", + "options__1": { "label": "Doleva" }, - "options_2": { + "options__2": { "label": "Na střed" }, - "options_3": { + "options__3": { "label": "Doprava" } }, diff --git a/locales/da.schema.json b/locales/da.schema.json index 9232a2df1e5..c5893005d82 100644 --- a/locales/da.schema.json +++ b/locales/da.schema.json @@ -385,14 +385,14 @@ "label": "Tekstfarve" }, "text_alignment": { - "label": "Justering af indhold på computer", - "option_1": { + "label": "Tekstjustering", + "options__1": { "label": "Venstre" }, - "option_2": { + "options__2": { "label": "Centreret" }, - "option_3": { + "options__3": { "label": "Højre" } }, diff --git a/locales/de.schema.json b/locales/de.schema.json index 5e6467861b5..e4f33abd5dd 100644 --- a/locales/de.schema.json +++ b/locales/de.schema.json @@ -384,18 +384,20 @@ "text": { "label": "Text" }, - "label": "Desktop-Inhaltsausrichtung", - "option_1": { - "label": "Links" - }, - "option_2": { - "label": "Zentriert" - }, - "option_3": { - "label": "Rechts" - }, "link": { "label": "Link" + }, + "text_alignment": { + "label": "Textausrichtung", + "options__1": { + "label": "Links" + }, + "options__2": { + "label": "Zentriert" + }, + "options__3": { + "label": "Rechts" + } } } } diff --git a/locales/es.schema.json b/locales/es.schema.json index 3dba91be41f..08abef7c3c9 100644 --- a/locales/es.schema.json +++ b/locales/es.schema.json @@ -385,14 +385,14 @@ "label": "Texto" }, "text_alignment": { - "label": "Alineación del contenido en computadoras", - "option_1": { + "label": "Alineación de texto", + "options__1": { "label": "Izquierda" }, - "option_2": { + "options__2": { "label": "Centrado" }, - "option_3": { + "options__3": { "label": "Derecha" } }, diff --git a/locales/fi.schema.json b/locales/fi.schema.json index bf753acb3f6..486952dbc7d 100644 --- a/locales/fi.schema.json +++ b/locales/fi.schema.json @@ -385,15 +385,15 @@ "label": "Teksti" }, "text_alignment": { - "label": "Työpöydän sisällön kohdistus", - "option_1": { - "label": "Vasemmalla" + "label": "Tekstin tasaus", + "options__1": { + "label": "Vasen" }, - "option_2": { + "options__2": { "label": "Keskitetty" }, - "option_3": { - "label": "Oikealla" + "options__3": { + "label": "Oikea" } }, "link": { diff --git a/locales/fr.schema.json b/locales/fr.schema.json index f92036a49c1..2abece8daad 100644 --- a/locales/fr.schema.json +++ b/locales/fr.schema.json @@ -385,14 +385,14 @@ "label": "Texte" }, "text_alignment": { - "label": "Alignement du contenu sur ordinateur", - "option_1": { + "label": "Alignement du texte", + "options__1": { "label": "Gauche" }, - "option_2": { + "options__2": { "label": "Centre" }, - "option_3": { + "options__3": { "label": "Droite" } }, diff --git a/locales/it.schema.json b/locales/it.schema.json index c70883247c8..e916e30e309 100644 --- a/locales/it.schema.json +++ b/locales/it.schema.json @@ -385,14 +385,14 @@ "label": "Testo" }, "text_alignment": { - "label": "Allineamento contenuto su desktop", - "option_1": { + "label": "Allineamento testo", + "options__1": { "label": "A sinistra" }, - "option_2": { + "options__2": { "label": "Al centro" }, - "option_3": { + "options__3": { "label": "A destra" } }, diff --git a/locales/ja.schema.json b/locales/ja.schema.json index 613b3057517..c5c7733008b 100644 --- a/locales/ja.schema.json +++ b/locales/ja.schema.json @@ -384,14 +384,14 @@ "label": "テキスト" }, "text_alignment": { - "label": "デスクトップのコンテンツ配置", - "option_1": { + "label": "テキストアラインメント", + "options__1": { "label": "左" }, - "option_2": { + "options__2": { "label": "中央" }, - "option_3": { + "options__3": { "label": "右" } }, diff --git a/locales/ko.schema.json b/locales/ko.schema.json index 49e16d20606..ac8d3e232e6 100644 --- a/locales/ko.schema.json +++ b/locales/ko.schema.json @@ -384,14 +384,14 @@ "label": "텍스트" }, "text_alignment": { - "label": "데스크톱 콘텐츠 정렬", - "option_1": { + "label": "텍스트 정렬", + "options__1": { "label": "왼쪽" }, - "option_2": { + "options__2": { "label": "가운데" }, - "option_3": { + "options__3": { "label": "오른쪽" } }, diff --git a/locales/nb.schema.json b/locales/nb.schema.json index 4c3c10bf8c6..17b92a7eda3 100644 --- a/locales/nb.schema.json +++ b/locales/nb.schema.json @@ -385,14 +385,14 @@ "label": "Tekst" }, "text_alignment": { - "label": "Innholdsjustering på datamaskin", - "option_1": { + "label": "Tekstjustering", + "options__1": { "label": "Venstre" }, - "option_2": { + "options__2": { "label": "Sentrert" }, - "option_3": { + "options__3": { "label": "Høyre" } }, @@ -504,7 +504,7 @@ "label": "Portrett" }, "options__3": { - "label": "Square" + "label": "Firkant" }, "info": "Legg til bilder ved å redigere samlingene dine. [Finn ut mer](https://help.shopify.com/manual/products/collections)" }, @@ -622,7 +622,7 @@ "label": "Portrett" }, "options__3": { - "label": "Square" + "label": "Firkant" } }, "show_secondary_image": { @@ -1288,7 +1288,7 @@ "label": "Portrett" }, "options__3": { - "label": "Square" + "label": "Firkant" } }, "show_secondary_image": { @@ -1381,7 +1381,7 @@ "label": "Portrett" }, "options__3": { - "label": "Square" + "label": "Firkant" }, "info": "Legg til bilder ved å redigere samlingene dine. [Finn ut mer](https://help.shopify.com/manual/products/collections)" }, @@ -1736,7 +1736,7 @@ "label": "Portrett" }, "options__3": { - "label": "Square" + "label": "Firkant" } }, "show_secondary_image": { @@ -1805,7 +1805,7 @@ "label": "Portrett" }, "options__3": { - "label": "Square" + "label": "Firkant" }, "options__4": { "label": "Sirkel" @@ -1944,7 +1944,7 @@ "label": "Portrett" }, "options__3": { - "label": "Square" + "label": "Firkant" } }, "show_secondary_image": { diff --git a/locales/nl.schema.json b/locales/nl.schema.json index aa7cf58f575..89567099f42 100644 --- a/locales/nl.schema.json +++ b/locales/nl.schema.json @@ -385,14 +385,14 @@ "label": "Tekst" }, "text_alignment": { - "label": "Uitlijning van content op desktop", - "option_1": { + "label": "Tekstuitlijning", + "options__1": { "label": "Links" }, - "option_2": { - "label": "Centraal" + "options__2": { + "label": "Midden" }, - "option_3": { + "options__3": { "label": "Rechts" } }, diff --git a/locales/pl.schema.json b/locales/pl.schema.json index 870f4014689..2a9a67c848b 100644 --- a/locales/pl.schema.json +++ b/locales/pl.schema.json @@ -385,14 +385,14 @@ "label": "Tekst" }, "text_alignment": { - "label": "Wyrównanie treści na komputerze", - "option_1": { + "label": "Wyrównanie tekstu", + "options__1": { "label": "Lewa strona" }, - "option_2": { + "options__2": { "label": "Środek" }, - "option_3": { + "options__3": { "label": "Prawa strona" } }, diff --git a/locales/pt-BR.schema.json b/locales/pt-BR.schema.json index 79ba9eeabc8..e57ae55b917 100644 --- a/locales/pt-BR.schema.json +++ b/locales/pt-BR.schema.json @@ -385,14 +385,14 @@ "label": "Texto" }, "text_alignment": { - "label": "Alinhamento de conteúdo no desktop", - "option_1": { + "label": "Alinhamento do texto", + "options__1": { "label": "Esquerda" }, - "option_2": { + "options__2": { "label": "Centro" }, - "option_3": { + "options__3": { "label": "Direita" } }, diff --git a/locales/pt-PT.schema.json b/locales/pt-PT.schema.json index c9c8edb5c84..0a5a813e762 100644 --- a/locales/pt-PT.schema.json +++ b/locales/pt-PT.schema.json @@ -384,14 +384,14 @@ "label": "Texto" }, "text_alignment": { - "label": "Alinhamento do conteúdo em desktop", - "option_1": { + "label": "Alinhamento do texto", + "options__1": { "label": "Esquerda" }, - "option_2": { - "label": "Ao centro" + "options__2": { + "label": "Centro" }, - "option_3": { + "options__3": { "label": "Direita" } }, diff --git a/locales/sv.schema.json b/locales/sv.schema.json index 8338fdf5754..2787f0b2ff4 100644 --- a/locales/sv.schema.json +++ b/locales/sv.schema.json @@ -384,14 +384,14 @@ "label": "Text" }, "text_alignment": { - "label": "Justering av innehåll på skrivbord", - "option_1": { + "label": "Textjustering", + "options__1": { "label": "Vänster" }, - "option_2": { + "options__2": { "label": "Centrera" }, - "option_3": { + "options__3": { "label": "Höger" } }, diff --git a/locales/th.schema.json b/locales/th.schema.json index aea49a2d78e..0a576c8d5ed 100644 --- a/locales/th.schema.json +++ b/locales/th.schema.json @@ -384,14 +384,14 @@ "label": "ข้อความ" }, "text_alignment": { - "label": "การจัดวางเนื้อหาบนเดสก์ท็อป", - "option_1": { + "label": "การจัดวางข้อความ", + "options__1": { "label": "ซ้าย" }, - "option_2": { + "options__2": { "label": "กึ่งกลาง" }, - "option_3": { + "options__3": { "label": "ขวา" } }, diff --git a/locales/tr.schema.json b/locales/tr.schema.json index a766eff7967..afab20cfd9a 100644 --- a/locales/tr.schema.json +++ b/locales/tr.schema.json @@ -385,14 +385,14 @@ "label": "Metin" }, "text_alignment": { - "label": "Masaüstü içerik hizalaması", - "option_1": { + "label": "Metin hizalaması", + "options__1": { "label": "Sol" }, - "option_2": { + "options__2": { "label": "Orta" }, - "option_3": { + "options__3": { "label": "Sağ" } }, diff --git a/locales/vi.schema.json b/locales/vi.schema.json index 3fb73d8a5bc..3e1c2b1bb34 100644 --- a/locales/vi.schema.json +++ b/locales/vi.schema.json @@ -385,14 +385,14 @@ "label": "Văn bản" }, "text_alignment": { - "label": "Căn chỉnh nội dung trên màn hình nền", - "option_1": { + "label": "Căn chỉnh văn bản", + "options__1": { "label": "Bên trái" }, - "option_2": { - "label": "Giữa" + "options__2": { + "label": "Ở giữa" }, - "option_3": { + "options__3": { "label": "Bên phải" } }, diff --git a/locales/zh-CN.schema.json b/locales/zh-CN.schema.json index e50a4abcee7..c530c772959 100644 --- a/locales/zh-CN.schema.json +++ b/locales/zh-CN.schema.json @@ -384,14 +384,14 @@ "label": "文本" }, "text_alignment": { - "label": "台式机内容对齐方式", - "option_1": { + "label": "文本对齐方式", + "options__1": { "label": "左" }, - "option_2": { + "options__2": { "label": "居中" }, - "option_3": { + "options__3": { "label": "右" } }, diff --git a/locales/zh-TW.schema.json b/locales/zh-TW.schema.json index 877d3ec3fb2..5f5ba6933cb 100644 --- a/locales/zh-TW.schema.json +++ b/locales/zh-TW.schema.json @@ -384,14 +384,14 @@ "label": "文字" }, "text_alignment": { - "label": "桌面版內容對齊方式", - "option_1": { + "label": "文字對齊方式", + "options__1": { "label": "靠左" }, - "option_2": { + "options__2": { "label": "置中" }, - "option_3": { + "options__3": { "label": "靠右" } }, From 70621f9d70c53aaf22ac229b19fcf750097a6af2 Mon Sep 17 00:00:00 2001 From: "translation-platform[bot]" <34770790+translation-platform[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 10:56:17 -0400 Subject: [PATCH 23/86] Update 1 translation file (#1849) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> --- locales/da.schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/da.schema.json b/locales/da.schema.json index c5893005d82..e9cf9c7d302 100644 --- a/locales/da.schema.json +++ b/locales/da.schema.json @@ -1610,7 +1610,7 @@ "label": "Genanvendelse" }, "options__34": { - "label": "Returnering" + "label": "Gå tilbage" }, "options__35": { "label": "Lineal" @@ -2709,7 +2709,7 @@ "label": "Genanvendelse" }, "options__34": { - "label": "Returnering" + "label": "Gå tilbage" }, "options__35": { "label": "Lineal" From b18d1be51f81972ebbc63ce7919ef60d1f98fb15 Mon Sep 17 00:00:00 2001 From: Ludo Date: Tue, 12 Jul 2022 14:08:25 -0400 Subject: [PATCH 24/86] Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d09619013e8..e60af741100 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -11,6 +11,12 @@ Fixes #0. **Other considerations** +**Decision log** + +| # | Decision | Alternatives | Rationale | Downsides | +|---|---|---|---|---| +| 1 | | | | | + **Testing steps/scenarios** - [ ] _List all the testing tasks that applies to your fix and help peers to review your work._ From b7038b438ce91a2d7c62f69f8a286074b2a2b71a Mon Sep 17 00:00:00 2001 From: Yevhenii Huselietov Date: Wed, 20 Jul 2022 11:08:51 -0400 Subject: [PATCH 25/86] Remove CLA from probot and use new GitHub action (#1859) --- .github/probots.yml | 2 -- .github/workflows/cla.yml | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) delete mode 100644 .github/probots.yml create mode 100644 .github/workflows/cla.yml diff --git a/.github/probots.yml b/.github/probots.yml deleted file mode 100644 index 1491d27568c..00000000000 --- a/.github/probots.yml +++ /dev/null @@ -1,2 +0,0 @@ -enabled: - - cla diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml new file mode 100644 index 00000000000..ecd71ce21cc --- /dev/null +++ b/.github/workflows/cla.yml @@ -0,0 +1,22 @@ +name: Contributor License Agreement (CLA) + +on: + pull_request_target: + types: [opened, synchronize] + issue_comment: + types: [created] + +jobs: + cla: + runs-on: ubuntu-latest + if: | + (github.event.issue.pull_request + && !github.event.issue.pull_request.merged_at + && contains(github.event.comment.body, 'signed') + ) + || (github.event.pull_request && !github.event.pull_request.merged) + steps: + - uses: Shopify/shopify-cla-action@v1 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + cla-token: ${{ secrets.CLA_TOKEN }} From af705f4d43efea7fc452d297e57ddc833a614657 Mon Sep 17 00:00:00 2001 From: "translation-platform[bot]" <34770790+translation-platform[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 11:43:27 -0400 Subject: [PATCH 26/86] Update 1 translation file (#1862) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> --- locales/pl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/pl.json b/locales/pl.json index fc24ade86f9..a271b997e21 100644 --- a/locales/pl.json +++ b/locales/pl.json @@ -277,7 +277,7 @@ "featured_blog": { "view_all": "Wyświetl wszystkie", "onboarding_title": "Post na blogu", - "onboarding_content": "Zapewnij swoim klientom podsumowanie Twojego wpisu na blogu" + "onboarding_content": "Przedstaw swoim klientom podsumowanie swojego wpisu na blogu" }, "featured_collection": { "view_all": "Wyświetl wszystkie", From 2afabc1f072e0a08d17e294a70ec2c39af517589 Mon Sep 17 00:00:00 2001 From: Andrew Etchen Date: Mon, 25 Jul 2022 15:58:40 -0400 Subject: [PATCH 27/86] Add `reopened` activity type (#1874) --- .github/workflows/cla.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index ecd71ce21cc..9c29c5c756a 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -2,7 +2,7 @@ name: Contributor License Agreement (CLA) on: pull_request_target: - types: [opened, synchronize] + types: [opened, synchronize, reopened] issue_comment: types: [created] From 6e513c509e523fa686c27170b5c37d0ba4e4c469 Mon Sep 17 00:00:00 2001 From: Monica Mateiu Date: Tue, 26 Jul 2022 09:26:00 +0100 Subject: [PATCH 28/86] add vendor to popup notification when vendor checkbox is checked (#1870) --- sections/cart-notification-product.liquid | 55 ++++++++++++----------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/sections/cart-notification-product.liquid b/sections/cart-notification-product.liquid index 0dd305124ec..f4f22d1c4f8 100644 --- a/sections/cart-notification-product.liquid +++ b/sections/cart-notification-product.liquid @@ -13,34 +13,37 @@
{%- endif -%}
+ {%- if settings.show_vendor -%} +

{{ item.product.vendor }}

+ {%- endif -%}

{{ item.product.title | escape }}

-
- {%- unless item.product.has_only_default_variant -%} - {%- for option in item.options_with_values -%} -
-
{{ option.name }}:
-
{{ option.value }}
-
- {%- endfor -%} - {%- endunless -%} - {%- for property in item.properties -%} - {%- assign property_first_char = property.first | slice: 0 -%} - {%- if property.last != blank and property_first_char != '_' -%} -
-
{{ property.first }}:
-
- {%- if property.last contains '/uploads/' -%} - - {{ property.last | split: '/' | last }} - - {%- else -%} - {{ property.last }} - {%- endif -%} -
-
- {%- endif -%} +
+ {%- unless item.product.has_only_default_variant -%} + {%- for option in item.options_with_values -%} +
+
{{ option.name }}:
+
{{ option.value }}
+
{%- endfor -%} -
+ {%- endunless -%} + {%- for property in item.properties -%} + {%- assign property_first_char = property.first | slice: 0 -%} + {%- if property.last != blank and property_first_char != '_' -%} +
+
{{ property.first }}:
+
+ {%- if property.last contains '/uploads/' -%} + + {{ property.last | split: '/' | last }} + + {%- else -%} + {{ property.last }} + {%- endif -%} +
+
+ {%- endif -%} + {%- endfor -%} +
{%- if item.selling_plan_allocation != nil -%}

{{ item.selling_plan_allocation.selling_plan.name }}

{%- endif -%} From 63f527f3444f47ab15d8697fc1699e1bac1a149f Mon Sep 17 00:00:00 2001 From: Ludo Date: Wed, 27 Jul 2022 13:23:15 -0400 Subject: [PATCH 29/86] Add proper product title to data-shopify-title (#1858) --- snippets/product-thumbnail.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snippets/product-thumbnail.liquid b/snippets/product-thumbnail.liquid index 248d78932d6..5576ad6c85d 100644 --- a/snippets/product-thumbnail.liquid +++ b/snippets/product-thumbnail.liquid @@ -181,7 +181,7 @@ aria-label="{{ 'products.product.xr_button_label' | t }}" data-shopify-xr data-shopify-model3d-id="{{ media.id }}" - data-shopify-title="title" + data-shopify-title="{{ product.title | escape }}" data-shopify-xr-hidden > {% render 'icon-3d-model' %} From d9cff51644fcf2e62a47d9f997524bfc14252828 Mon Sep 17 00:00:00 2001 From: "translation-platform[bot]" <34770790+translation-platform[bot]@users.noreply.github.com> Date: Wed, 27 Jul 2022 14:48:14 -0400 Subject: [PATCH 30/86] Update 1 translation file (#1872) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> --- locales/sv.schema.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/locales/sv.schema.json b/locales/sv.schema.json index 2787f0b2ff4..5fc5e27d0d8 100644 --- a/locales/sv.schema.json +++ b/locales/sv.schema.json @@ -504,7 +504,7 @@ "label": "Porträtt" }, "options__3": { - "label": "Square" + "label": "Fyrkantig" }, "info": "Lägg till bilder genom att redigera dina produktserier. [Mer information](https://help.shopify.com/manual/products/collections)" }, @@ -622,7 +622,7 @@ "label": "Porträtt" }, "options__3": { - "label": "Square" + "label": "Fyrkantig" } }, "show_secondary_image": { @@ -1281,7 +1281,7 @@ "label": "Porträtt" }, "options__3": { - "label": "Square" + "label": "Fyrkantig" } }, "show_secondary_image": { @@ -1381,7 +1381,7 @@ "label": "Porträtt" }, "options__3": { - "label": "Square" + "label": "Fyrkantig" }, "info": "Lägg till bilder genom att redigera dina produktserier. [Mer information](https://help.shopify.com/manual/products/collections)" }, @@ -1594,7 +1594,7 @@ "label": "Återvinn" }, "options__34": { - "label": "Retur" + "label": "Gå tillbaka" }, "options__35": { "label": "Linjal" @@ -1736,7 +1736,7 @@ "label": "Porträtt" }, "options__3": { - "label": "Square" + "label": "Fyrkantig" } }, "show_secondary_image": { @@ -1805,7 +1805,7 @@ "label": "Porträtt" }, "options__3": { - "label": "Square" + "label": "Fyrkantig" }, "options__4": { "label": "Cirkel" @@ -1944,7 +1944,7 @@ "label": "Porträtt" }, "options__3": { - "label": "Square" + "label": "Fyrkantig" } }, "show_secondary_image": { @@ -2709,7 +2709,7 @@ "label": "Återvinn" }, "options__34": { - "label": "Retur" + "label": "Gå tillbaka" }, "options__35": { "label": "Linjal" From 45f621bbe56c0e0c1f02b7be63dd01e9a90e6746 Mon Sep 17 00:00:00 2001 From: Caroline Date: Thu, 28 Jul 2022 12:30:12 -0400 Subject: [PATCH 31/86] Use param_name instead of label to construct an id for filter values (#839) --- snippets/facets.liquid | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/snippets/facets.liquid b/snippets/facets.liquid index 324fd02f053..4ea4685ef56 100644 --- a/snippets/facets.liquid +++ b/snippets/facets.liquid @@ -110,11 +110,11 @@
    {%- for value in filter.values -%}
  • -
    • + {%- endfor -%}
{% comment %} No show more for no JS {% endcomment %}
    {%- for value in filter.values -%}
  • -
    • + {%- endfor -%}
@@ -347,7 +347,7 @@
-
+
{%- endif -%} @@ -386,7 +386,7 @@ {%- endif -%} - {%- endif -%} + {%- endif -%} {%- endif -%} {% comment %} Drawer and mobile filter {% endcomment %} @@ -462,8 +462,8 @@ {% comment %} No show more for no JS {% endcomment %} -