Merge pull request #1 from MLindenhofer/MLindenhofer-TranslateAddress…

…TypeFix Update AddressBook.php - Fix
MLindenhofer · Oct 23, 2023 · b43590c · b43590c
2 parents 02c30c9 + b16415d
commit b43590c
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/Checkout/Component/AddressBook.php b/src/Checkout/Component/AddressBook.php
@@ -72,10 +72,19 @@ public function getExistingAddressFields()
         $member = Security::getCurrentUser();
         if ($member && $member->AddressBook()->exists()) {
             $addressoptions = $member->AddressBook()->sort('Created', 'DESC')->map('ID', 'toString')->toArray();
-            $addressoptions['newaddress'] = _t('SilverShop\Model\Address.CreateNewAddress', 'Create new {AddressType} address', '', ["AddressType" => $this->addresstype]);
+
+            $translatedAddressType = $this->addresstype;
+            if ($this->addresstype === 'Billing'){
+                $translatedAddressType = _t('SilverShop\Model\Address.BillingAddress', $this->addresstype);
+            }
+            if ($this->addresstype === 'Shipping'){
+                $translatedAddressType =  _t('SilverShop\Model\Address.ShippingAddress', $this->addresstype);
+            }
+
+            $addressoptions['newaddress'] = _t('SilverShop\Model\Address.CreateNewAddress', 'Create new {AddressType} address', '', ["AddressType" => $translatedAddressType]);
             $fieldtype = count($addressoptions) > 3 ? DropdownField::class : OptionsetField::class;
 
-            $label = _t("SilverShop\Model\Address.Existing{$this->addresstype}Address", "Existing {$this->addresstype} Address");
+            $label = _t("SilverShop\Model\Address.Existing{$this->addresstype}Address", "Existing {$translatedAddressType} Address");
 
             return FieldList::create(
                 $fieldtype::create(