diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 6c98497209..4d01a6be96 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1386,8 +1386,13 @@ settings.search_user_placeholder = Search user… settings.org_not_allowed_to_be_collaborator = Organizations cannot be added as a collaborator. settings.change_team_access_not_allowed = Changing team access for repository has been restricted to organization owner settings.team_not_in_organization = The team is not in the same organization as the repository +settings.teams = Teams +settings.add_team = Add Team settings.add_team_duplicate = Team already has the repository settings.add_team_success = The team now have access to the repository. +settings.search_team = Search Team… +settings.change_team_permission_tip = Team's permission is set on the team setting page and can't be changed per repository +settings.delete_team_tip = This team has access to all repositories and can't be removed settings.remove_team_success = The team's access to the repository has been removed. settings.add_webhook = Add Webhook settings.add_webhook.invalid_channel_name = Webhook channel name cannot be empty and cannot contain only a # character. diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 8c6e6461ad..082aebff73 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -54,7 +54,7 @@ {{if .RepoOwnerIsOrganization}}

- Teams + {{$.i18n.Tr "repo.settings.teams"}}

{{ $allowedToChangeTeams := ( or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner)) }} {{if .Teams}} @@ -66,7 +66,7 @@ {{.Name}} -
+
{{svg "octicon-shield-lock" 16}} {{if $allowedToChangeTeams}} -
+
@@ -96,15 +96,15 @@
- + {{else}}
- Changing team access for repository has been restricted to organization owner + {{$.i18n.Tr "repo.settings.change_team_access_not_allowed"}}
{{end}}