From e3d8ac03c343f98b43f8a009cb2a26fc913ad12d Mon Sep 17 00:00:00 2001
From: Aashish Sharma
 <aasharma@li-e74156cc-2f67-11b2-a85c-e98659a63c5c.ibm.com>
Date: Wed, 6 Sep 2023 12:46:49 +0530
Subject: [PATCH] mgr/dashboard: Rgw Multi-site naming improvements

Fixes: https://tracker.ceph.com/issues/62721

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
---
 .../service-form/service-form.component.html  |  4 +--
 ...create-rgw-service-entities.component.html |  8 +++---
 ...ite-zonegroup-deletion-form.component.html |  6 ++--
 .../rgw-multisite-details.component.html      |  4 +--
 .../rgw-multisite-details.component.ts        |  6 ++--
 .../rgw-multisite-export.component.html       |  2 +-
 .../rgw-multisite-import.component.html       | 10 +++++--
 .../rgw-multisite-migrate.component.html      | 28 +++++++++++++------
 .../rgw-multisite-zone-form.component.html    | 18 ++++++++----
 ...gw-multisite-zonegroup-form.component.html | 14 +++++-----
 .../rgw-overview-dashboard.component.html     |  8 +++---
 .../frontend/src/app/ceph/rgw/rgw.module.ts   |  2 +-
 .../navigation/navigation.component.html      |  2 +-
 13 files changed, 68 insertions(+), 44 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
index 0c2392fce4185..b95f9353db352 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
@@ -13,7 +13,7 @@
                         i18n>
           <a class="text-decoration-underline"
              (click)="createMultisiteSetup()">
-             Click here</a> to create a new realm/zonegroup/zone
+             Click here</a> to create a new Realm/Zone Group/Zone
         </cd-alert-panel>
         <!-- Service type -->
         <div class="form-group row">
@@ -122,7 +122,7 @@
              *ngIf="serviceForm.controls.service_type.value === 'rgw'">
           <label class="cd-col-form-label"
                  for="zonegroup_name"
-                 i18n>Zonegroup</label>
+                 i18n>Zone Group</label>
           <div class="cd-col-form-input">
             <select class="form-select"
                     id="zonegroup_name"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html
index b6e4f805d0ca4..140f314ce5379 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html
@@ -1,6 +1,6 @@
 <cd-modal [modalRef]="activeModal">
   <ng-container i18n="form title"
-                class="modal-title">Create Realm/Zonegroup/Zone
+                class="modal-title">Create Realm/Zone Group/Zone
   </ng-container>
 
   <ng-container class="modal-content">
@@ -10,7 +10,7 @@
           novalidate>
     <div class="modal-body">
       <cd-alert-panel type="info"
-                      spacingClass="mb-3">The realm/zonegroup/zone created will be set as default and master.
+                      spacingClass="mb-3">The realm/zone group/zone created will be set as default and master.
       </cd-alert-panel>
       <div class="form-group row">
         <label class="cd-col-form-label required"
@@ -31,11 +31,11 @@
       <div class="form-group row">
         <label class="cd-col-form-label required"
                for="zonegroupName"
-               i18n>Zonegroup Name</label>
+               i18n>Zone Group Name</label>
         <div class="cd-col-form-input">
           <input class="form-control"
                  type="text"
-                 placeholder="Zonegroup name..."
+                 placeholder="Zone group name..."
                  id="zonegroupName"
                  name="zonegroupName"
                  formControlName="zonegroupName">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component.html
index 2f92b0467a043..f23e017be01e5 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component.html
@@ -1,6 +1,6 @@
 <cd-modal [modalRef]="activeModal">
   <ng-container i18n="form title"
-                class="modal-title">Delete Zonegroup</ng-container>
+                class="modal-title">Delete Zone Group</ng-container>
 
   <ng-container class="modal-content">
     <form name="zonegroupForm"
@@ -8,12 +8,12 @@
           novalidate>
       <div class="modal-body ms-4">
         <label i18n>
