Merge branch '338697-replace-node-text' into 'master'

Update UI text of `node` in other Geo pages

See merge request gitlab-org/gitlab!68991

ee/app/assets/javascripts/geo_node_form/components/geo_node_form_capacities.vue

@@ -70,7 +70,7 @@ export default {
       return this.nodeData.primary
         ? __('Set verification limit and frequency.')
         : __(
-            'Limit the number of concurrent operations this secondary node can run in the background.',
+            'Limit the number of concurrent operations this secondary site can run in the background.',
           );
     },
     sectionLink() {
@@ -94,7 +94,7 @@ export default {
     <h2 class="gl-font-size-h2 gl-my-5">{{ __('Tuning settings') }}</h2>
     <p class="gl-mb-5">
       {{ sectionDescription }}
-      <gl-link :href="sectionLink" target="_blank">{{ __('More information') }}</gl-link>
+      <gl-link :href="sectionLink" target="_blank">{{ __('Learn more') }}</gl-link>
     </p>
     <gl-form-group
       v-for="formGroup in visibleFormGroups"

ee/app/assets/javascripts/geo_node_form/components/geo_node_form_core.vue

@@ -51,7 +51,7 @@ export default {
         <gl-sprintf
           :message="
             __(
-              'Must match with the %{codeStart}geo_node_name%{codeEnd} in %{codeStart}/etc/gitlab/gitlab.rb%{codeEnd}. %{linkStart}More information%{linkEnd}',
+              'Must match with the %{codeStart}geo_node_name%{codeEnd} in %{codeStart}/etc/gitlab/gitlab.rb%{codeEnd}. %{linkStart}Learn more%{linkEnd}',
             )
           "
         >
@@ -138,7 +138,7 @@ export default {
           <gl-sprintf
             :message="
               __(
-                'The URL defined on the primary node that secondary nodes should use to contact it. %{linkStart}More information%{linkEnd}',
+                'The URL defined on the primary node that secondary nodes should use to contact it. %{linkStart}Learn more%{linkEnd}',
               )
             "
           >

ee/app/assets/javascripts/geo_node_form/components/geo_node_form_selective_sync.vue

@@ -54,12 +54,12 @@ export default {
   <div ref="geoNodeFormSelectiveSyncContainer">
     <h2 class="gl-font-size-h2 gl-my-5">{{ __('Synchronization settings') }}</h2>
     <p class="gl-mb-5">
-      {{ __('Set what should be replicated by this secondary node.') }}
+      {{ __('Set what should be replicated by this secondary site.') }}
       <gl-link
         :href="$options.SELECTIVE_SYNC_MORE_INFO"
         target="_blank"
         data-testid="selectiveSyncMoreInfo"
-        >{{ __('More information') }}</gl-link
+        >{{ __('Learn more') }}</gl-link
       >
     </p>
     <gl-form-group
@@ -108,7 +108,7 @@ export default {
         <gl-sprintf
           :message="
             __(
-              'If enabled, GitLab will handle Object Storage replication using Geo. %{linkStart}More information%{linkEnd}',
+              'If enabled, GitLab will handle Object Storage replication using Geo. %{linkStart}Learn more%{linkEnd}',
             )
           "
         >

ee/app/assets/javascripts/geo_nodes/components/details/primary_node/geo_node_verification_info.vue

@@ -10,7 +10,7 @@ export default {
   i18n: {
     verificationInfo: s__('Geo|Verification information'),
     replicationHelpText: s__(
-      'Geo|Replicated data is verified with the secondary node(s) using checksums.',
+      'Geo|Replicated data is verified with the secondary site(s) using checksums.',
     ),
     learnMore: __('Learn more'),
     progressBarTitle: s__('Geo|%{title} checksum progress'),

ee/app/assets/javascripts/geo_nodes/components/details/secondary_node/geo_node_replication_details_responsive.vue

@@ -13,7 +13,7 @@ export default {
     syncStatus: s__('Geo|Synchronization status'),
     verifStatus: s__('Geo|Verification status'),
     popoverHelpText: s__(
-      'Geo|Replicated data is verified with the secondary node(s) using checksums',
+      'Geo|Replicated data is verified with the secondary site(s) using checksums',
     ),
     learnMore: __('Learn more'),
     nA: __('N/A'),

ee/app/assets/javascripts/geo_nodes/components/details/secondary_node/geo_node_replication_status.vue

@@ -6,7 +6,7 @@ import { __, s__ } from '~/locale';
 export default {
   name: 'GeoNodeReplicationStatus',
   i18n: {
-    pauseHelpText: s__('Geo|Geo nodes are paused using a command run on the node'),
+    pauseHelpText: s__('Geo|Geo sites are paused using a command run on the site'),
     learnMore: __('Learn more'),
   },
   components: {

ee/app/assets/javascripts/geo_nodes/components/header/geo_node_last_updated.vue

@@ -12,9 +12,9 @@ export default {
   name: 'GeoNodeLastUpdated',
   i18n: {
     troubleshootText: s__('Geo|Consult Geo troubleshooting information'),
-    learnMoreText: s__('Geo|Learn more about Geo node statuses'),
+    learnMoreText: s__('Geo|Learn more about Geo site statuses'),
     timeAgoMainText: s__('Geo|Updated %{timeAgo}'),
-    timeAgoPopoverText: s__(`Geo|Node's status was updated %{timeAgo}.`),
+    timeAgoPopoverText: s__(`Geo|Site's status was updated %{timeAgo}.`),
   },
   components: {
     GlPopover,

ee/app/assets/javascripts/geo_settings/components/app.vue

@@ -27,7 +27,7 @@ export default {
     <p>
       {{
         __(
-          'Set the timeout in seconds to send a secondary node status to the primary and IPs allowed for the secondary nodes.',
+          'Set the timeout in seconds to send a secondary site status to the primary and IPs allowed for the secondary sites.',
         )
       }}
     </p>

ee/app/helpers/ee/application_helper.rb

@@ -36,7 +36,7 @@ module EE
       html = tag.div do
         tag.p(class: 'gl-mb-3') do
           concat(sprite_icon('information-o', css_class: 'gl-icon gl-mr-3'))
-          concat(s_('Geo|You are on a secondary, %{b_open}read-only%{b_close} Geo node.').html_safe % { b_open: '<b>'.html_safe, b_close: '</b>'.html_safe })
+          concat(s_('Geo|You are on a secondary, %{b_open}read-only%{b_close} Geo site.').html_safe % { b_open: '<b>'.html_safe, b_close: '</b>'.html_safe })
           concat(" #{message}")
         end
       end
@@ -48,13 +48,13 @@ module EE
 
     def lag_message
       if db_lag > DB_LAG_SHOW_THRESHOLD
-        return (s_('Geo|The database is currently %{db_lag} behind the primary node.') %
+        return (s_('Geo|The database is currently %{db_lag} behind the primary site.') %
           { db_lag: time_ago_in_words(db_lag.seconds.ago) }).html_safe
       end
 
       if unprocessed_too_old?
         minutes_behind = time_ago_in_words(next_unprocessed_event.created_at)
-        (s_('Geo|The node is currently %{minutes_behind} behind the primary node.') %
+        (s_('Geo|The site is currently %{minutes_behind} behind the primary site.') %
           { minutes_behind: minutes_behind }).html_safe
       end
     end

ee/app/helpers/ee/nav/top_nav_helper.rb

@@ -44,7 +44,7 @@ module EE
         if ::Gitlab::Geo.secondary? && ::Gitlab::Geo.primary_node_configured?
           builder.add_secondary_menu_item(
             id: 'geo',
-            title: _('Go to primary node'),
+            title: _('Go to primary site'),
             icon: 'location-dot',
             href: ::Gitlab::Geo.primary_node.url
           )

ee/app/views/admin/geo/shared/_replication_nav.haml

@@ -4,7 +4,7 @@
   %h2.page-title
     = _('Geo Replication')
   %p
-    = s_('Geo|Review replication status, and resynchronize and reverify items with the primary node.')
+    = s_('Geo|Review replication status, and resynchronize and reverify items with the primary site.')
 %ul.nav-links.nav.nav-tabs.border-top.border-bottom.border-secondary-100
   = nav_link(path: 'admin/geo/projects#index', html_options: { class: 'gl-pr-2' }) do
     = link_to admin_geo_projects_path, title: _('Projects') do

ee/spec/features/geo_node_spec.rb

@@ -22,13 +22,13 @@ RSpec.describe 'GEO Nodes', :geo do
     describe "showing Flash Info Message" do
       it 'on dashboard' do
         visit root_dashboard_path
-        expect(page).to have_content 'You are on a secondary, read-only Geo node. If you want to make changes, you must visit the primary site.'
+        expect(page).to have_content 'You are on a secondary, read-only Geo site. If you want to make changes, you must visit the primary site.'
         expect(page).to have_content 'Go to the primary site'
       end
 
       it 'on project overview' do
         visit project_path(project)
-        expect(page).to have_content 'You are on a secondary, read-only Geo node. If you want to make changes, you must visit the primary site.'
+        expect(page).to have_content 'You are on a secondary, read-only Geo site. If you want to make changes, you must visit the primary site.'
         expect(page).to have_content 'Go to the primary site'
       end
     end

ee/spec/features/read_only_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe 'Geo read-only message', :geo do
       stub_current_geo_node(secondary)
     end
 
-    it_behaves_like 'Read-only instance', /You are on a secondary, read\-only Geo node\. If you want to make changes, you must visit the primary site.*Go to the primary site/
+    it_behaves_like 'Read-only instance', /You are on a secondary, read\-only Geo site\. If you want to make changes, you must visit the primary site.*Go to the primary site/
   end
 
   context 'when in maintenance mode' do

ee/spec/frontend/geo_node_form/components/geo_node_form_capacities_spec.js

@@ -67,7 +67,7 @@ describe('GeoNodeFormCapacities', () => {
     describe.each`
       primaryNode | description                                                                                   | link
       ${true}     | ${'Set verification limit and frequency.'}                                                    | ${REVERIFICATION_MORE_INFO}
-      ${false}    | ${'Limit the number of concurrent operations this secondary node can run in the background.'} | ${BACKFILL_MORE_INFO}
+      ${false}    | ${'Limit the number of concurrent operations this secondary site can run in the background.'} | ${BACKFILL_MORE_INFO}
     `(`section description`, ({ primaryNode, description, link }) => {
       describe(`when node is ${primaryNode ? 'primary' : 'secondary'}`, () => {
         beforeEach(() => {

ee/spec/frontend/geo_nodes/components/header/geo_node_last_updated_spec.js

@@ -83,7 +83,7 @@ describe('GeoNodeLastUpdated', () => {
     it('when sync is not stale popover link renders correctly', () => {
       createComponent({ statusCheckTimestamp: nonStaleStatusTime });
 
-      expect(findPopoverLink().text()).toBe('Learn more about Geo node statuses');
+      expect(findPopoverLink().text()).toBe('Learn more about Geo site statuses');
       expect(findPopoverLink().attributes('href')).toBe(HELP_NODE_HEALTH_URL);
     });
   });

ee/spec/helpers/application_helper_spec.rb

@@ -96,7 +96,7 @@ RSpec.describe ApplicationHelper do
         allow_any_instance_of(::Gitlab::Geo::HealthCheck).to receive(:db_replication_lag_seconds).and_return(120)
 
         expect(helper.read_only_message).to match(/If you want to make changes, you must visit the primary site./)
-        expect(helper.read_only_message).to match(/The database is currently 2 minutes behind the primary node/)
+        expect(helper.read_only_message).to match(/The database is currently 2 minutes behind the primary site/)
         expect(helper.read_only_message).to include(geo_primary.url)
       end
 
@@ -107,7 +107,7 @@ RSpec.describe ApplicationHelper do
           create(:geo_event_log_state, event_id: event_log.id)
 
           expect(helper.read_only_message).to match(/If you want to make changes, you must visit the primary site./)
-          expect(helper.read_only_message).to match(/The node is currently 3 minutes behind the primary/)
+          expect(helper.read_only_message).to match(/The site is currently 3 minutes behind the primary/)
           expect(helper.read_only_message).to include(geo_primary.url)
         end
 
@@ -117,7 +117,7 @@ RSpec.describe ApplicationHelper do
           create(:geo_event_log_state, event_id: event_log.id)
 
           expect(helper.read_only_message).to match(/If you want to make changes, you must visit the primary site./)
-          expect(helper.read_only_message).not_to match(/The node is currently 3 minutes behind the primary/)
+          expect(helper.read_only_message).not_to match(/The site is currently 3 minutes behind the primary/)
           expect(helper.read_only_message).to include(geo_primary.url)
         end
 
@@ -126,7 +126,7 @@ RSpec.describe ApplicationHelper do
           create(:geo_event_log_state, event_id: event_log.id)
 
           expect(helper.read_only_message).to match(/If you want to make changes, you must visit the primary site./)
-          expect(helper.read_only_message).not_to match(/The node is currently 3 minutes behind the primary/)
+          expect(helper.read_only_message).not_to match(/The site is currently 3 minutes behind the primary/)
           expect(helper.read_only_message).to include(geo_primary.url)
         end
 

ee/spec/helpers/nav/top_nav_helper_spec.rb

@@ -97,7 +97,7 @@ RSpec.describe Nav::TopNavHelper do
           href: url,
           icon: 'location-dot',
           id: 'geo',
-          title: 'Go to primary node'
+          title: 'Go to primary site'
         )
         expect(subject[:secondary]).to eq([expected_secondary])
       end

locale/gitlab.pot

@@ -14867,10 +14867,10 @@ msgstr ""
 msgid "Geo|Geo Status"
 msgstr ""
 
-msgid "Geo|Geo nodes are paused using a command run on the node"
+msgid "Geo|Geo sites"
 msgstr ""
 
-msgid "Geo|Geo sites"
+msgid "Geo|Geo sites are paused using a command run on the site"
 msgstr ""
 
 msgid "Geo|Geo supports replication of many data types."
@@ -14915,7 +14915,7 @@ msgstr ""
 msgid "Geo|Learn more about Geo"
 msgstr ""
 
-msgid "Geo|Learn more about Geo node statuses"
+msgid "Geo|Learn more about Geo site statuses"
 msgstr ""
 
 msgid "Geo|Make everyone on your team more productive regardless of their location. GitLab Geo creates read-only mirrors of your GitLab instance so you can reduce the time it takes to clone and fetch large repos."
@@ -14936,9 +14936,6 @@ msgstr ""
 msgid "Geo|Node name should be between 1 and 255 characters"
 msgstr ""
 
-msgid "Geo|Node's status was updated %{timeAgo}."
-msgstr ""
-
 msgid "Geo|Not synced yet"
 msgstr ""
 
@@ -14999,10 +14996,10 @@ msgstr ""
 msgid "Geo|Removing a Geo node stops the synchronization to and from that node. Are you sure?"
 msgstr ""
 
-msgid "Geo|Replicated data is verified with the secondary node(s) using checksums"
+msgid "Geo|Replicated data is verified with the secondary site(s) using checksums"
 msgstr ""
 
-msgid "Geo|Replicated data is verified with the secondary node(s) using checksums."
+msgid "Geo|Replicated data is verified with the secondary site(s) using checksums."
 msgstr ""
 
 msgid "Geo|Replication Details"
@@ -15047,7 +15044,7 @@ msgstr ""
 msgid "Geo|Reverify all projects"
 msgstr ""
 
-msgid "Geo|Review replication status, and resynchronize and reverify items with the primary node."
+msgid "Geo|Review replication status, and resynchronize and reverify items with the primary site."
 msgstr ""
 
 msgid "Geo|Secondary node"
@@ -15059,6 +15056,9 @@ msgstr ""
 msgid "Geo|Selective (%{syncLabel})"
 msgstr ""
 
+msgid "Geo|Site's status was updated %{timeAgo}."
+msgstr ""
+
 msgid "Geo|Status"
 msgstr ""
 
@@ -15083,10 +15083,10 @@ msgstr ""
 msgid "Geo|Synchronization status"
 msgstr ""
 
-msgid "Geo|The database is currently %{db_lag} behind the primary node."
+msgid "Geo|The database is currently %{db_lag} behind the primary site."
 msgstr ""
 
-msgid "Geo|The node is currently %{minutes_behind} behind the primary node."
+msgid "Geo|The site is currently %{minutes_behind} behind the primary site."
 msgstr ""
 
 msgid "Geo|There are no %{replicable_type} to show"
@@ -15158,7 +15158,7 @@ msgstr ""
 msgid "Geo|With GitLab Geo, you can install a special read-only and replicated instance anywhere. %{linkStart}Learn more%{linkEnd}"
 msgstr ""
 
-msgid "Geo|You are on a secondary, %{b_open}read-only%{b_close} Geo node."
+msgid "Geo|You are on a secondary, %{b_open}read-only%{b_close} Geo site."
 msgstr ""
 
 msgid "Geo|You may be able to make a limited amount of changes or perform a limited amount of actions on this page."
@@ -15590,7 +15590,7 @@ msgstr ""
 msgid "Go to previous page"
 msgstr ""
 
-msgid "Go to primary node"
+msgid "Go to primary site"
 msgstr ""
 
 msgid "Go to project"
@@ -16797,7 +16797,7 @@ msgstr ""
 msgid "If disabled, only administrators can configure repository mirroring."
 msgstr ""
 
-msgid "If enabled, GitLab will handle Object Storage replication using Geo. %{linkStart}More information%{linkEnd}"
+msgid "If enabled, GitLab will handle Object Storage replication using Geo. %{linkStart}Learn more%{linkEnd}"
 msgstr ""
 
 msgid "If enabled, access to projects will be validated on an external service using their classification label."
@@ -20089,7 +20089,7 @@ msgstr ""
 msgid "Limit sign in from multiple ips"
 msgstr ""
 
-msgid "Limit the number of concurrent operations this secondary node can run in the background."
+msgid "Limit the number of concurrent operations this secondary site can run in the background."
 msgstr ""
 
 msgid "Limit the number of inbound incident management alerts that can be sent to a project."
@@ -21979,7 +21979,7 @@ msgstr ""
 msgid "Must match with the %{codeStart}external_url%{codeEnd} in %{codeStart}/etc/gitlab/gitlab.rb%{codeEnd}."
 msgstr ""
 
-msgid "Must match with the %{codeStart}geo_node_name%{codeEnd} in %{codeStart}/etc/gitlab/gitlab.rb%{codeEnd}. %{linkStart}More information%{linkEnd}"
+msgid "Must match with the %{codeStart}geo_node_name%{codeEnd} in %{codeStart}/etc/gitlab/gitlab.rb%{codeEnd}. %{linkStart}Learn more%{linkEnd}"
 msgstr ""
 
 msgid "My Awesome Group"
@@ -30582,7 +30582,7 @@ msgstr ""
 msgid "Set the milestone to %{milestone_reference}."
 msgstr ""
 
-msgid "Set the timeout in seconds to send a secondary node status to the primary and IPs allowed for the secondary nodes."
+msgid "Set the timeout in seconds to send a secondary site status to the primary and IPs allowed for the secondary sites."
 msgstr ""
 
 msgid "Set time estimate"
@@ -30630,7 +30630,7 @@ msgstr ""
 msgid "Set weight to %{weight}."
 msgstr ""
 
-msgid "Set what should be replicated by this secondary node."
+msgid "Set what should be replicated by this secondary site."
 msgstr ""
 
 msgid "SetPasswordToCloneLink|set a password"
@@ -33191,7 +33191,7 @@ msgstr ""
 msgid "The URL defined on the primary node that secondary nodes should use to contact it."
 msgstr ""
 
-msgid "The URL defined on the primary node that secondary nodes should use to contact it. %{linkStart}More information%{linkEnd}"
+msgid "The URL defined on the primary node that secondary nodes should use to contact it. %{linkStart}Learn more%{linkEnd}"
 msgstr ""
 
 msgid "The URL of the Jenkins server."

qa/qa/ee/page/main/banner.rb

@@ -6,11 +6,11 @@ module QA
       module Main
         class Banner < QA::Page::Base
           view 'ee/app/helpers/ee/application_helper.rb' do
-            element :read_only_message, 'You are on a secondary, %{b_open}read-only%{b_close} Geo node.' # rubocop:disable QA/ElementWithPattern
+            element :read_only_message, 'You are on a secondary, %{b_open}read-only%{b_close} Geo site.' # rubocop:disable QA/ElementWithPattern
           end
 
           def has_secondary_read_only_banner?
-            page.has_text?('You are on a secondary, read-only Geo node.')
+            page.has_text?('You are on a secondary, read-only Geo site.')
           end
         end
       end