Merge branch 'mk/clarify-internal-url-form-field-geo' into 'master'

Clarify Internal URL form field

See merge request gitlab-org/gitlab-ee!14957

ee/app/views/admin/geo/nodes/_form.html.haml

@@ -8,12 +8,12 @@
   .form-group.col-sm-6
     = form.label :url, s_('Geo|URL'), class: 'font-weight-bold'
     = form.text_field :url, class: 'form-control qa-node-url-field'
-    .form-text.text-muted= _('The user-facing URL of the Geo node.')
+    .form-text.text-muted= _('The user-facing URL of the Geo node')
 
   .form-group.col-sm-6.js-internal-url{ class: ('hidden' unless geo_node.primary?) }
-    = form.label :internal_url, s_('Geo|Internal URL'), class: 'font-weight-bold'
+    = form.label :internal_url, s_('Geo|Internal URL (optional)'), class: 'font-weight-bold'
     = form.text_field :internal_url, class: 'form-control'
-    .form-text.text-muted= s_('Geo|The URL defined on the primary node that secondary nodes should use to contact it. Returns `url` if not set')
+    .form-text.text-muted= s_('Geo|The URL defined on the primary node that secondary nodes should use to contact it. Defaults to URL')
 
 
 .form-group.row

ee/changelogs/unreleased/mk-clarify-internal-url-form-field-geo.yml

+---
+title: Tweak Geo node form text
+merge_request: 14957
+author:
+type: added

locale/gitlab.pot

@@ -6701,7 +6701,7 @@ msgstr ""
 msgid "Geo|In sync"
 msgstr ""
 
-msgid "Geo|Internal URL"
+msgid "Geo|Internal URL (optional)"
 msgstr ""
 
 msgid "Geo|Last repository check run"
@@ -6800,7 +6800,7 @@ msgstr ""
 msgid "Geo|Synchronization failed - %{error}"
 msgstr ""
 
-msgid "Geo|The URL defined on the primary node that secondary nodes should use to contact it. Returns `url` if not set"
+msgid "Geo|The URL defined on the primary node that secondary nodes should use to contact it. Defaults to URL"
 msgstr ""
 
 msgid "Geo|The database is currently %{db_lag} behind the primary node."
@@ -14507,7 +14507,7 @@ msgstr ""
 msgid "The user map is a mapping of the FogBugz users that participated on your projects to the way their email address and usernames will be imported into GitLab. You can change this by populating the table below."
 msgstr ""
 
-msgid "The user-facing URL of the Geo node."
+msgid "The user-facing URL of the Geo node"
 msgstr ""
 
 msgid "The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6."