MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[git] Apply: Localize description in conflict dialog

Browse Source 
GitOrigin-RevId: c6cc0d83207a56737de1b422632cbfc3f5001ddf
This commit is contained in:
Nikolay Rykunov
2020-04-07 13:36:51 +00:00
committed by intellij-monorepo-bot
parent 8522fe2c4b
commit 92fd096d0e
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/resources/messages/GitBundle.properties
+3
View File
@@ -1,6 +1,9 @@
add.action.name=Add
add.adding=Adding files...
annotate.action.name=Annotate
apply.conflict.dialog.description.label.text=Conflicts during {0} of commit {1} made by {2}{3}
changes.retrieving=Retrieving Changes for Revision {0}
checking.out=Checkout {0}
commit.action.commit.and.rebase.text=Commit and Rebase...
plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt
+12 -3
View File
@@ -20,6 +20,8 @@ import com.intellij.openapi.vfs.VirtualFile
import com.intellij.vcs.log.Hash
import com.intellij.vcs.log.VcsFullCommitDetails
import com.intellij.vcs.log.util.VcsUserUtil
import com.intellij.xml.util.XmlStringUtil.wrapInHtml
import com.intellij.xml.util.XmlStringUtil.wrapInHtmlTag
import git4idea.GitUtil.refreshChangedVfs
import git4idea.changes.GitChangeUtils.getStagedChanges
import git4idea.commands.GitCommandResult
@@ -28,6 +30,7 @@ import git4idea.commands.GitSimpleEventDetector
import git4idea.commands.GitSimpleEventDetector.Event.CHERRY_PICK_CONFLICT
import git4idea.commands.GitSimpleEventDetector.Event.LOCAL_CHANGES_OVERWRITTEN_BY_CHERRY_PICK
import git4idea.commands.GitUntrackedFilesOverwrittenByOperationDetector
import git4idea.i18n.GitBundle
import git4idea.merge.GitConflictResolver
import git4idea.merge.GitDefaultMergeDialogCustomizer
import git4idea.repo.GitRepository
@@ -388,7 +391,13 @@ private class MergeDialogCustomizer(
private val operationName: String
) : GitDefaultMergeDialogCustomizer(project) {
override fun getMultipleFileMergeDescription(files: MutableCollection<VirtualFile>) =
"<html>Conflicts during ${operationName}ing commit <code>$commitHash</code> " +
"made by $commitAuthor<br/><code>\"$commitMessage\"</code></html>"
override fun getMultipleFileMergeDescription(files: MutableCollection<VirtualFile>) = wrapInHtml(
GitBundle.message(
"apply.conflict.dialog.description.label.text",
operationName,
wrapInHtmlTag(commitHash, "code"),
commitAuthor,
"<br/>" + wrapInHtmlTag(commitMessage, "code")
)
)
}