diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-01-23 13:07:38 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-01-23 13:07:38 +0000 |
| commit | c243b154abf5c29ba35fd2fab2ca3bc010fdc324 (patch) | |
| tree | 1063f2b9cc6849229d007d8ca6b9477e0a721667 | |
| parent | e8f73aaee6d93b7fc289e08c238886c6a4992826 (diff) | |
| parent | 17e43bfb11f7daa5fc0d0a81758f6cff76c43ee2 (diff) | |
| download | gitlab-ce-c243b154abf5c29ba35fd2fab2ca3bc010fdc324.tar.gz | |
Merge branch 'gt-externalize-app-views-sent_notifications' into 'master'
Externalize strings from `/app/views/sent_notifications`
See merge request gitlab-org/gitlab-ce!24576
| -rw-r--r-- | app/views/sent_notifications/unsubscribe.html.haml | 13 | ||||
| -rw-r--r-- | changelogs/unreleased/gt-externalize-app-views-sent_notifications.yml | 5 | ||||
| -rw-r--r-- | locale/gitlab.pot | 6 |
3 files changed, 17 insertions, 7 deletions
diff --git a/app/views/sent_notifications/unsubscribe.html.haml b/app/views/sent_notifications/unsubscribe.html.haml index 7d3e243495f..ca392e1adfc 100644 --- a/app/views/sent_notifications/unsubscribe.html.haml +++ b/app/views/sent_notifications/unsubscribe.html.haml @@ -1,17 +1,16 @@ - noteable = @sent_notification.noteable - noteable_type = @sent_notification.noteable_type.titleize.downcase - noteable_text = %(#{noteable.title} (#{noteable.to_reference})) -- page_title "Unsubscribe", noteable_text, noteable_type.pluralize, @sent_notification.project.full_name +- page_title _("Unsubscribe"), noteable_text, noteable_type.pluralize, @sent_notification.project.full_name %h3.page-title - Unsubscribe from #{noteable_type} + = _("Unsubscribe from %{type}") % { type: noteable_type } %p - = succeed '?' do - Are you sure you want to unsubscribe from the #{noteable_type}: - = link_to noteable_text, url_for([@sent_notification.project.namespace.becomes(Namespace), @sent_notification.project, noteable]) + - link_to_noteable_text = link_to(noteable_text, url_for([@sent_notification.project.namespace.becomes(Namespace), @sent_notification.project, noteable])) + = _("Are you sure you want to unsubscribe from the %{type}: %{link_to_noteable_text}?").html_safe % { type: noteable_type, link_to_noteable_text: link_to_noteable_text } %p - = link_to 'Unsubscribe', unsubscribe_sent_notification_path(@sent_notification, force: true), + = link_to _('Unsubscribe'), unsubscribe_sent_notification_path(@sent_notification, force: true), class: 'btn btn-primary append-right-10' - = link_to 'Cancel', new_user_session_path, class: 'btn append-right-10' + = link_to _('Cancel'), new_user_session_path, class: 'btn append-right-10' diff --git a/changelogs/unreleased/gt-externalize-app-views-sent_notifications.yml b/changelogs/unreleased/gt-externalize-app-views-sent_notifications.yml new file mode 100644 index 00000000000..e77b5376fa8 --- /dev/null +++ b/changelogs/unreleased/gt-externalize-app-views-sent_notifications.yml @@ -0,0 +1,5 @@ +--- +title: Externalize strings from `/app/views/sent_notifications` +merge_request: 24576 +author: George Tsiolis +type: other diff --git a/locale/gitlab.pot b/locale/gitlab.pot index a9caa29bf22..a72e921dcce 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -735,6 +735,9 @@ msgstr "" msgid "Are you sure you want to stop this environment?" msgstr "" +msgid "Are you sure you want to unsubscribe from the %{type}: %{link_to_noteable_text}?" +msgstr "" + msgid "Are you sure?" msgstr "" @@ -7557,6 +7560,9 @@ msgstr "" msgid "Unsubscribe at project level" msgstr "" +msgid "Unsubscribe from %{type}" +msgstr "" + msgid "Unverified" msgstr "" |