kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Make texts translatable

Browse source
This commit is contained in:
Winnie Hellmann 2017-09-05 23:53:32 +02:00 committed by Michael Kozono
parent c53c20ac23
commit e0fb7766bc
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/helpers/groups_helper.rb
View file

@ -97,19 +97,23 @@ module GroupsHelper
end
end
def parent_group_link
link_to @group.parent.name, group_path(@group.parent)
end
def default_help
"This setting will be applied to all subgroups unless overridden by a group owner."
s_("GroupSettings|This setting will be applied to all subgroups unless overridden by a group owner.")
end
def parent_locked_but_you_can_override
"This setting is applied on #{@group.parent.name}. You can override the setting or remove the share lock from the parent group."
s_("GroupSettings|This setting is applied on %{parent_group}. You can override the setting or remove the share lock from the parent group.") % { parent_group: parent_group_link }
end
def parent_locked_so_ask_the_owner
"This setting is applied on #{@group.parent.name}. To share this group with another group, ask the owner to override the setting or remove the share lock from the parent group."
s_("GroupSettings|This setting is applied on %{parent_group}. To share this group with another group, ask the owner to override the setting or remove the share lock from the parent group.") % { parent_group: parent_group_link }
end
def parent_locked_and_has_been_overridden
"This setting is applied on #{@group.parent.name} and has been overridden on this subgroup."
s_("GroupSettings|This setting is applied on %{parent_group} and has been overridden on this subgroup.") % { parent_group: parent_group_link }
end
end

7
app/views/groups/edit.html.haml
View file

@ -30,15 +30,14 @@
.form-group
%h5.control-label
Share lock
= s_("GroupSettings|Share lock")
.col-sm-10
.checkbox
= f.label :share_with_group_lock do
= f.check_box :share_with_group_lock, disabled: share_with_group_lock_disabled
%strong
Prevent sharing a project within
= @group.name
with other groups
- group_link = link_to @group.name, group_path(@group)
= s_("GroupSettings|Prevent sharing a project within %{group} with other groups").html_safe % { group: group_link }
%br
%span.descr= share_with_group_lock_help_text