Commit 581a71f5 authored by Katrin Leinweber's avatar Katrin Leinweber

Apply Slack's UI guide to channel placeholders

See https://slack.com/intl/en-de/help/articles/360017938993

Changelog: changed
parent 2b6812fd
...@@ -10,7 +10,7 @@ const typeWithPlaceholder = { ...@@ -10,7 +10,7 @@ const typeWithPlaceholder = {
}; };
const placeholderForType = { const placeholderForType = {
[typeWithPlaceholder.SLACK]: __('general, development'), [typeWithPlaceholder.SLACK]: __('#general, #development'),
[typeWithPlaceholder.MATTERMOST]: __('my-channel'), [typeWithPlaceholder.MATTERMOST]: __('my-channel'),
}; };
......
...@@ -25,7 +25,7 @@ module Integrations ...@@ -25,7 +25,7 @@ module Integrations
end end
def default_channel_placeholder def default_channel_placeholder
_('general, development') _('#general, #development')
end end
def webhook_placeholder def webhook_placeholder
......
...@@ -89,6 +89,9 @@ msgstr "" ...@@ -89,6 +89,9 @@ msgstr ""
msgid "\"el\" parameter is required for createInstance()" msgid "\"el\" parameter is required for createInstance()"
msgstr "" msgstr ""
msgid "#general, #development"
msgstr ""
msgid "%d Approval" msgid "%d Approval"
msgid_plural "%d Approvals" msgid_plural "%d Approvals"
msgstr[0] "" msgstr[0] ""
...@@ -38687,9 +38690,6 @@ msgid_plural "from %d jobs" ...@@ -38687,9 +38690,6 @@ msgid_plural "from %d jobs"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
msgid "general, development"
msgstr ""
msgid "group" msgid "group"
msgstr "" msgstr ""
......
...@@ -137,11 +137,11 @@ describe('TriggerFields', () => { ...@@ -137,11 +137,11 @@ describe('TriggerFields', () => {
const expectedResults = [ const expectedResults = [
{ {
name: 'service[push_channel]', name: 'service[push_channel]',
placeholder: 'general, development', placeholder: '#general, #development',
}, },
{ {
name: 'service[merge_request_channel]', name: 'service[merge_request_channel]',
placeholder: 'general, development', placeholder: '#general, #development',
}, },
]; ];
......
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