From 9a350bbf46e50645bff1779424fc51ef6bb26d0a Mon Sep 17 00:00:00 2001 From: Alistair Lane Date: Wed, 1 Jun 2022 13:58:19 -0400 Subject: [PATCH 01/12] Menu heading Remove requirement for menu heading in footer to display --- sections/footer.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sections/footer.liquid b/sections/footer.liquid index ee87fd1d3d1..4a005c0ed27 100644 --- a/sections/footer.liquid +++ b/sections/footer.liquid @@ -51,7 +51,7 @@ -%}
{%- for block in section.blocks -%} -
+
{%- if block.settings.heading != blank -%}

{{- block.settings.heading | escape -}}

{%- endif -%} From 3eb981e6eb89981c7e30837ac29b099964dd3321 Mon Sep 17 00:00:00 2001 From: Alistair Lane Date: Wed, 1 Jun 2022 14:01:55 -0400 Subject: [PATCH 02/12] Update footer.liquid --- sections/footer.liquid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sections/footer.liquid b/sections/footer.liquid index 4a005c0ed27..a722459b71e 100644 --- a/sections/footer.liquid +++ b/sections/footer.liquid @@ -51,7 +51,7 @@ -%}
{%- for block in section.blocks -%} -
+
{%- if block.settings.heading != blank -%}

{{- block.settings.heading | escape -}}

