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.

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

merged 13 commits into from
May 8, 2020

Conversation

L0veSunshine
Copy link
Contributor

As title.

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...
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
settings.search_team = Search Team...
settings.search_team = Search Team

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 26, 2020
@@ -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"}}>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<div class="ui eight wide column poping up" data-content={{$.i18n.Tr "repo.settings.change_team_permission_tip"}}>
<div class="ui eight wide column poping up" data-content="{{$.i18n.Tr "repo.settings.change_team_permission_tip"}}">

@@ -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}}>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<div class="ui two wide column {{if .IncludesAllRepositories}}poping up{{end}}" {{if .IncludesAllRepositories}} data-content= {{$.i18n.Tr "repo.settings.delete_team_tip"}} {{end}}>
<div class="ui two wide column {{if .IncludesAllRepositories}}poping up{{end}}" {{if .IncludesAllRepositories}} data-content="{{$.i18n.Tr "repo.settings.delete_team_tip"}}"{{end}}>

@@ -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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<input class="prompt" name="team" placeholder={{$.i18n.Tr "repo.settings.search_team"}} autocomplete="off" autofocus required>
<input class="prompt" name="team" placeholder="{{$.i18n.Tr "repo.settings.search_team"}}" autocomplete="off" autofocus required>

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 26, 2020
@codecov-io
Copy link

codecov-io commented Apr 26, 2020

Codecov Report

Merging #11221 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #11221      +/-   ##
==========================================
- Coverage   43.84%   43.83%   -0.02%     
==========================================
  Files         607      607              
  Lines       86893    86893              
==========================================
- Hits        38098    38086      -12     
- Misses      44093    44104      +11     
- Partials     4702     4703       +1     
Impacted Files Coverage Δ
modules/git/utils.go 65.67% <0.00%> (-4.48%) ⬇️
modules/git/repo.go 49.79% <0.00%> (-2.10%) ⬇️
modules/queue/workerpool.go 56.93% <0.00%> (-1.07%) ⬇️
modules/log/event.go 64.61% <0.00%> (-1.03%) ⬇️
services/pull/pull.go 32.44% <0.00%> (-0.96%) ⬇️
modules/indexer/stats/db.go 50.00% <0.00%> (ø)
modules/queue/unique_queue_disk_channel.go 55.76% <0.00%> (+1.92%) ⬆️
modules/process/manager.go 78.31% <0.00%> (+3.61%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b7c82cd...375202e. Read the comment docs.

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 29, 2020
@zeripath zeripath added this to the 1.12.0 milestone Apr 29, 2020
@6543
Copy link
Member

6543 commented Apr 29, 2020

@lafriks this needs your review

@zeripath
Copy link
Contributor

zeripath commented May 8, 2020

make lg-tm work

@zeripath zeripath merged commit 866ce12 into go-gitea:master May 8, 2020
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
* split some words from template

* split some words from template

* add " " to mustache expression

* split some words from template

Co-authored-by: zeripath <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/translation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants