Skip to content

Split some words from template to improve translation. #11221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
May 8, 2020
Merged

Split some words from template to improve translation. #11221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d83db49
split some words from template
L0veSunshine Apr 26, 2020
25e821d
split some words from template
L0veSunshine Apr 26, 2020
b9292be
add " " to mustache expression
L0veSunshine Apr 26, 2020
39c9125
split some words from template
L0veSunshine Apr 26, 2020
86339d2
Merge branch 'master' into master
zeripath Apr 29, 2020
19fa258
Merge branch 'master' into master
lunny May 2, 2020
abf79ab
Merge branch 'master' into master
lunny May 2, 2020
e0e9ccc
Merge branch 'master' into master
zeripath May 3, 2020
375202e
Merge branch 'master' into master
lunny May 4, 2020
4639194
Merge branch 'master' into master
L0veSunshine May 5, 2020
f2c3bf2
Merge branch 'master' into master
zeripath May 7, 2020
faf2745
Merge branch 'master' into master
zeripath May 7, 2020
70440bc
Merge branch 'master' into master
zeripath May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 6 additions & 6 deletions templates/repo/settings/collaboration.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

{{if .RepoOwnerIsOrganization}}
<h4 class="ui top attached header">
Teams
{{$.i18n.Tr "repo.settings.teams"}}
</h4>
{{ $allowedToChangeTeams := ( or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner)) }}
{{if .Teams}}
Expand All @@ -66,7 +66,7 @@
{{.Name}}
</a>
</div>
<div class="ui eight wide column poping up" data-content="Team's permission is set on the team setting page and can't be changed per repository">
<div class="ui eight wide column poping up" data-content="{{$.i18n.Tr "repo.settings.change_team_permission_tip"}}">
{{svg "octicon-shield-lock" 16}}
<div class="ui inline dropdown">
<div class="text">{{if eq .Authorize 1}}{{$.i18n.Tr "repo.settings.collaboration.read"}}{{else if eq .Authorize 2}}{{$.i18n.Tr "repo.settings.collaboration.write"}}{{else if eq .Authorize 3}}{{$.i18n.Tr "repo.settings.collaboration.admin"}}{{else if eq .Authorize 4}}{{$.i18n.Tr "repo.settings.collaboration.owner"}}{{else}}{{$.i18n.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
Expand All @@ -79,7 +79,7 @@
{{end}}
</div>
{{if $allowedToChangeTeams}}
<div class="ui two wide column {{if .IncludesAllRepositories}}poping up{{end}}" {{if .IncludesAllRepositories}}data-content="This team has access to all repositories and can't be removed."{{end}}>
<div class="ui two wide column {{if .IncludesAllRepositories}}poping up{{end}}" {{if .IncludesAllRepositories}} data-content="{{$.i18n.Tr "repo.settings.delete_team_tip"}}"{{end}}>
<button class="ui red tiny button inline text-thin delete-button {{if .IncludesAllRepositories}}disabled{{end}}" data-url="{{$.Link}}/team/delete" data-id="{{.ID}}">
{{$.i18n.Tr "repo.settings.delete_collaborator"}}
</button>
Expand All @@ -96,15 +96,15 @@
<div class="inline field ui left">
<div id="search-team-box" class="ui search" data-org="{{.OrgName}}">
<div class="ui input">
<input class="prompt" name="team" placeholder="Search teams..." autocomplete="off" autofocus required>
<input class="prompt" name="team" placeholder="{{$.i18n.Tr "repo.settings.search_team"}}" autocomplete="off" autofocus required>
</div>
</div>
</div>
<button class="ui green button">Add Team</button>
<button class="ui green button">{{$.i18n.Tr "repo.settings.add_team"}}</button>
</form>
{{else}}
<div class="item">
Changing team access for repository has been restricted to organization owner
{{$.i18n.Tr "repo.settings.change_team_access_not_allowed"}}
</div>
{{end}}
</div>
Expand Down