Skip to content
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

Message: Modify the confused expression #278

Merged
merged 1 commit into from
Sep 3, 2017
Merged

Message: Modify the confused expression #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/views/git/partial_info.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@
@if(isAllowed(UserApp.currentUser(), pull.asResource(), Operation.ACCEPT)) {
@if(pull.isAcceptable){
<a id="btnAccept" href="@routes.PullRequestApp.accept(project.owner, project.name, pull.number)" data-request-method="post"
class="ybtn ybtn-success">@Messages("pullRequest.accept")</a>
class="ybtn ybtn-success">@Messages("pullRequest.merge")</a>
} else {
<button class="ybtn ybtn-disabled" data-toggle="tooltip" data-placement="top"
title="@pull.getMessageForDisabledAcceptButton">@Messages("pullRequest.accept")</button>
title="@pull.getMessageForDisabledAcceptButton">@Messages("pullRequest.merge")</button>
}
}
</div>
Expand Down
6 changes: 3 additions & 3 deletions conf/messages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ project.readme = README.md will be shown here if you add it into the code reposi
project.readme.create = create README
project.recently.visited = Recently visited
project.reviewer.count = Reviewer
project.reviewer.count.description = of reviewers is required to accept pull request.
project.reviewer.count.description = of reviewers is required to merge pull request.
project.reviewer.count.disable = Disable
project.reviewer.count.enable = Enable
project.searchPlaceholder = Search current project
Expand Down Expand Up @@ -687,7 +687,7 @@ project.you.are.watching = You are watching {0} project.
project.you.may.want.to.be.a.member = You can send a sign-up request for {0} project.
project.you.want.to.be.a.member = You have sent a sign-up request for {0} project.
pullRequest = Pull request
pullRequest.accept = Accept
pullRequest.merge = Merge
pullRequest.additional.changes = Additional changes
pullRequest.back.to.the.pullrequest = Back to pull request.
pullRequest.body.required = Enter pull request description.
Expand Down Expand Up @@ -765,7 +765,7 @@ pullRequest.resolver.step8 = You may need to repeat steps 5 to 7 several times.
pullRequest.resolver.step9 = After rebasing, push it to origin.
pullRequest.restore.branch = Restore branch
pullRequest.restore.frombranch.message = Branch can be restored.
pullRequest.review = Reviewed
pullRequest.review = Approve
pullRequest.review.closed = Closed review
pullRequest.review.open = Open review
pullRequest.review.participants = <strong>{0}</strong> participants
Expand Down
4 changes: 2 additions & 2 deletions conf/messages.ko-KR
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ project.you.are.watching = {0} 프로젝트를 지켜보는 중입니다.
project.you.may.want.to.be.a.member = {0} 프로젝트 멤버로 등록 요청을 할 수 있습니다.
project.you.want.to.be.a.member = {0} 프로젝트 멤버로 등록 요청했습니다.
pullRequest = 코드 보내기
pullRequest.accept = 코드 받기
pullRequest.merge = 코드 병합
pullRequest.additional.changes = 추가 변경 내역
pullRequest.back.to.the.pullrequest = 코드 주고받기로 돌아가기
pullRequest.body.required = 내용을 입력하세요.
Expand Down Expand Up @@ -764,7 +764,7 @@ pullRequest.resolver.step8 = 5~7번 과정을 여러번 반복할 수도 있습
pullRequest.resolver.step9 = rebase가 끝났다면 origin으로 코드를 강제 푸쉬 합니다.
pullRequest.restore.branch = 브랜치 복구
pullRequest.restore.frombranch.message = 브랜치를 복구할 수 있습니다.
pullRequest.review = 리뷰 완료
pullRequest.review = 리뷰 승인
pullRequest.review.closed = 닫힌 리뷰
pullRequest.review.open = 열린 리뷰
pullRequest.review.participants = 참여자 <strong>{0}</strong>명
Expand Down