-          This will delete your <strong>{{zonegroup?.name}}</strong> Zonegroup.
+          This will delete your <strong>{{zonegroup?.name}}</strong> Zone Group.
         </label>
         <ng-container *ngIf="zonesList.length > 0">
           <label class="mt-3"
                  i18n>
-              Do you want to delete the associated zones and pools with the <strong>{{zonegroup?.name}}</strong> Zonegroup?</label>
+              Do you want to delete the associated zones and pools with the <strong>{{zonegroup?.name}}</strong> Zone Group?</label>
           <ng-container *ngIf="includedPools.size > 0">
             <label i18n>
               This will delete the following:</label>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.html
index 8523727bb0afc..9f3f31a8fbfcb 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.html
@@ -4,10 +4,10 @@
       <cd-alert-panel   *ngIf="!rgwModuleStatus"
                         type="info"
                         spacingClass="mb-3"
-                        i18n>You need to enable the rgw module to access the import/export feature.
+                        i18n>In order to access the import/export feature, the rgw module must be enabled
         <a class="text-decoration-underline"
            (click)="enableRgwModule()">
-           Enable RGW Module</a>
+           Enable the Object Gateway Module</a>
       </cd-alert-panel>
       <cd-table-actions class="btn-group mb-4 me-2"
                         [permission]="permission"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts
index 5a667cbe41f59..0c303a5c439d7 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts
@@ -50,9 +50,9 @@ export class RgwMultisiteDetailsComponent implements OnDestroy, OnInit {
 
   messages = {
     noDefaultRealm: $localize`Please create a default realm first to enable this feature`,
-    noMasterZone: $localize`Please create a master zone for each zonegroups to enable this feature`,
+    noMasterZone: $localize`Please create a master zone for each zone group to enable this feature`,
     noRealmExists: $localize`No realm exists`,
-    disableExport: $localize`Please create master zonegroup and master zone for each of the realms`
+    disableExport: $localize`Please create master zone group and master zone for each of the realms`
   };
 
   @BlockUI()
@@ -209,7 +209,7 @@ export class RgwMultisiteDetailsComponent implements OnDestroy, OnInit {
     const createZonegroupAction: CdTableAction = {
       permission: 'create',
       icon: Icons.add,
-      name: this.actionLabels.CREATE + ' Zonegroup',
+      name: this.actionLabels.CREATE + ' Zone Group',
       click: () => this.openModal('zonegroup'),
       disable: () => this.getDisable()
     };
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-export/rgw-multisite-export.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-export/rgw-multisite-export.component.html
index 7798849369383..b399f934aa644 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-export/rgw-multisite-export.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-export/rgw-multisite-export.component.html
@@ -1,6 +1,6 @@
 <cd-modal [modalRef]="activeModal">
   <ng-container i18n="form title"
-                class="modal-title">Export Multi-site Realm Token</ng-container>
+                class="modal-title">Export Multi-Site Realm Token</ng-container>
 
   <ng-container class="modal-content">
     <form name="exportTokenForm"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-import/rgw-multisite-import.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-import/rgw-multisite-import.component.html
index 823e8e8d4f3e5..bf11e04029aad 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-import/rgw-multisite-import.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-import/rgw-multisite-import.component.html
@@ -1,6 +1,6 @@
 <cd-modal [modalRef]="activeModal">
   <ng-container i18n="form title"
-                class="modal-title">Import Multi-site Token</ng-container>
+                class="modal-title">Import Multi-Site Token</ng-container>
 
   <ng-container class="modal-content">
     <form name="importTokenForm"
@@ -8,7 +8,13 @@
           [formGroup]="importTokenForm">
     <div class="modal-body">
       <cd-alert-panel type="info"
-                      spacingClass="mb-3">Please create a rgw service using the secondary zone(created after submitting this form) to start the replication between zones.
+                      spacingClass="mb-3">
+        <ul>
+          <li>This feature allows you to configure a connection between your primary and secondary Ceph clusters for data replication. By importing a token, you establish a link between the clusters, enabling data synchronization.</li>
+          <li>To obtain the token, generate it from your secondary Ceph cluster. This token includes encoded information about the secondary cluster's endpoint, access key, and secret key.</li>
+          <li>The secondary zone represents the destination cluster where your data will be replicated.</li>
+          <li>Please create an RGW service using the secondary zone (created after submitting this form) to start the replication between zones.</li>
+        </ul>
       </cd-alert-panel>
       <div class="form-group row">
         <label class="cd-col-form-label required"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-migrate/rgw-multisite-migrate.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-migrate/rgw-multisite-migrate.component.html
index 4e0cef6332238..f3f23feec7a51 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-migrate/rgw-multisite-migrate.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-migrate/rgw-multisite-migrate.component.html
@@ -1,8 +1,8 @@
 <cd-modal [modalRef]="activeModal">
   <ng-container i18n="form title"
-                class="modal-title">Migrate Single Site to Multi-site
+                class="modal-title">Migrate Single Site to Multi-Site
     <cd-helper>
-      <span>Migrate from a single-site deployment with a default zonegroup and zone to a multi-site system</span>
+      <span>Migrate from a single-site deployment with a default zone group and zone to a multi-site system</span>
     </cd-helper>
   </ng-container>
 
@@ -34,11 +34,11 @@
       <div class="form-group row">
         <label class="cd-col-form-label required"
                for="zonegroupName"
-               i18n>Rename default zonegroup</label>
+               i18n>Rename default zone group</label>
         <div class="cd-col-form-input">
           <input class="form-control"
                  type="text"
-                 placeholder="Zonegroup name..."
+                 placeholder="Zone group name..."
                  id="zonegroupName"
                  name="zonegroupName"
                  formControlName="zonegroupName">
@@ -47,13 +47,14 @@
                 i18n>This field is required.</span>
           <span class="invalid-feedback"
                 *ngIf="multisiteMigrateForm.showError('zonegroupName', formDir, 'uniqueName')"
-                i18n>The chosen zonegroup name is already in use.</span>
+                i18n>The chosen zone group name is already in use.</span>
         </div>
       </div>
       <div class="form-group row">
         <label class="cd-col-form-label required"
                for="zonegroup_endpoints"
-               i18n>Zonegroup Endpoints</label>
+               i18n>Zone group Endpoints
+        </label>
         <div class="cd-col-form-input">
           <input class="form-control"
                  type="text"
@@ -91,7 +92,8 @@
       <div class="form-group row">
         <label class="cd-col-form-label required"
                for="zone_endpoints"
-               i18n>Zone Endpoints</label>
+               i18n>Zone Endpoints
+        </label>
         <div class="cd-col-form-input">
           <input class="form-control"
                  type="text"
@@ -110,7 +112,11 @@
       <div class="form-group row">
         <label class="cd-col-form-label required"
                for="access_key"
-               i18n>Access key</label>
+               i18n>S3 access key
+          <cd-helper>
+            <span>To see or copy your S3 access key, go to <b>Object Gateway > Users</b> and click on your user name. In <b>Keys</b>, click <b>Show</b>. View the access key by clicking Show and copy the key by clicking <b>Copy to Clipboard</b>.</span>
+          </cd-helper>
+        </label>
         <div class="cd-col-form-input">
           <input class="form-control"
                  type="text"
@@ -123,7 +129,11 @@
       <div class="form-group row">
         <label class="cd-col-form-label required"
                for="access_key"
-               i18n>Secret key</label>
+               i18n>S3 secret key
+          <cd-helper>
+            <span>To see or copy your S3 access key, go to <b>Object Gateway > Users</b> and click on your user name. In <b>Keys</b>, click <b>Show</b>. View the secret key by clicking Show and copy the key by clicking <b>Copy to Clipboard</b>.</span>
+          </cd-helper>
+        </label>
         <div class="cd-col-form-input">
           <input class="form-control"
                  type="text"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.html
index 8f4422051c4a7..3856c42f0ea76 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.html
@@ -11,7 +11,7 @@
       <div class="form-group row">
         <label class="cd-col-form-label"
                for="selectedZonegroup"
-               i18n>Select Zonegroup</label>
+               i18n>Select Zone Group</label>
         <div class="cd-col-form-input">
           <select class="form-select"
                   id="selectedZonegroup"
@@ -55,7 +55,7 @@
                    for="default_zone"
                    i18n>Default</label>
             <span *ngIf="disableDefault && action === 'create'">
-              <cd-helper i18n>Default zone can only exist in a default zonegroup.
+              <cd-helper i18n>Default zone can only exist in a default zone group.
               </cd-helper>
             </span>
             <span *ngIf="isDefaultZone">
@@ -77,7 +77,7 @@
                    for="master_zone"
                    i18n>Master</label>
             <span *ngIf="disableMaster">
-              <cd-helper i18n>Master zone already exists for the selected zonegroup.
+              <cd-helper i18n>Master zone already exists for the selected zone group.
               </cd-helper>
             </span>
             <span *ngIf="isMasterZone">
@@ -112,7 +112,11 @@
       <div class="form-group row">
         <label class="cd-col-form-label required"
                for="access_key"
-               i18n>Access key</label>
+               i18n>S3 access key
+          <cd-helper>
+            <span>To see or copy your S3 access key, go to <b>Object Gateway > Users</b> and click on your user name. In <b>Keys</b>, click <b>Show</b>. View the access key by clicking Show and copy the key by clicking <b>Copy to Clipboard</b>.</span>
+          </cd-helper>
+        </label>
         <div class="cd-col-form-input">
           <input class="form-control"
                  type="text"
@@ -125,7 +129,11 @@
       <div class="form-group row">
         <label class="cd-col-form-label required"
                for="access_key"
-               i18n>Secret key</label>
+               i18n>S3 secret key
+          <cd-helper>
+            <span>To see or copy your S3 access key, go to <b>Object Gateway > Users</b> and click on your user name. In <b>Keys</b>, click <b>Show</b>. View the secret key by clicking Show and copy the key by clicking <b>Copy to Clipboard</b>.</span>
+          </cd-helper>
+        </label>
         <div class="cd-col-form-input">
           <input class="form-control"
                  type="text"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.html
index e028d513ffe5e..88f8bcbd7e1f8 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.html
@@ -1,6 +1,6 @@
 <cd-modal [modalRef]="activeModal">
   <ng-container i18n="form title"
-                class="modal-title">{{ action | titlecase }} {{ resource | upperFirst }}</ng-container>
+                class="modal-title">{{ action | titlecase }} Zone Group</ng-container>
 
   <ng-container class="modal-content">
     <form name="multisiteZonegroupForm"
@@ -30,11 +30,11 @@
       <div class="form-group row">
         <label class="cd-col-form-label required"
                for="zonegroupName"
-               i18n>Zonegroup Name</label>
+               i18n>Zone Group Name</label>
         <div class="cd-col-form-input">
           <input class="form-control"
                  type="text"
-                 placeholder="Zonegroup name..."
+                 placeholder="Zone group name..."
                  id="zonegroupName"
                  name="zonegroupName"
                  formControlName="zonegroupName">
@@ -43,7 +43,7 @@
                 i18n>This field is required.</span>
           <span class="invalid-feedback"
                 *ngIf="multisiteZonegroupForm.showError('zonegroupName', formDir, 'uniqueName')"
-                i18n>The chosen zonegroup name is already in use.</span>
+                i18n>The chosen zone group name is already in use.</span>
         <div class="custom-control custom-checkbox">
           <input class="form-check-input"
                  id="default_zonegroup"
@@ -55,7 +55,7 @@
                  for="default_zonegroup"
                  i18n>Default</label>
           <span *ngIf="disableDefault && action === 'create'">
-            <cd-helper i18n>Zonegroup doesn't belong to the default realm.</cd-helper>
+            <cd-helper i18n>Zone group doesn't belong to the default realm.</cd-helper>
           </span>
           <cd-helper *ngIf="action === 'edit' && !info.data.is_default">
             <span i18n>Please consult the <a href="{{ docUrl }}">documentation</a> to follow the failover mechanism</span>
@@ -73,7 +73,7 @@
                  for="master_zonegroup"
                  i18n>Master</label>
           <span *ngIf="disableMaster && action === 'create'">
-            <cd-helper i18n>Multiple master zonegroups can't be configured. If you want to create a new zonegroup and make it the master zonegroup, you must delete the default zonegroup.</cd-helper>
+            <cd-helper i18n>Multiple master zone groups can't be configured. If you want to create a new zone group and make it the master zone group, you must delete the default zone group.</cd-helper>
           </span>
           <cd-helper *ngIf="action === 'edit' && !info.data.is_master">
             <span i18n>Please consult the <a href="{{ docUrl }}">documentation</a> to follow the failover mechanism</span>
@@ -198,7 +198,7 @@
     <div class="modal-footer">
       <cd-form-button-panel (submitActionEvent)="submit()"
                             [form]="multisiteZonegroupForm"
-                            [submitText]="(action | titlecase) + ' ' + (resource | upperFirst)"></cd-form-button-panel>
+                            [submitText]="(action | titlecase) + ' ' + 'Zone Group'"></cd-form-button-panel>
     </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-overview-dashboard/rgw-overview-dashboard.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-overview-dashboard/rgw-overview-dashboard.component.html
index e4cb2c1f8f539..7db871be4cf1c 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-overview-dashboard/rgw-overview-dashboard.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-overview-dashboard/rgw-overview-dashboard.component.html
@@ -24,7 +24,7 @@
       <li class="list-group-item">
         <cd-card-row [data]="rgwZonegroupCount"
                      link="/rgw/multisite"
-                     title="Zonegroup"
+                     title="Zone Group"
                      summaryType="simplified"
                      *ngIf="rgwZonegroupCount != null"></cd-card-row>
       </li>
@@ -109,14 +109,14 @@
   </div>
 
   <div class="row pt-4 pb-4">
-    <cd-card cardTitle="Multisite Sync Status"
+    <cd-card cardTitle="Multi-Site Sync Status"
              i18n-title>
       <ng-template #notConfigured>
         <span class="pe-5 ps-5">
           <cd-alert-panel type="info"
                           i18n>
-            Multisite needs to be configured in order to see the multisite sync status.
-            Please consult the <cd-doc section="multisite"></cd-doc> on how to configure and enable the multisite functionality.
+            Multi-site needs to be configured in order to see the multi-site sync status.
+            Please consult the <cd-doc section="multisite"></cd-doc> on how to configure and enable the multi-site functionality.
           </cd-alert-panel>
         </span>
       </ng-template>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts
index d1ca44b442429..df7e019ed7ce4 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts
@@ -199,7 +199,7 @@ const routes: Routes = [
         secondary_button_title:
           'Import multi-site configuration (import realm token from a secondary cluster)'
       },
-      breadcrumbs: 'Multisite'
+      breadcrumbs: 'Multi-Site'
     },
     children: [{ path: '', component: RgwMultisiteDetailsComponent }]
   }
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
index 941f8a762e96c..9c436f7044d58 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
@@ -292,7 +292,7 @@
           <li routerLinkActive="active"
               class="tc_submenuitem tc_submenuitem_rgw_buckets">
             <a i18n
-               routerLink="/rgw/multisite">Multisite</a>
+               routerLink="/rgw/multisite">Multi-Site</a>
           </li>
         </ul>
       </li>
-- 
2.39.5