Commit 18bf6237 authored by Illya Klymov's avatar Illya Klymov

Merge branch '300621-kpaizee-revise-slack-ui-text' into 'master'

Revise UI text for Slack slash commands

See merge request gitlab-org/gitlab!69107
parents 5867247f e3ac61a9
......@@ -9,7 +9,7 @@ module Integrations
end
def description
"Perform common operations in Slack"
"Perform common operations in Slack."
end
def self.to_param
......
......@@ -4,22 +4,21 @@
.info-well
.well-segment
%p
= s_("SlackService|This service allows users to perform common operations on this project by entering slash commands in Slack.")
= s_("SlackService|Perform common operations in this project by entering slash commands in Slack.")
= link_to help_page_path('user/project/integrations/slack_slash_commands.md'), target: '_blank' do
= _("View documentation")
= _("Learn more.")
= sprite_icon('external-link')
%p.inline
= s_("SlackService|See list of available commands in Slack after setting up this service, by entering")
%kbd.inline /<command> help
= s_("SlackService|After setup, get a list of available Slack slash commands by entering")
%kbd.inline /<command> help
- if integration.project_level?
%p= _("To set up this service:")
%p= _("To set up this integration:")
%ul.list-unstyled.indent-list
%li
1.
= link_to 'https://my.slack.com/services/new/slash-commands', target: '_blank', rel: 'noreferrer noopener nofollow' do
Add a slash command
= sprite_icon('external-link')
in your Slack team with these options:
- slash_command_link_url = 'https://my.slack.com/services/new/slash-commands'
- slash_command_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: slash_command_link_url }
- slash_command_link_end = ' %{external_link_icon}</a>'.html_safe % { external_link_icon: sprite_icon('external-link') }
= html_escape(s_('SlackService|1. %{slash_command_link_start}Add a slash command%{slash_command_link_end} in your Slack team using this information:')) % { slash_command_link_start: slash_command_link_start, slash_command_link_end: slash_command_link_end }
%hr
......@@ -89,6 +88,6 @@
%ul.list-unstyled.indent-list
%li
= html_escape(s_("SlackService|2. Paste the %{strong_open}Token%{strong_close} into the field below")) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
= html_escape(s_("SlackService|2. Paste the token from Slack in the %{strong_open}Token%{strong_close} field below.")) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
%li
= html_escape(s_("SlackService|3. Select the %{strong_open}Active%{strong_close} checkbox, press %{strong_open}Save changes%{strong_close} and start using GitLab inside Slack!")) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
= html_escape(s_("SlackService|3. Select the %{strong_open}Active%{strong_close} checkbox, select %{strong_open}Save changes%{strong_close}, and start using slash commands in Slack!")) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
......@@ -31158,19 +31158,22 @@ msgstr ""
msgid "SlackIntegration|Sends notifications about project events to Slack channels."
msgstr ""
msgid "SlackService|2. Paste the %{strong_open}Token%{strong_close} into the field below"
msgid "SlackService|1. %{slash_command_link_start}Add a slash command%{slash_command_link_end} in your Slack team using this information:"
msgstr ""
msgid "SlackService|3. Select the %{strong_open}Active%{strong_close} checkbox, press %{strong_open}Save changes%{strong_close} and start using GitLab inside Slack!"
msgid "SlackService|2. Paste the token from Slack in the %{strong_open}Token%{strong_close} field below."
msgstr ""
msgid "SlackService|Fill in the word that works best for your team."
msgid "SlackService|3. Select the %{strong_open}Active%{strong_close} checkbox, select %{strong_open}Save changes%{strong_close}, and start using slash commands in Slack!"
msgstr ""
msgid "SlackService|After setup, get a list of available Slack slash commands by entering"
msgstr ""
msgid "SlackService|See list of available commands in Slack after setting up this service, by entering"
msgid "SlackService|Fill in the word that works best for your team."
msgstr ""
msgid "SlackService|This service allows users to perform common operations on this project by entering slash commands in Slack."
msgid "SlackService|Perform common operations in this project by entering slash commands in Slack."
msgstr ""
msgid "Slice multiplier"
......@@ -35140,7 +35143,7 @@ msgstr ""
msgid "To set up SAML authentication for your group through an identity provider like Azure, Okta, Onelogin, Ping Identity, or your custom SAML 2.0 provider:"
msgstr ""
msgid "To set up this service:"
msgid "To set up this integration:"
msgstr ""
msgid "To specify the notification level per project of a group you belong to, you need to visit project page and change notification level there."
......
......@@ -16,7 +16,7 @@ RSpec.describe 'Slack slash commands', :js do
end
it 'shows a help message' do
expect(page).to have_content('This service allows users to perform common')
expect(page).to have_content('Perform common operations in this project')
end
it 'redirects to the integrations page after saving but not activating' do
......@@ -42,6 +42,6 @@ RSpec.describe 'Slack slash commands', :js do
end
it 'shows help content' do
expect(page).to have_content('This service allows users to perform common operations on this project by entering slash commands in Slack.')
expect(page).to have_content('Perform common operations in this project by entering slash commands in Slack.')
end
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