Commit 0412fd0d authored by Sunjung Park's avatar Sunjung Park

Replace node in ruby files

parent ac251095
......@@ -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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment