summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorRubén Dávila <ruben@gitlab.com>2017-08-14 22:26:04 +0000
committerRubén Dávila <ruben@gitlab.com>2017-08-14 22:26:04 +0000
commit1983043c6656fb9999649be90c6ea58921eb765d (patch)
tree4e641bcc8db67856d1b11a11828957622c0a283a /app/helpers
parent87bd9c56cc90ce03933d367ea0e9f392786489fd (diff)
parent4d97843f3cfe94a3061bcb03aa0da6876b026bea (diff)
downloadgitlab-ce-1983043c6656fb9999649be90c6ea58921eb765d.tar.gz
Merge branch 'bvl-use-no-wrap-for-pot-file' into 'master'
Remove newlines in translations See merge request !13531
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/groups_helper.rb2
-rw-r--r--app/helpers/projects_helper.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
index 8cd61f738e1..4123a96911f 100644
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -59,7 +59,7 @@ module GroupsHelper
end
def remove_group_message(group)
- _("You are going to remove %{group_name}.\nRemoved groups CANNOT be restored!\nAre you ABSOLUTELY sure?") %
+ _("You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?") %
{ group_name: group.name }
end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index a268413e84f..09cfd06dad3 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -80,7 +80,7 @@ module ProjectsHelper
end
def remove_project_message(project)
- _("You are going to remove %{project_name_with_namespace}.\nRemoved project CANNOT be restored!\nAre you ABSOLUTELY sure?") %
+ _("You are going to remove %{project_name_with_namespace}. Removed project CANNOT be restored! Are you ABSOLUTELY sure?") %
{ project_name_with_namespace: project.name_with_namespace }
end