Merge branch 'selhorn-okr-triggers' into 'master'

Edited UI text

See merge request gitlab-org/gitlab!52284

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

@@ -2,7 +2,7 @@
   .col-lg-12
     .card
       .card-header
-        Manage your project's triggers
+        = s_("Manage your project's triggers")
       .card-body
         = render "projects/triggers/form", btn_text: "Add trigger"
         %hr
@@ -14,39 +14,33 @@
               %table.table
                 %thead
                   %th
-                    %strong Token
+                    %strong
+                    = s_("Token")
                   %th
-                    %strong Description
+                    %strong
+                    = s_("Description")
                   %th
-                    %strong Owner
+                    %strong
+                    = s_("Owner")
                   %th
-                    %strong Last used
+                    %strong
+                    = s_("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' } }
-              No triggers have been created yet. Add one using the form above.
+              = s_("No triggers exist yet. Use the form above to create one.")
 
       .card-footer
 
         %p
-          In the following examples, you can see the exact API call you need to
-          make in order to rebuild a specific
-          %code ref
-          (branch or tag) with a trigger token.
-        %p
-          All you need to do is replace the
-          %code TOKEN
-          and
-          %code REF_NAME
-          with the trigger token and the branch or tag name respectively.
-
-        %h5.gl-mt-3
-          Use cURL
+          = s_("These examples show how to trigger this project's pipeline for a branch or tag.")
 
         %p.light
-          Copy one of the tokens above, set your branch or tag name, and that
-          reference will be rebuilt.
+          = 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 }
+
+        %h5.gl-mt-3
+          = s_("Use cURL")
 
         %pre
           :plain
@@ -55,39 +49,26 @@
                  -F ref=REF_NAME \
                  #{builds_trigger_url(@project.id)}
         %h5.gl-mt-3
-          Use .gitlab-ci.yml
-
-        %p.light
-          In the
-          %code .gitlab-ci.yml
-          of another project, include the following snippet.
-          The project will be rebuilt at the end of the pipeline.
+          = s_("Use .gitlab-ci.yml")
 
         %pre
           :plain
-            trigger_build:
-              stage: deploy
-              script:
-                - "curl -X POST -F token=TOKEN -F ref=REF_NAME #{builds_trigger_url(@project.id)}"
+            script:
+              - "curl -X POST -F token=TOKEN -F ref=REF_NAME #{builds_trigger_url(@project.id)}"
         %h5.gl-mt-3
-          Use webhook
-
-        %p.light
-          Add the following webhook to another project for Push and Tag push events.
-          The project will be rebuilt at the corresponding event.
+          = s_("Use webhook")
 
         %pre
           :plain
-             #{builds_trigger_url(@project.id, ref: 'REF_NAME')}?token=TOKEN
+            #{builds_trigger_url(@project.id, ref: 'REF_NAME')}?token=TOKEN
         %h5.gl-mt-3
-          Pass job variables
+          = s_("Pass job variables")
 
         %p.light
-          Add
-          %code variables[VARIABLE]=VALUE
-          to an API request. Variable values can be used to distinguish between triggered pipelines and normal pipelines.
+          = 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 }
 
-          With cURL:
+        %p.light
+          = s_("cURL:")
 
         %pre
           :plain
@@ -97,8 +78,8 @@
                  -F "variables[RUN_NIGHTLY_BUILD]=true" \
                  #{builds_trigger_url(@project.id)}
         %p.light
-          With webhook:
+          = s_("Webhook:")
 
         %pre.gl-mb-0
           :plain
-             #{builds_trigger_url(@project.id, ref: 'REF_NAME')}?token=TOKEN&variables[RUN_NIGHTLY_BUILD]=true
+            #{builds_trigger_url(@project.id, ref: 'REF_NAME')}?token=TOKEN&variables[RUN_NIGHTLY_BUILD]=true

changelogs/unreleased/selhorn-okr-triggers.yml

+---
+title: Updated UI text to match style guidelines
+merge_request: 52284
+author:
+type: other

locale/gitlab.pot

@@ -17292,6 +17292,9 @@ msgstr ""
 msgid "Manage your license"
 msgstr ""
 
+msgid "Manage your project's triggers"
+msgstr ""
+
 msgid "Managed Account"
 msgstr ""
 
@@ -19519,6 +19522,9 @@ msgstr ""
 msgid "No test coverage"
 msgstr ""
 
+msgid "No triggers exist yet. Use the form above to create one."
+msgstr ""
+
 msgid "No vulnerabilities present"
 msgstr ""
 
@@ -20667,6 +20673,9 @@ msgstr ""
 msgid "Participants"
 msgstr ""
 
+msgid "Pass job variables"
+msgstr ""
+
 msgid "Passed"
 msgstr ""
 
@@ -28874,6 +28883,9 @@ msgstr ""
 msgid "There was an error with the reCAPTCHA. Please solve the reCAPTCHA again."
 msgstr ""
 
+msgid "These examples show how to trigger this project's pipeline for a branch or tag."
+msgstr ""
+
 msgid "These existing issues have a similar title. It might be better to comment there instead of creating another similar issue."
 msgstr ""
 
@@ -30003,6 +30015,9 @@ msgstr ""
 msgid "Toggles :%{name}: emoji award."
 msgstr ""
 
+msgid "Token"
+msgstr ""
+
 msgid "Token valid until revoked"
 msgstr ""
 
@@ -30251,6 +30266,12 @@ 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 ""
 
@@ -30944,12 +30965,18 @@ msgstr ""
 msgid "Use %{code_start}::%{code_end} to create a %{link_start}scoped label set%{link_end} (eg. %{code_start}priority::1%{code_end})"
 msgstr ""
 
+msgid "Use .gitlab-ci.yml"
+msgstr ""
+
 msgid "Use Service Desk to connect with your users (e.g. to offer customer support) through email right inside GitLab"
 msgstr ""
 
 msgid "Use an one time password authenticator on your mobile device or computer to enable two-factor authentication (2FA)."
 msgstr ""
 
+msgid "Use cURL"
+msgstr ""
+
 msgid "Use custom color #FF0000"
 msgstr ""
 
@@ -30968,6 +30995,9 @@ msgstr ""
 msgid "Use this token to validate received payloads"
 msgstr ""
 
+msgid "Use webhook"
+msgstr ""
+
 msgid "Use your global notification setting"
 msgstr ""
 
@@ -31908,6 +31938,9 @@ msgstr ""
 msgid "Webhook Settings"
 msgstr ""
 
+msgid "Webhook:"
+msgstr ""
+
 msgid "Webhooks"
 msgstr ""
 
@@ -33313,6 +33346,9 @@ msgstr ""
 msgid "by"
 msgstr ""
 
+msgid "cURL:"
+msgstr ""
+
 msgid "can contain only letters of the Base64 alphabet (RFC4648) with the addition of '@', ':' and '.'"
 msgstr ""