{%- endif -%} @@ -62,7 +62,7 @@ {{ block.settings.subtext }}
{%- when 'link_list' -%} - {%- if block.settings.menu != blank and block.settings.heading != blank -%} + {%- if block.settings.menu != blank -%}
    {%- for link in block.settings.menu.links -%}
  • From 8b13eafd1c1829e819546ba23240e0984b2e2297 Mon Sep 17 00:00:00 2001 From: Alistair Lane Date: Wed, 1 Jun 2022 14:03:33 -0400 Subject: [PATCH 03/12] Remove helper text --- locales/en.default.schema.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/locales/en.default.schema.json b/locales/en.default.schema.json index 9306f6aa25f..4b0b3da4365 100644 --- a/locales/en.default.schema.json +++ b/locales/en.default.schema.json @@ -814,8 +814,7 @@ "name": "Menu", "settings": { "heading": { - "label": "Heading", - "info": "Heading required to display the menu." + "label": "Heading" }, "menu": { "label": "Menu", From f1d227b77a799dcfe25ed47196752a76425a24b2 Mon Sep 17 00:00:00 2001 From: Alistair Lane Date: Wed, 1 Jun 2022 14:11:15 -0400 Subject: [PATCH 04/12] Remove translations --- locales/cs.schema.json | 3 +-- locales/da.schema.json | 3 +-- locales/de.schema.json | 3 +-- locales/es.schema.json | 3 +-- locales/fi.schema.json | 3 +-- locales/fr.schema.json | 3 +-- locales/it.schema.json | 3 +-- locales/ja.schema.json | 3 +-- locales/ko.schema.json | 3 +-- locales/nb.schema.json | 3 +-- locales/nl.schema.json | 3 +-- locales/pl.schema.json | 3 +-- locales/pt-BR.schema.json | 3 +-- locales/pt-PT.schema.json | 3 +-- locales/sv.schema.json | 3 +-- locales/th.schema.json | 3 +-- locales/tr.schema.json | 3 +-- locales/vi.schema.json | 3 +-- locales/zh-CN.schema.json | 3 +-- locales/zh-TW.schema.json | 3 +-- 20 files changed, 20 insertions(+), 40 deletions(-) diff --git a/locales/cs.schema.json b/locales/cs.schema.json index 615c2037c08..4ba4b407950 100644 --- a/locales/cs.schema.json +++ b/locales/cs.schema.json @@ -692,8 +692,7 @@ "name": "Nabídka", "settings": { "heading": { - "label": "Nadpis", - "info": "Pokud chcete zobrazit nabídku, je nutný nadpis." + "label": "Nadpis" }, "menu": { "label": "Nabídka", diff --git a/locales/da.schema.json b/locales/da.schema.json index f0eee40f83e..bf92b978173 100644 --- a/locales/da.schema.json +++ b/locales/da.schema.json @@ -692,8 +692,7 @@ "name": "Menu", "settings": { "heading": { - "label": "Overskrift", - "info": "Der skal angives en overskrift, for at menuen kan vises." + "label": "Overskrift" }, "menu": { "label": "Menu", diff --git a/locales/de.schema.json b/locales/de.schema.json index 8cf145dad3a..539503617d8 100644 --- a/locales/de.schema.json +++ b/locales/de.schema.json @@ -692,8 +692,7 @@ "name": "Menü", "settings": { "heading": { - "label": "Überschrift", - "info": "Überschrift ist erforderlich, um das Menü anzuzeigen." + "label": "Überschrift" }, "menu": { "label": "Menü", diff --git a/locales/es.schema.json b/locales/es.schema.json index cf9344a2fba..f48c620c1ce 100644 --- a/locales/es.schema.json +++ b/locales/es.schema.json @@ -692,8 +692,7 @@ "name": "Menú", "settings": { "heading": { - "label": "Encabezado", - "info": "Se requiere un título para mostrar el menú." + "label": "Encabezado" }, "menu": { "label": "Menú", diff --git a/locales/fi.schema.json b/locales/fi.schema.json index 6052193d6ed..8d9f7e68f62 100644 --- a/locales/fi.schema.json +++ b/locales/fi.schema.json @@ -692,8 +692,7 @@ "name": "Valikko", "settings": { "heading": { - "label": "Otsikko", - "info": "Valikon näyttäminen edellyttää otsikkoa." + "label": "Otsikko" }, "menu": { "label": "Valikko", diff --git a/locales/fr.schema.json b/locales/fr.schema.json index 1bf3c12efc2..0abbce4d09e 100644 --- a/locales/fr.schema.json +++ b/locales/fr.schema.json @@ -692,8 +692,7 @@ "name": "Menu", "settings": { "heading": { - "label": "En-tête", - "info": "Un titre est nécessaire pour afficher le menu." + "label": "En-tête" }, "menu": { "label": "Menu", diff --git a/locales/it.schema.json b/locales/it.schema.json index 60a8874692b..a172a9095ce 100644 --- a/locales/it.schema.json +++ b/locales/it.schema.json @@ -692,8 +692,7 @@ "name": "Menu", "settings": { "heading": { - "label": "Titolo", - "info": "Per visualizzare il menu è necessario un titolo." + "label": "Titolo" }, "menu": { "label": "Menu", diff --git a/locales/ja.schema.json b/locales/ja.schema.json index cf851b66af0..9f3f3009bfd 100644 --- a/locales/ja.schema.json +++ b/locales/ja.schema.json @@ -691,8 +691,7 @@ "link_list": { "settings": { "heading": { - "label": "見出し", - "info": "メニューを表示するには見出しが必要です。" + "label": "見出し" }, "menu": { "label": "メニュー", diff --git a/locales/ko.schema.json b/locales/ko.schema.json index 0b11347f2d4..51982a89bf0 100644 --- a/locales/ko.schema.json +++ b/locales/ko.schema.json @@ -691,8 +691,7 @@ "link_list": { "settings": { "heading": { - "label": "제목", - "info": "메뉴를 표시하려면 제목은 필수 사항입니다." + "label": "제목" }, "menu": { "label": "메뉴", diff --git a/locales/nb.schema.json b/locales/nb.schema.json index 6b31a4b67f7..b8e3bdecbcd 100644 --- a/locales/nb.schema.json +++ b/locales/nb.schema.json @@ -692,8 +692,7 @@ "name": "Meny", "settings": { "heading": { - "label": "Overskrift", - "info": "Overskrift kreves for å vise menyen." + "label": "Overskrift" }, "menu": { "label": "Meny", diff --git a/locales/nl.schema.json b/locales/nl.schema.json index c4d7fe84211..1d4db9ca475 100644 --- a/locales/nl.schema.json +++ b/locales/nl.schema.json @@ -692,8 +692,7 @@ "name": "Menu", "settings": { "heading": { - "label": "Opschrift", - "info": "Hoofdtekst verplicht om menu weer te geven" + "label": "Opschrift" }, "menu": { "label": "Menu", diff --git a/locales/pl.schema.json b/locales/pl.schema.json index 314d2f33683..ff89d344a59 100644 --- a/locales/pl.schema.json +++ b/locales/pl.schema.json @@ -692,8 +692,7 @@ "name": "Menu", "settings": { "heading": { - "label": "Nagłówek", - "info": "Do wyświetlenia menu wymagany jest nagłówek." + "label": "Nagłówek" }, "menu": { "label": "Menu", diff --git a/locales/pt-BR.schema.json b/locales/pt-BR.schema.json index 9b4d8099bcb..b2679c51f4d 100644 --- a/locales/pt-BR.schema.json +++ b/locales/pt-BR.schema.json @@ -692,8 +692,7 @@ "name": "Menu", "settings": { "heading": { - "label": "Título", - "info": "Título necessário para exibir o menu." + "label": "Título" }, "menu": { "label": "Menu", diff --git a/locales/pt-PT.schema.json b/locales/pt-PT.schema.json index 5d8ccc7b492..4e1354cbcdb 100644 --- a/locales/pt-PT.schema.json +++ b/locales/pt-PT.schema.json @@ -691,8 +691,7 @@ "link_list": { "settings": { "heading": { - "label": "Cabeçalho", - "info": "É necessário um título para apresentar o menu." + "label": "Cabeçalho" }, "menu": { "label": "Menu", diff --git a/locales/sv.schema.json b/locales/sv.schema.json index 9b835dd136e..074e103ce0a 100644 --- a/locales/sv.schema.json +++ b/locales/sv.schema.json @@ -691,8 +691,7 @@ "link_list": { "settings": { "heading": { - "label": "Rubrik", - "info": "Det krävs rubrik för att visa menyn." + "label": "Rubrik" }, "menu": { "label": "Meny", diff --git a/locales/th.schema.json b/locales/th.schema.json index 2c9dcb4ed33..8a782e3f394 100644 --- a/locales/th.schema.json +++ b/locales/th.schema.json @@ -691,8 +691,7 @@ "link_list": { "settings": { "heading": { - "label": "หัวเรื่อง", - "info": "ต้องมีหัวเรื่องหากต้องการแสดงเมนู" + "label": "หัวเรื่อง" }, "menu": { "label": "เมนู", diff --git a/locales/tr.schema.json b/locales/tr.schema.json index 03eece40ced..cf0b547d1ef 100644 --- a/locales/tr.schema.json +++ b/locales/tr.schema.json @@ -692,8 +692,7 @@ "name": "Menü", "settings": { "heading": { - "label": "Başlık", - "info": "Menünün gösterilmesi için başlık gereklidir." + "label": "Başlık" }, "menu": { "label": "Menü", diff --git a/locales/vi.schema.json b/locales/vi.schema.json index 3f03916cb6e..49b37f6e28b 100644 --- a/locales/vi.schema.json +++ b/locales/vi.schema.json @@ -692,8 +692,7 @@ "name": "Menu", "settings": { "heading": { - "label": "Tiêu đề", - "info": "Bắt buộc phải có tiêu đề để hiển thị menu." + "label": "Tiêu đề" }, "menu": { "label": "Menu", diff --git a/locales/zh-CN.schema.json b/locales/zh-CN.schema.json index 8f6bb3d1cdc..995114317f4 100644 --- a/locales/zh-CN.schema.json +++ b/locales/zh-CN.schema.json @@ -691,8 +691,7 @@ "link_list": { "settings": { "heading": { - "label": "标题", - "info": "需要具有标题才能显示菜单。" + "label": "标题" }, "menu": { "label": "菜单", diff --git a/locales/zh-TW.schema.json b/locales/zh-TW.schema.json index 3de8766a902..665d3c703ad 100644 --- a/locales/zh-TW.schema.json +++ b/locales/zh-TW.schema.json @@ -691,8 +691,7 @@ "link_list": { "settings": { "heading": { - "label": "標題", - "info": "若要顯示選單，則必須要有標題。" + "label": "標題" }, "menu": { "label": "選單", From 08ec3aa848217e6ab4d36f414aabd000dad45914 Mon Sep 17 00:00:00 2001 From: Alistair Lane Date: Wed, 1 Jun 2022 14:13:32 -0400 Subject: [PATCH 05/12] Update footer --- sections/footer.liquid | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sections/footer.liquid b/sections/footer.liquid index a722459b71e..54b2b56e156 100644 --- a/sections/footer.liquid +++ b/sections/footer.liquid @@ -402,8 +402,7 @@ "type": "text", "id": "heading", "default": "Quick links", - "label": "t:sections.footer.blocks.link_list.settings.heading.label", - "info": "t:sections.footer.blocks.link_list.settings.heading.info" + "label": "t:sections.footer.blocks.link_list.settings.heading.label" }, { "type": "link_list", From c62fabdf0b2ae7b8ab984fa5ede5795b627b1bcf Mon Sep 17 00:00:00 2001 From: Alistair Lane Date: Wed, 1 Jun 2022 14:23:32 -0400 Subject: [PATCH 06/12] Update footer --- sections/footer.liquid | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sections/footer.liquid b/sections/footer.liquid index 54b2b56e156..2bac11b4fa9 100644 --- a/sections/footer.liquid +++ b/sections/footer.liquid @@ -401,8 +401,7 @@ { "type": "text", "id": "heading", - "default": "Quick links", - "label": "t:sections.footer.blocks.link_list.settings.heading.label" + "default": "Quick links" }, { "type": "link_list", From 8d8f35b8f27eb425fd125b24909c7be0a661b899 Mon Sep 17 00:00:00 2001 From: Alistair Lane Date: Wed, 1 Jun 2022 14:24:41 -0400 Subject: [PATCH 07/12] Update footer --- sections/footer.liquid | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sections/footer.liquid b/sections/footer.liquid index 2bac11b4fa9..49cd94db2b8 100644 --- a/sections/footer.liquid +++ b/sections/footer.liquid @@ -401,7 +401,8 @@ { "type": "text", "id": "heading", - "default": "Quick links" + "default": "Quick links", + "label": "t:sections.footer.blocks.link_list.settings.heading.label" }, { "type": "link_list", @@ -419,8 +420,7 @@ { "type": "text", "id": "heading", - "default": "Heading", - "label": "t:sections.footer.blocks.text.settings.heading.label" + "default": "Heading" }, { "type": "richtext", From cbc96d2e95d1e896d7c0d1461f71d28b378c721e Mon Sep 17 00:00:00 2001 From: Alistair Lane Date: Wed, 1 Jun 2022 14:42:22 -0400 Subject: [PATCH 08/12] Update footer --- sections/footer.liquid | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sections/footer.liquid b/sections/footer.liquid index 49cd94db2b8..a9011bb65d4 100644 --- a/sections/footer.liquid +++ b/sections/footer.liquid @@ -62,7 +62,6 @@ {{ block.settings.subtext }}
{%- when 'link_list' -%} - {%- if block.settings.menu != blank -%}
    {%- for link in block.settings.menu.links -%}
  • @@ -72,7 +71,6 @@
    • {%- endfor -%}
- {%- endif -%} {%- when 'image' -%}
{%- if block.settings.image != blank -%} @@ -408,8 +406,7 @@ "type": "link_list", "id": "menu", "default": "footer", - "label": "t:sections.footer.blocks.link_list.settings.menu.label", - "info": "t:sections.footer.blocks.link_list.settings.menu.info" + "label": "t:sections.footer.blocks.link_list.settings.menu.label" } ] }, From 76906937cfdce2e7cb73feee4e145325ade14e3c Mon Sep 17 00:00:00 2001 From: Alistair Lane Date: Wed, 1 Jun 2022 14:50:44 -0400 Subject: [PATCH 09/12] Revert changes --- sections/footer.liquid | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sections/footer.liquid b/sections/footer.liquid index a9011bb65d4..49cd94db2b8 100644 --- a/sections/footer.liquid +++ b/sections/footer.liquid @@ -62,6 +62,7 @@ {{ block.settings.subtext }}
{%- when 'link_list' -%} + {%- if block.settings.menu != blank -%}
    {%- for link in block.settings.menu.links -%}
  • @@ -71,6 +72,7 @@
    • {%- endfor -%}
+ {%- endif -%} {%- when 'image' -%}
{%- if block.settings.image != blank -%} @@ -406,7 +408,8 @@ "type": "link_list", "id": "menu", "default": "footer", - "label": "t:sections.footer.blocks.link_list.settings.menu.label" + "label": "t:sections.footer.blocks.link_list.settings.menu.label", + "info": "t:sections.footer.blocks.link_list.settings.menu.info" } ] }, From a5e06aa918185162d143b9ccee1b66cbcd8d3024 Mon Sep 17 00:00:00 2001 From: Alistair Lane Date: Wed, 1 Jun 2022 14:58:33 -0400 Subject: [PATCH 10/12] Fixes --- sections/footer.liquid | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sections/footer.liquid b/sections/footer.liquid index 49cd94db2b8..499bdbe38aa 100644 --- a/sections/footer.liquid +++ b/sections/footer.liquid @@ -51,7 +51,7 @@ -%}
{%- for block in section.blocks -%} -
+
{%- if block.settings.heading != blank -%}

{{- block.settings.heading | escape -}}

{%- endif -%} @@ -504,7 +504,8 @@ { "type": "header", "content": "t:sections.footer.settings.header__1.content", - "info": "t:sections.footer.settings.header__1.info" + "info": "t:sections.footer.settings.header__1.info", + "label": "t:sections.footer.settings.header__1.label" }, { "type": "checkbox", From 76c70b1a98e1180bb546ed275b8f87aa876a95d8 Mon Sep 17 00:00:00 2001 From: Alistair Lane Date: Thu, 2 Jun 2022 10:11:30 -0400 Subject: [PATCH 11/12] Update --- sections/footer.liquid | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sections/footer.liquid b/sections/footer.liquid index 499bdbe38aa..d30d676402c 100644 --- a/sections/footer.liquid +++ b/sections/footer.liquid @@ -504,8 +504,7 @@ { "type": "header", "content": "t:sections.footer.settings.header__1.content", - "info": "t:sections.footer.settings.header__1.info", - "label": "t:sections.footer.settings.header__1.label" + "info": "t:sections.footer.settings.header__1.info" }, { "type": "checkbox", From 47c8127f0d1a1c6c423687da354570f098d62c6f Mon Sep 17 00:00:00 2001 From: Alistair Lane Date: Thu, 2 Jun 2022 10:21:00 -0400 Subject: [PATCH 12/12] Update to footer --- sections/footer.liquid | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sections/footer.liquid b/sections/footer.liquid index d30d676402c..bcd6353488a 100644 --- a/sections/footer.liquid +++ b/sections/footer.liquid @@ -51,7 +51,7 @@ -%}
{%- for block in section.blocks -%} -
+
{%- if block.settings.heading != blank -%}

{{- block.settings.heading | escape -}}

{%- endif -%} @@ -420,7 +420,8 @@ { "type": "text", "id": "heading", - "default": "Heading" + "default": "Heading", + "label": "t:sections.footer.blocks.text.settings.heading.label" }, { "type": "richtext",