From 92fd096d0e9175ebc2b286d06fe48f3042a57d07 Mon Sep 17 00:00:00 2001 From: Nikolay Rykunov Date: Tue, 7 Apr 2020 16:24:45 +0300 Subject: [PATCH] [git] Apply: Localize description in conflict dialog GitOrigin-RevId: c6cc0d83207a56737de1b422632cbfc3f5001ddf --- .../resources/messages/GitBundle.properties | 3 +++ .../src/git4idea/GitApplyChangesProcess.kt | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/plugins/git4idea/resources/messages/GitBundle.properties b/plugins/git4idea/resources/messages/GitBundle.properties index 07e0957cb275..09686bd7d390 100644 --- a/plugins/git4idea/resources/messages/GitBundle.properties +++ b/plugins/git4idea/resources/messages/GitBundle.properties @@ -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... diff --git a/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt b/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt index 955ffba04296..1095b0415a03 100644 --- a/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt +++ b/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt @@ -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) = - "Conflicts during ${operationName}ing commit $commitHash " + - "made by $commitAuthor
\"$commitMessage\"" + override fun getMultipleFileMergeDescription(files: MutableCollection) = wrapInHtml( + GitBundle.message( + "apply.conflict.dialog.description.label.text", + operationName, + wrapInHtmlTag(commitHash, "code"), + commitAuthor, + "
" + wrapInHtmlTag(commitMessage, "code") + ) + ) }