Commit 3e0cc178 authored by Justin Ho's avatar Justin Ho

Update placeholder copy for integrations

- Update copy for slash commands integrations.
- Move fallback to placeholder from model to HAML
view in case other places use the method.
parent 28cfdd33
......@@ -15,9 +15,7 @@ class AlertsService < Service
before_validation :ensure_token, if: :activated?
def url
if instance? || template?
return '<namespace / project>'
end
return if instance? || template?
url_helpers.project_alerts_notify_url(project, format: :json)
end
......
.js-alerts-service-settings{ data: { activated: @service.activated?.to_s,
form_path: scoped_integration_path(@service),
authorization_key: @service.token, url: @service.url, learn_more_url: 'https://docs.gitlab.com/ee/user/project/integrations/generic_alerts.html' } }
authorization_key: @service.token, url: @service.url || _('<namespace / project>'), learn_more_url: 'https://docs.gitlab.com/ee/user/project/integrations/generic_alerts.html' } }
- pretty_name = @project&.full_name || _('<project name / alias>')
- pretty_name = @project&.full_name || _('<project name>')
- run_actions_text = s_("ProjectService|Perform common operations on GitLab project: %{project_name}") % { project_name: pretty_name }
%p= s_("ProjectService|To set up this service:")
......
- pretty_name = @project&.full_name || _('<project name / alias>')
- pretty_name = @project&.full_name || _('<project name>')
- run_actions_text = s_("ProjectService|Perform common operations on GitLab project: %{project_name}") % { project_name: pretty_name }
.info-well
......
......@@ -778,13 +778,16 @@ msgstr ""
msgid "<code>\"johnsmith@example.com\": \"johnsmith@example.com\"</code> will add \"By <a href=\"#\">johnsmith@example.com</a>\" to all issues and comments originally created by johnsmith@example.com. By default, the email address or username is masked to ensure the user's privacy. Use this option if you want to show the full email address."
msgstr ""
msgid "<namespace / project>"
msgstr ""
msgid "<no name set>"
msgstr ""
msgid "<no scopes selected>"
msgstr ""
msgid "<project name / alias>"
msgid "<project name>"
msgstr ""
msgid "<strong>%{group_name}</strong> group members"
......
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