diff --git a/src/services/Customers.php b/src/services/Customers.php index ee13c74797..501cfaa257 100644 --- a/src/services/Customers.php +++ b/src/services/Customers.php @@ -409,7 +409,7 @@ private function _activateUserFromOrder(Order $order): void // If there is only one address make sure we don't add duplicates to the user if ($order->hasMatchingAddresses()) { - $newAttributes['title'] = Craft::t('commerce', 'Address'); + $newAttributes['title'] = Craft::t('app', 'Address'); $shippingAddress = null; } diff --git a/src/templates/promotions/discounts/_edit.twig b/src/templates/promotions/discounts/_edit.twig index 936b3c4247..419e6f1fe0 100644 --- a/src/templates/promotions/discounts/_edit.twig +++ b/src/templates/promotions/discounts/_edit.twig @@ -212,7 +212,7 @@ {% if showEntries %} {{ forms.elementSelectField({ id: 'entries', - label: 'Entries'|t('commerce'), + label: 'Entries'|t('app'), name: 'relatedElements[entries]', elements: entries ? entries : null, elementType: entryElementType, @@ -222,7 +222,7 @@ {% endif %} {{ 'Advanced'|t('commerce') }} + data-target="categoryRelationshipType-advanced">{{ 'Advanced'|t('app') }}
diff --git a/src/templates/promotions/sales/_edit.twig b/src/templates/promotions/sales/_edit.twig index 4e4985b110..b1392e6bfa 100644 --- a/src/templates/promotions/sales/_edit.twig +++ b/src/templates/promotions/sales/_edit.twig @@ -182,7 +182,7 @@ {% if showEntries %} {{ forms.elementSelectField({ id: 'entries', - label: 'Entries'|t('commerce'), + label: 'Entries'|t('app'), name: 'relatedElements[entries]', elements: entries ? entries : null, elementType: entryElementType, @@ -192,7 +192,7 @@ {% endif %} {{ 'Advanced'|t('commerce') }} + data-target="categoryRelationshipType-advanced">{{ 'Advanced'|t('app') }}
diff --git a/src/translations/en/commerce.php b/src/translations/en/commerce.php index c1e08ac8b7..b668eb1310 100644 --- a/src/translations/en/commerce.php +++ b/src/translations/en/commerce.php @@ -38,10 +38,8 @@ 'Address Line 2' => 'Address Line 2', 'Address Updated.' => 'Address Updated.', 'Address not found.' => 'Address not found.', - 'Address' => 'Address', 'Adjust price when included rate is disqualified?' => 'Adjust price when included rate is disqualified?', 'Adjustments' => 'Adjustments', - 'Advanced' => 'Advanced', 'All Orders' => 'All Orders', 'All Totals' => 'All Totals', 'All active subscriptions' => 'All active subscriptions', @@ -417,7 +415,6 @@ 'Enter slug' => 'Enter slug', 'Enter stock' => 'Enter stock', 'Enter weight' => 'Enter weight', - 'Entries' => 'Entries', 'Error refunding transaction: {transactionHash}' => 'Error refunding transaction: {transactionHash}', 'Everywhere' => 'Everywhere', 'Example' => 'Example',