@vtex/faststore-plugin-buyer-portal 2.0.13 → 2.0.14

package/src/features/accounting-fields/layouts/AccountingFieldLayout/AccountingFieldLayout.tsx

@@ -22,6 +22,7 @@ import {
   useQueryParams,
 } from "../../../shared/hooks";
 import { ContractTabsLayout, GlobalLayout } from "../../../shared/layouts";
+import { useLocalization } from "../../../shared/localization/LocalizationContext";
 import { getValidPage } from "../../../shared/utils";
 import { buyerPortalRoutes } from "../../../shared/utils/buyerPortalRoutes";
 import {
@@ -48,6 +49,7 @@ const PAGE_SIZE = 25;
 export const AccountingFieldLayout = ({
   accountingField,
 }: AccountingFieldLayoutProps) => {
+  const { t } = useLocalization();
   const router = useRouter();
   const { setQueryStrings } = useQueryParams();
   const [page, setPage] = useState(getValidPage(router.query.page));
@@ -104,10 +106,11 @@ export const AccountingFieldLayout = ({
   const columns = getTableColumns({
     actionsLength: 2,
     nameColumnSize: "14.5rem",
+    nameColumnLabel: t("accountingFields.table.columnName"),
     extraColumns: [
       {
         key: "description",
-        label: "Description",
+        label: t("accountingFields.table.columnDescription"),
         align: "left",
         size: "100%",
         hideOnScreenSize: "tablet",
@@ -164,7 +167,7 @@ export const AccountingFieldLayout = ({
         orgUnitId={orgUnit?.id ?? ""}
         contractName={contract?.name ?? ""}
         contractId={contract?.id ?? ""}
-        pageName="Contract"
+        pageName={t("shared.labels.contract")}
       >
         <div data-fs-bp-accounting-field-container>
           <HeaderInside
@@ -198,14 +201,13 @@ export const AccountingFieldLayout = ({
           {checkAccountingFieldIsEmpty(accountingField!) && (
             <AccountingFieldEmptyAlert flexContent>
               <span data-fs-bp-accounting-field-empty-alert-message>
-                Due to the field settings, at least one value is required for
-                buyers to complete checkout.
+                {t("accountingFields.messages.emptyValueRequired")}
               </span>
               <button
                 data-fs-bp-accounting-field-empty-alert-btn
                 onClick={openCreateAccountingValueDrawer}
               >
-                Add value
+                {t("accountingFields.buttons.addValue")}
               </button>
             </AccountingFieldEmptyAlert>
           )}
@@ -214,12 +216,12 @@ export const AccountingFieldLayout = ({
             <Paginator.Interval {...intervalData} />
           </div>
           {!listAccountingValuesLoading && intervalData.total === 0 ? (
-            <EmptyState title="No values yet">
+            <EmptyState title={t("accountingFields.empty.noValuesTitle")}>
               <button
                 data-fs-bp-accounting-field-empty-state-btn
                 onClick={openCreateAccountingValueDrawer}
               >
-                Add
+                {t("shared.buttons.add")}
               </button>
             </EmptyState>
           ) : (
@@ -261,14 +263,14 @@ export const AccountingFieldLayout = ({
               onClick={previousPage}
               disabled={isLoading || page <= 1}
             >
-              Previous Page
+              {t("shared.pagination.previousPage")}
             </Paginator.NextPageButton>
             <Paginator.NextPageButton
               data-fs-bp-accounting-field-next-page
               onClick={nextPage}
               disabled={isLoading || page >= totalPages}
             >
-              Next Page
+              {t("shared.pagination.nextPage")}
             </Paginator.NextPageButton>
             <Paginator.Interval {...intervalData} />
           </div>

package/src/features/addresses/components/AddRecipientsDrawer/AddRecipientsDrawer.tsx

@@ -7,9 +7,9 @@ import { useUI } from "@faststore/ui";
 import { RecipientsForm } from "..";
 import { type BasicDrawerProps, BasicDrawer } from "../../../shared/components";
 import { useAnalytics, useBuyerPortal } from "../../../shared/hooks";
+import { useLocalization } from "../../../shared/localization/LocalizationContext";
 import { ANALYTICS_EVENTS } from "../../../shared/services/logger/analytics/constants";
 import { buyerPortalRoutes } from "../../../shared/utils/buyerPortalRoutes";
-import { CHANGES_TIMEOUT_MESSAGE } from "../../../shared/utils/constants";
 import { useAddRecipientsToAddress } from "../../hooks/useAddRecipientsToAddress";
 
 import type { RecipientInput } from "../../types";
@@ -32,6 +32,7 @@ export const AddRecipientsDrawer = ({
   const router = useRouter();
   const { pushToast } = useUI();
   const { currentOrgUnit } = useBuyerPortal();
+  const { t } = useLocalization();
   const { trackEvent, trackEntityCreateError } = useAnalytics({
     entityType: "recipient",
     defaultTimerName: "recipient_creation",
@@ -51,7 +52,9 @@ export const AddRecipientsDrawer = ({
         });
 
         pushToast({
-          message: `Recipients added successfully\n${CHANGES_TIMEOUT_MESSAGE}`,
+          message: `${t("addresses.toasts.recipientsAdded")}\n${t(
+            "shared.messages.changesTimeout"
+          )}`,
           status: "INFO",
           icon: (
             <button
@@ -67,7 +70,7 @@ export const AddRecipientsDrawer = ({
                 router.push(`${url}?tab=recipient-tab`);
               }}
             >
-              View
+              {t("shared.buttons.view")}
             </button>
           ),
         });
@@ -84,7 +87,7 @@ export const AddRecipientsDrawer = ({
         });
 
         pushToast({
-          message: "An error occurred while adding recipients",
+          message: t("addresses.errors.recipientsAdd"),
           status: "ERROR",
         });
       },
@@ -111,14 +114,17 @@ export const AddRecipientsDrawer = ({
 
   return (
     <BasicDrawer data-fs-bp-create-address-drawer close={close} {...props}>
-      <BasicDrawer.Heading title="Add Recipients" onClose={close} />
+      <BasicDrawer.Heading
+        title={t("addresses.drawers.addRecipients")}
+        onClose={close}
+      />
       <BasicDrawer.Body>
         <RecipientsForm recipients={recipients} setRecipients={setRecipients} />
       </BasicDrawer.Body>
 
       <BasicDrawer.Footer>
         <BasicDrawer.Button variant="ghost" onClick={close}>
-          Cancel
+          {t("shared.buttons.cancel")}
         </BasicDrawer.Button>
         <BasicDrawer.Button
           variant="confirm"
@@ -126,7 +132,7 @@ export const AddRecipientsDrawer = ({
           onClick={handleConfirmClick}
           disabled={!isConfirmButtonEnabled}
         >
-          Save
+          {t("shared.buttons.save")}
         </BasicDrawer.Button>
       </BasicDrawer.Footer>
     </BasicDrawer>

package/src/features/addresses/components/AddressDropdownMenu/AddressDropdownMenu.tsx

@@ -11,8 +11,7 @@ import {
 } from "..";
 import { BasicDropdownMenu, Icon } from "../../../shared/components";
 import { useDrawerProps } from "../../../shared/hooks";
-import { CHANGES_TIMEOUT_MESSAGE } from "../../../shared/utils/constants";
-import { ADDRESS_MESSAGES } from "../../constants/messages";
+import { useLocalization } from "../../../shared/localization/LocalizationContext";
 import { useSetDefaultAddress } from "../../hooks/useSetDefaultAddress";
 import { useUnsetDefaultAddress } from "../../hooks/useUnsetDefaultAddress";
 
@@ -29,7 +28,7 @@ export type AddressDropdownMenuProps = {
 };
 
 export const AddressDropdownMenu = ({
-  locationsLabel = "Locations",
+  locationsLabel,
   currentAddress,
   onUpdate,
   onOpen,
@@ -37,13 +36,18 @@ export const AddressDropdownMenu = ({
 }: AddressDropdownMenuProps) => {
   const router = useRouter();
   const { pushToast } = useUI();
+  const { t } = useLocalization();
+
+  const resolvedLocationsLabel =
+    locationsLabel ?? t("addresses.labels.locations");
 
   const orgUnitId = router.query.orgUnitId as string;
   const customerId = router.query.contractId as string;
 
   const handleCreateNewAddressSuccess = () => {
     pushToast({
-      message: `${ADDRESS_MESSAGES.defaultSaved}\n${CHANGES_TIMEOUT_MESSAGE}`,
+      message: `${t("addresses.toasts.defaultSaved")}
+${t("shared.messages.changesTimeout")}`,
       status: "INFO",
     });
     onUpdate?.();
@@ -51,7 +55,8 @@ export const AddressDropdownMenu = ({
 
   const handleRemoveDefaultAddressSuccess = () => {
     pushToast({
-      message: `${ADDRESS_MESSAGES.defaultUnset}\n${CHANGES_TIMEOUT_MESSAGE}`,
+      message: `${t("addresses.toasts.defaultUnset")}
+${t("shared.messages.changesTimeout")}`,
       status: "INFO",
     });
     onUpdate?.();
@@ -61,7 +66,7 @@ export const AddressDropdownMenu = ({
     onSuccess: handleRemoveDefaultAddressSuccess,
     onError: () => {
       pushToast({
-        message: ADDRESS_MESSAGES.defaultUnsetError,
+        message: t("addresses.errors.defaultUnsetError"),
         status: "ERROR",
       });
     },
@@ -71,7 +76,7 @@ export const AddressDropdownMenu = ({
     onSuccess: handleCreateNewAddressSuccess,
     onError: () => {
       pushToast({
-        message: ADDRESS_MESSAGES.defaultError,
+        message: t("addresses.errors.defaultError"),
         status: "ERROR",
       });
     },
@@ -79,7 +84,7 @@ export const AddressDropdownMenu = ({
 
   const handleSetAsDefault = () => {
     pushToast({
-      message: "Setting the default address...",
+      message: t("addresses.toasts.settingDefault"),
       status: "INFO",
       icon: <Icon name="LoadingIndicator" data-fs-icon-loading="true" />,
     });
@@ -100,7 +105,7 @@ export const AddressDropdownMenu = ({
 
   const handleUnsetAsDefault = () => {
     pushToast({
-      message: "Unsetting the default address...",
+      message: t("addresses.toasts.unsettingDefault"),
       status: "INFO",
       icon: <Icon name="LoadingIndicator" data-fs-icon-loading="true" />,
     });
@@ -117,9 +122,6 @@ export const AddressDropdownMenu = ({
     onOpen?.();
   };
 
-  // const idsPath = currentOrgUnit?.path?.ids?.split("/") ?? [];
-  // const isRootLevelOrgUnit = idsPath.length === 2;
-
   const {
     open: openEditDrawerProps,
     isOpen: isEditDrawerOpen,
@@ -161,31 +163,31 @@ export const AddressDropdownMenu = ({
         </DropdownItem>
         <DropdownItem onClick={openEditDrawerProps}>
           <Icon name="Edit" {...sizeProps} />
-          Edit details
+          {t("addresses.dropdown.editDetails")}
         </DropdownItem>
         <DropdownItem
           data-fs-bp-testid="dropdown-item-add-location"
           onClick={openLocationDrawer}
         >
           <UIIcon name="PlusCircle" {...sizeProps} />
-          Add {locationsLabel}
+          {t("addresses.actions.addLocations", [resolvedLocationsLabel])}
         </DropdownItem>
         <DropdownItem
           data-fs-bp-testid="dropdown-item-add-recipient"
           onClick={openRecipientsDrawer}
         >
           <UIIcon name="PlusCircle" {...sizeProps} />
-          Add Recipients
+          {t("addresses.actions.addRecipients")}
         </DropdownItem>
         {currentAddress.isDefault ? (
           <DropdownItem onClick={handleUnsetAsDefault}>
             <Icon name="BookmarkRemove" {...sizeProps} />
-            Unset as default
+            {t("addresses.actions.unsetAsDefault")}
           </DropdownItem>
         ) : (
           <DropdownItem onClick={handleSetAsDefault}>
             <Icon name="BookmarkAdd" {...sizeProps} />
-            Set as default
+            {t("addresses.actions.setAsDefault")}
           </DropdownItem>
         )}
 
@@ -195,7 +197,7 @@ export const AddressDropdownMenu = ({
           data-fs-bp-dropdown-menu-item-disabled={isSyncMode}
         >
           <UIIcon name="MinusCircle" {...sizeProps} />
-          Remove from Unit
+          {t("addresses.actions.removeFromUnit")}
         </DropdownItem>
         {/* Remove validation while we reevaluate the rule */}
         {/* {isRootLevelOrgUnit && ( */}
@@ -204,7 +206,7 @@ export const AddressDropdownMenu = ({
           data-fs-bp-dropdown-menu-item-mode="danger"
         >
           <Icon name="Delete" {...sizeProps} data-fs-bp-delete-address />
-          <span data-fs-bp-delete-address>Delete</span>
+          <span data-fs-bp-delete-address>{t("shared.buttons.delete")}</span>
         </DropdownItem>
         {/* )} */}
       </BasicDropdownMenu>
@@ -222,7 +224,7 @@ export const AddressDropdownMenu = ({
           {...locationDrawerProps}
           isOpen={isOpenLocationDrawer}
           addressId={currentAddress.id}
-          locationsLabel={locationsLabel}
+          locationsLabel={resolvedLocationsLabel}
         />
       )}
       {isOpenRecipientsDrawer && (

package/src/features/addresses/components/AddressForm/AddressForm.tsx

@@ -8,6 +8,7 @@ import {
   Icon,
 } from "../../../shared/components";
 import { useBuyerPortal } from "../../../shared/hooks";
+import { useLocalization } from "../../../shared/localization/LocalizationContext";
 import { maskPostalCode } from "../../../shared/utils/postalCode";
 import { CountryOptions, type CountryOption } from "../../data/countries";
 import { useDebouncedSearchAddress } from "../../hooks/useDebouncedSearchAddress";
@@ -47,7 +48,10 @@ export const AddressForm = ({
   setCompletedAddress,
   fixedType = false,
 }: AddressFormProps) => {
+  const { t } = useLocalization();
+
   const addressTypeOptions = ["Shipping", "Billing"];
+
   const { currentOrgUnit } = useBuyerPortal();
   const [selectedState, setSelectedState] = useState(
     address.state
@@ -61,6 +65,13 @@ export const AddressForm = ({
     currentOrgUnit?.id ?? ""
   );
 
+  const countryTranslations: Record<string, string> = {
+    BRA: t("addresses.forms.country.brazil"),
+    USA: t("addresses.forms.country.usa"),
+    CAN: t("addresses.forms.country.canada"),
+    MEX: t("addresses.forms.country.mexico"),
+  };
+
   const cleanCompletedAddress = () => {
     if (setCompletedAddress && setUseExistingAddress) {
       setCompletedAddress({} as AddressData);
@@ -91,12 +102,12 @@ export const AddressForm = ({
     <>
       {!useExistingAddress ? (
         <div data-fs-create-address-form>
-          {!hideLabel && <span>Fill in the address details</span>}
+          {!hideLabel && <span>{t("addresses.forms.fillInDetails")}</span>}
 
           <div key="country">
             <AutocompleteDropdown
               data-fs-bp-create-address-country-selector
-              label="Country"
+              label={t("addresses.forms.country")}
               className="address-country"
               value={address.country}
               options={CountryOptions}
@@ -114,7 +125,7 @@ export const AddressForm = ({
                     handleCountrySelect(option);
                   }}
                 >
-                  {option?.name}
+                  {countryTranslations[option.id] ?? option.name}
                   {address.country === option?.name && (
                     <Icon name="Check" width={12} height={12} />
                   )}
@@ -126,7 +137,7 @@ export const AddressForm = ({
           {address.countryCode === "BRA" && (
             <div key="zipCode">
               <InputText
-                label="Postal Code"
+                label={t("addresses.forms.postalCode")}
                 value={address.zip}
                 className="address-postal-code"
                 hasError={isTouched && !address.zip?.trim()}
@@ -135,7 +146,7 @@ export const AddressForm = ({
               />
               <ErrorMessage
                 show={isTouched && !address.zip?.trim()}
-                message="Postal Code is required"
+                message={t("addresses.validation.postalCodeRequired")}
               />
             </div>
           )}
@@ -143,7 +154,7 @@ export const AddressForm = ({
           <div key="addressName">
             {isEdit ? (
               <InputText
-                label="Address Name"
+                label={t("addresses.forms.addressName")}
                 value={address.name}
                 className="address-name"
                 hasError={isTouched && !address.name?.trim()}
@@ -153,13 +164,13 @@ export const AddressForm = ({
               />
             ) : (
               <AutocompleteDropdown
-                label="Address Name"
+                label={t("addresses.forms.addressName")}
                 value={autoCompleteAddressName}
                 className="address-name"
                 options={searchedAddresses}
                 shouldCloseOnSelect
                 shouldShowArrowDown={false}
-                placeholder="Already in the contract — select to add"
+                placeholder={t("addresses.placeholders.selectExistingAddress")}
                 onChange={(event) => {
                   setAutoCompleteAddressName(event.currentTarget.value);
                   setAddress({ ...address, name: event.target.value });
@@ -196,7 +207,7 @@ export const AddressForm = ({
 
           <div key="streetAddress">
             <InputText
-              label="Street Address"
+              label={t("addresses.forms.streetAddress")}
               value={address.streetAddress}
               className="street-address"
               hasError={isTouched && !address.streetAddress?.trim()}
@@ -206,7 +217,7 @@ export const AddressForm = ({
             />
             <ErrorMessage
               show={isTouched && !address.streetAddress?.trim()}
-              message="Street Address is required"
+              message={t("addresses.validation.streetAddressRequired")}
             />
           </div>
 
@@ -215,7 +226,7 @@ export const AddressForm = ({
               <div key="streetNumber">
                 <InputText
                   type="number"
-                  label="Number"
+                  label={t("addresses.forms.number")}
                   value={address.streetNumber || ""}
                   className="address-number"
                   hasError={isTouched && !address.streetNumber?.trim()}
@@ -225,13 +236,13 @@ export const AddressForm = ({
                 />
                 <ErrorMessage
                   show={isTouched && !address.streetNumber?.trim()}
-                  message="Number is required"
+                  message={t("addresses.validation.numberRequired")}
                 />
               </div>
 
               <div key="neighborhood">
                 <InputText
-                  label="Neighborhood"
+                  label={t("addresses.forms.neighborhood")}
                   value={address.neighborhood || ""}
                   className="address-neighborhood"
                   hasError={isTouched && !address.neighborhood?.trim()}
@@ -241,7 +252,7 @@ export const AddressForm = ({
                 />
                 <ErrorMessage
                   show={isTouched && !address.neighborhood?.trim()}
-                  message="Neighborhood is required"
+                  message={t("addresses.validation.neighborhoodRequired")}
                 />
               </div>
             </>
@@ -249,7 +260,7 @@ export const AddressForm = ({
 
           <div key="streetAddress2">
             <InputText
-              label="Apt, Suite, Building (optional)"
+              label={t("addresses.forms.aptSuiteBuilding")}
               className="street-address2"
               value={address.streetAddress2}
               onChange={(event) =>
@@ -260,7 +271,7 @@ export const AddressForm = ({
 
           <div key="city">
             <InputText
-              label="City"
+              label={t("addresses.forms.city")}
               className="address-city"
               value={address.city}
               hasError={isTouched && !address.city?.trim()}
@@ -270,14 +281,14 @@ export const AddressForm = ({
             />
             <ErrorMessage
               show={isTouched && !address.city?.trim()}
-              message="City is required"
+              message={t("addresses.validation.cityRequired")}
             />
           </div>
 
           <div key="state">
             <AutocompleteDropdown
               data-fs-bp-create-address-state-selector
-              label="State"
+              label={t("addresses.forms.state")}
               className="address-state"
               value={selectedState}
               options={getStateDisplayOptions(address.countryCode || "")}
@@ -332,7 +343,7 @@ export const AddressForm = ({
           {address.countryCode !== "BRA" && (
             <div key="zipCode">
               <InputText
-                label="Postal Code"
+                label={t("addresses.forms.postalCode")}
                 value={address.zip}
                 className="address-postal-code"
                 hasError={isTouched && !address.zip?.trim()}
@@ -341,7 +352,7 @@ export const AddressForm = ({
               />
               <ErrorMessage
                 show={isTouched && !address.zip?.trim()}
-                message="Postal Code is required"
+                message={t("addresses.validation.postalCodeRequired")}
               />
             </div>
           )}
@@ -349,7 +360,7 @@ export const AddressForm = ({
           {isEdit && (
             <div key="geoCoordinates">
               <InputText
-                label="Geo coordinates (Optional)"
+                label={t("addresses.forms.geoCoordinates")}
                 value={address.geoCoordinates}
                 onChange={(event) =>
                   setAddress({ ...address, geoCoordinates: event.target.value })
@@ -361,7 +372,7 @@ export const AddressForm = ({
           {!fixedType && (
             <div key="addressType">
               <AutocompleteDropdown
-                label="Address Type"
+                label={t("addresses.forms.addressType")}
                 value={address?.types.length > 0 ? address.types : ""}
                 className="address-type"
                 options={addressTypeOptions}

package/src/features/addresses/components/AddressLine/AddressLine.tsx

@@ -1,6 +1,5 @@
-import Link from "next/link";
-
-import { Dropdown } from "@faststore/ui";
+import { useLink_unstable as useLink } from "@faststore/core/experimental";
+import { Dropdown, Link } from "@faststore/ui";
 
 import { AddressDropdownMenu } from "..";
 import { BasicDropdownMenu, Icon, Tag } from "../../../shared/components";
@@ -21,27 +20,32 @@ export const AddressLine = ({
   types,
   href,
   currentAddress,
-}: AddressLineProps) => (
-  <li data-fs-addresses-line>
-    <Link href={href} data-fs-addresses-line-link>
-      <Icon
-        name="LocalPostOffice"
-        width={20}
-        height={20}
-        data-fs-addresses-line-icon
-      />
-      <span title={name} data-fs-addresses-line-name>
-        {name}
-      </span>
+}: AddressLineProps) => {
+  const { resolveLink } = useLink();
+  const resolvedHref = resolveLink(href);
+
+  return (
+    <li data-fs-addresses-line>
+      <Link href={resolvedHref} data-fs-addresses-line-link>
+        <Icon
+          name="LocalPostOffice"
+          width={20}
+          height={20}
+          data-fs-addresses-line-icon
+        />
+        <span title={name} data-fs-addresses-line-name>
+          {name}
+        </span>
 
-      {types.map((type) => (
-        <Tag key={type}>{type}</Tag>
-      ))}
-    </Link>
+        {types.map((type) => (
+          <Tag key={type}>{type}</Tag>
+        ))}
+      </Link>
 
-    <Dropdown>
-      <BasicDropdownMenu.Trigger />
-      <AddressDropdownMenu currentAddress={currentAddress} />
-    </Dropdown>
-  </li>
-);
+      <Dropdown>
+        <BasicDropdownMenu.Trigger />
+        <AddressDropdownMenu currentAddress={currentAddress} />
+      </Dropdown>
+    </li>
+  );
+};

package/src/features/addresses/components/AddressLocationsList/AddressLocationsList.tsx

@@ -18,6 +18,7 @@ import {
   usePageItems,
 } from "../../../shared/hooks";
 import { PAGE_PARAMS, SEARCH_PARAMS } from "../../../shared/hooks/usePageItems";
+import { useLocalization } from "../../../shared/localization/LocalizationContext";
 import { useAddressLocationList } from "../../hooks";
 import { DeleteAddressLocationDrawer } from "../DeleteAddressLocationDrawer/DeleteAddressLocationDrawer";
 import { EditAddressLocationDrawer } from "../EditAddressLocationDrawer/EditAddressLocationDrawer";
@@ -47,11 +48,16 @@ export const AddressLocationsList = forwardRef<
       total = 0,
       search = "",
       page = 1,
-      locationsLabel = "Locations",
+      locationsLabel,
       onOpenAddDrawer,
     }: AddressLocationsListProps,
     ref
   ) => {
+    const { t } = useLocalization();
+
+    const resolvedLocationsLabel =
+      locationsLabel ?? t("addresses.labels.locations");
+
     const {
       isLoading,
       items: locations,
@@ -114,6 +120,7 @@ export const AddressLocationsList = forwardRef<
 
     const columns = getTableColumns({
       actionsLength: 2,
+      nameColumnLabel: t("shared.labels.name"),
     });
 
     return (
@@ -132,14 +139,14 @@ export const AddressLocationsList = forwardRef<
           <EmptyState
             iconName="EmptyState"
             iconSize={56}
-            title="No results found"
+            title={t("addresses.empty.noResults")}
           >
             <Button
               variant="primary"
               onClick={() => onOpenAddDrawer?.()}
               data-fs-bp-address-tabs-empty-state
             >
-              Add locations
+              {t("addresses.buttons.addLocations")}
             </Button>
           </EmptyState>
         ) : (
@@ -188,7 +195,7 @@ export const AddressLocationsList = forwardRef<
                 isOpen={isOpenEditLocation}
                 location={selectedLocation}
                 onEditSuccess={handleRefreshLocations}
-                locationsLabel={locationsLabel}
+                locationsLabel={resolvedLocationsLabel}
                 {...editLocationProps}
               />
             )}
@@ -198,7 +205,7 @@ export const AddressLocationsList = forwardRef<
                 isOpen={isOpenDeleteLocation}
                 location={selectedLocation}
                 onDeleteSuccess={handleRefreshLocations}
-                locationsLabel={locationsLabel}
+                locationsLabel={resolvedLocationsLabel}
                 {...deleteLocationProps}
               />
             )}
@@ -208,7 +215,9 @@ export const AddressLocationsList = forwardRef<
                   onClick={increasePage}
                   disabled={isLoading}
                 >
-                  {isLoading ? "Loading" : "Load More"}
+                  {isLoading
+                    ? t("shared.labels.loading")
+                    : t("shared.buttons.loadMore")}
                 </Paginator.NextPageButton>
               )}