diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2017-09-05 23:53:32 +0200 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2017-09-06 12:07:20 -0700 |
commit | e0fb7766bcbf140d1cc8165b4fae90fa8df841e6 (patch) | |
tree | 70858706a061f74ab5425fe75dbed7631a734793 | |
parent | c53c20ac23ee53b4e084ec88a4242c8295100b72 (diff) | |
download | gitlab-ce-e0fb7766bcbf140d1cc8165b4fae90fa8df841e6.tar.gz |
Make texts translatable
-rw-r--r-- | app/helpers/groups_helper.rb | 12 | ||||
-rw-r--r-- | app/views/groups/edit.html.haml | 7 |
2 files changed, 11 insertions, 8 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 1ced92e0828..e22e2c2e418 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -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 diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 9f2e53d9c90..38d39c29acf 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -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 |