From 6fca0b30c06a8f58cc0c1f880afb00c52a2dbb97 Mon Sep 17 00:00:00 2001
From: Mathieu Suen <mathieu.suen@sonarsource.com>
Date: Tue, 3 Oct 2023 10:42:55 +0200
Subject: [PATCH] SONAR-20527 Fix environment step in gitlab tutorial

---
 .../tutorials/gitlabci/EnvironmentVariablesStep.tsx  | 12 +-----------
 .../main/resources/org/sonar/l10n/core.properties    |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx b/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx
index a21adb9259f..ad60086f9cd 100644
--- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx
@@ -68,17 +68,12 @@ export default function EnvironmentVariablesStep(props: EnvironmentVariablesStep
         <UnorderedList ticks className="sw-ml-10">
           <ListItem>
             <FormattedMessage
-              defaultMessage={fieldValueTranslation}
               id="onboarding.tutorial.with.gitlab_ci.variables.step1"
               values={{
                 extra: (
                   <ClipboardIconButton copyValue="SONAR_TOKEN" className="sw-ml-1 sw-align-sub" />
                 ),
-                field: (
-                  <span className="sw-body-sm-highlight">
-                    {translate('onboarding.tutorial.with.gitlab_ci.variables.step1')}
-                  </span>
-                ),
+
                 value: <InlineSnippet snippet="SONAR_TOKEN" />,
               }}
             />
@@ -143,11 +138,6 @@ export default function EnvironmentVariablesStep(props: EnvironmentVariablesStep
                     className="sw-ml-1 sw-align-sub"
                   />
                 ),
-                field: (
-                  <span className="sw-body-sm-highlight">
-                    {translate('onboarding.tutorial.with.gitlab_ci.variables.step1')}
-                  </span>
-                ),
                 value: <InlineSnippet snippet="SONAR_HOST_URL" />,
               }}
             />
diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index cc85b2a30a4..168e14a5dbd 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -4329,7 +4329,7 @@ onboarding.tutorial.with.gitlab_ci.variables.description.link=Settings > CI/CD >
 onboarding.tutorial.with.gitlab_ci.variables.section.title=Define the SonarQube Token environment variable.
 onboarding.tutorial.with.gitlab_ci.variables.section.description=In GitLab, go to {link} to add the following variable and make sure it is available for your project:
 onboarding.tutorial.with.gitlab_ci.variables.edit.token.tooltip=Use an existing token or generate a new one.
-onboarding.tutorial.with.gitlab_ci.variables.step1=Key
+onboarding.tutorial.with.gitlab_ci.variables.step1=Key {value} {extra}
 
 onboarding.tutorial.with.gitlab_ci.variables.step3=Uncheck the {value} checkbox.
 onboarding.tutorial.with.gitlab_ci.variables.step3.value=Protect Variable
-- 
2.39.5