Merge branch 'jonstonchan-fix-triggers-externalization' into 'master'

i18n for triggers

See merge request gitlab-org/gitlab!57637

app/views/projects/triggers/_index.html.haml

@@ -2,9 +2,9 @@
   .col-lg-12
     .card
       .card-header
-        = s_("Manage your project's triggers")
+        = _("Manage your project's triggers")
       .card-body
-        = render "projects/triggers/form", btn_text: "Add trigger"
+        = render 'projects/triggers/form', btn_text: _('Add trigger')
         %hr
         - if Feature.enabled?(:ci_pipeline_triggers_settings_vue_ui, @project)
           #js-ci-pipeline-triggers-list.triggers-list{ data: { triggers: @triggers_json } }
@@ -15,32 +15,32 @@
                 %thead
                   %th
                     %strong
-                    = s_("Token")
+                    = _('Token')
                   %th
                     %strong
-                    = s_("Description")
+                    = _('Description')
                   %th
                     %strong
-                    = s_("Owner")
+                    = _('Owner')
                   %th
                     %strong
-                    = s_("Last used")
+                    = _('Last used')
                   %th
                 = render partial: 'projects/triggers/trigger', collection: @triggers, as: :trigger
           - else
             %p.settings-message.text-center.gl-mb-3{ data: { testid: 'no_triggers_content' } }
-              = s_("No triggers exist yet. Use the form above to create one.")
+              = _('No triggers exist yet. Use the form above to create one.')
 
       .card-footer
 
         %p
-          = s_("These examples show how to trigger this project's pipeline for a branch or tag.")
+          = _("These examples show how to trigger this project's pipeline for a branch or tag.")
 
         %p.light
-          = s_("Triggers|In each example, replace %{code_start}TOKEN%{code_end} with the trigger token you generated and replace %{code_start}REF_NAME%{code_end} with the branch or tag name.").html_safe % { code_start: "<code>".html_safe, code_end: "</code>".html_safe }
+          = _('In each example, replace %{code_start}TOKEN%{code_end} with the trigger token you generated and replace %{code_start}REF_NAME%{code_end} with the branch or tag name.').html_safe % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe }
 
         %h5.gl-mt-3
-          = s_("Use cURL")
+          = _('Use cURL')
 
         %pre
           :plain
@@ -49,26 +49,26 @@
                  -F ref=REF_NAME \
                  #{builds_trigger_url(@project.id)}
         %h5.gl-mt-3
-          = s_("Use .gitlab-ci.yml")
+          = _('Use .gitlab-ci.yml')
 
         %pre
           :plain
             script:
               - "curl -X POST -F token=TOKEN -F ref=REF_NAME #{builds_trigger_url(@project.id)}"
         %h5.gl-mt-3
-          = s_("Use webhook")
+          = _('Use webhook')
 
         %pre
           :plain
             #{builds_trigger_url(@project.id, ref: 'REF_NAME')}?token=TOKEN
         %h5.gl-mt-3
-          = s_("Pass job variables")
+          = _('Pass job variables')
 
         %p.light
-          = s_("Triggers|To pass variables to the triggered pipeline, add %{code_start}variables[VARIABLE]=VALUE%{code_end} to the API request.").html_safe % { code_start: "<code>".html_safe, code_end: "</code>".html_safe }
+          = _('To pass variables to the triggered pipeline, add %{code_start}variables[VARIABLE]=VALUE%{code_end} to the API request.').html_safe % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe }
 
         %p.light
-          = s_("cURL:")
+          = _('cURL:')
 
         %pre
           :plain
@@ -78,7 +78,7 @@
                  -F "variables[RUN_NIGHTLY_BUILD]=true" \
                  #{builds_trigger_url(@project.id)}
         %p.light
-          = s_("Webhook:")
+          = _('Webhook:')
 
         %pre.gl-mb-0
           :plain

changelogs/unreleased/jonstonchan-fix-triggers-externalization.yml

+---
+title: Fix triggers page externalization
+merge_request: 57637
+author: Jonston Chan @JonstonChan
+type: other

locale/gitlab.pot

@@ -2019,6 +2019,9 @@ msgstr ""
 msgid "Add to tree"
 msgstr ""
 
+msgid "Add trigger"
+msgstr ""
+
 msgid "Add user(s) to the group:"
 msgstr ""
 
@@ -16155,6 +16158,9 @@ msgstr ""
 msgid "In case of pull mirroring, your user will be the author of all events in the activity feed that are the result of an update, like new branches being created or new commits being pushed to existing branches."
 msgstr ""
 
+msgid "In each example, replace %{code_start}TOKEN%{code_end} with the trigger token you generated and replace %{code_start}REF_NAME%{code_end} with the branch or tag name."
+msgstr ""
+
 msgid "In progress"
 msgstr ""
 
@@ -32384,6 +32390,9 @@ msgstr ""
 msgid "To open Jaeger from GitLab to view tracing from the %{link} page, add a URL to your Jaeger server."
 msgstr ""
 
+msgid "To pass variables to the triggered pipeline, add %{code_start}variables[VARIABLE]=VALUE%{code_end} to the API request."
+msgstr ""
+
 msgid "To personalize your GitLab experience, we'd like to know a bit more about you. We won't share this information with anyone."
 msgstr ""
 
@@ -32770,12 +32779,6 @@ msgstr ""
 msgid "Triggerer"
 msgstr ""
 
-msgid "Triggers|In each example, replace %{code_start}TOKEN%{code_end} with the trigger token you generated and replace %{code_start}REF_NAME%{code_end} with the branch or tag name."
-msgstr ""
-
-msgid "Triggers|To pass variables to the triggered pipeline, add %{code_start}variables[VARIABLE]=VALUE%{code_end} to the API request."
-msgstr ""
-
 msgid "Troubleshoot and monitor your application with tracing"
 msgstr ""