Merge branch '4.x' into 5.3

# Conflicts: # .github/workflows/ci.yml # CHANGELOG-WIP.md # CHANGELOG.md # src/templates/_layouts/store-settings.twig # src/templates/store-settings/paymentcurrencies/_edit.twig # src/templates/subscriptions/plans/_edit.twig # src/translations/en/commerce.php
craftcms · Jan 30, 2025 · 695c1b2 · 695c1b2
2 parents fecff0f + 75e8631
commit 695c1b2
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/src/templates/settings/emails/_edit.twig b/src/templates/settings/emails/_edit.twig
@@ -2,7 +2,7 @@
 
 {% set crumbs = [
   { label: 'Commerce'|t('commerce'), url: url('commerce') },
-  { label: 'Settings'|t('app'), url: url('commerce/settings') },
+  { label: 'Settings'|t('app'), url: url('commerce/settings'), ariaLabel: 'Commerce Settings'|t('commerce') },
   { label: "Emails"|t('commerce'), url: url('commerce/settings/emails') },
 ] %}
 

diff --git a/src/templates/settings/gateways/_edit.twig b/src/templates/settings/gateways/_edit.twig
@@ -2,7 +2,7 @@
 
 {% set crumbs = [
   { label: 'Commerce'|t('commerce'), url: url('commerce') },
-  { label: 'Settings'|t('app'), url: url('commerce/settings') },
+  { label: 'Settings'|t('app'), url: url('commerce/settings'), ariaLabel: 'Commerce Settings'|t('commerce') },
   { label: "Gateways"|t('commerce'), url: url('commerce/settings/gateways') },
 ] %}
 

diff --git a/src/templates/settings/lineitemstatuses/_edit.twig b/src/templates/settings/lineitemstatuses/_edit.twig
@@ -2,7 +2,7 @@
 
 {% set crumbs = [
     { label: 'Commerce'|t('commerce'), url: url('commerce') },
-    { label: 'Settings'|t('app'), url: url('commerce/settings') },
+    { label: 'Settings'|t('app'), url: url('commerce/settings'), ariaLabel: 'Commerce Settings'|t('commerce') },
     { label: 'Line Item Statuses'|t('commerce'), url: url('commerce/settings/lineitemstatuses') }
 ] %}
 

diff --git a/src/templates/settings/orderstatuses/_edit.twig b/src/templates/settings/orderstatuses/_edit.twig
@@ -2,7 +2,7 @@
 
 {% set crumbs = [
     { label: 'Commerce'|t('commerce'), url: url('commerce') },
-    { label: 'Settings'|t('app'), url: url('commerce/settings') },
+    { label: 'Settings'|t('app'), url: url('commerce/settings'), ariaLabel: 'Commerce Settings'|t('commerce') },
     { label: 'Order Statuses'|t('commerce'), url: url('commerce/settings/orderstatuses') }
 ] %}
 

diff --git a/src/templates/settings/pdfs/_edit.twig b/src/templates/settings/pdfs/_edit.twig
@@ -2,7 +2,7 @@
 
 {% set crumbs = [
     { label: 'Commerce'|t('commerce'), url: url('commerce') },
-    { label: 'Settings'|t('app'), url: url('commerce/settings') },
+    { label: 'Settings'|t('app'), url: url('commerce/settings'), ariaLabel: 'Commerce Settings'|t('commerce') },
     { label: "PDFs"|t('commerce'), url: url('commerce/settings/pdfs') },
 ] %}
 

diff --git a/src/templates/settings/producttypes/_edit.twig b/src/templates/settings/producttypes/_edit.twig
@@ -3,7 +3,7 @@
 
 {% set crumbs = [
     { label: 'Commerce'|t('commerce'), url: url('commerce') },
-    { label: 'Settings'|t('app'), url: url('commerce/settings') },
+    { label: 'Settings'|t('app'), url: url('commerce/settings'), ariaLabel: 'Commerce Settings'|t('commerce') },
     { label: "Product Types"|t('commerce'), url: url('commerce/settings/producttypes') },
 ] %}
 

diff --git a/src/translations/en/commerce.php b/src/translations/en/commerce.php
@@ -1065,6 +1065,7 @@
     'Strategy to apply when calculating the minimum order price.' => 'Strategy to apply when calculating the minimum order price.',
     'Subject' => 'Subject',
     'Subscribing user' => 'Subscribing user',
+    'Subscription Fields' => 'Subscription Fields',
     'Subscription Plans' => 'Subscription Plans',
     'Subscription Settings' => 'Subscription Settings',
     'Subscription cancelled.' => 'Subscription cancelled.',