MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[diff-tool] Move text to bundle

Browse Source 
# IDEA-305392 Fixed

GitOrigin-RevId: 469e167234d138e25e1bdcfc371d4cc96cae987d
This commit is contained in:
Pavel Gromov
2023-10-24 15:38:15 +02:00
committed by intellij-monorepo-bot
parent e092f43444
commit 320453fa2c
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/diff-api/resources/messages/DiffBundle.properties
View File

@@ -122,6 +122,8 @@ settings.external.tools.parameters.diff=<b>%1</b> - left (Local changes)<br><b>%
settings.external.tools.parameters.merge=<b>%1</b> - left (Local changes)<br><b>%2</b> - right (Server content)<br><b>%3</b> - base (Current version without local changes)<br><b>%4</b> - output (Merge result)
settings.external.tools.test.process.exit.text=Process terminated: exitCode ''{0}''
settings.external.diff.table.filetype.default=Default
settings.external.diff.table.tool.default=Built-in
settings.external.diff.table.filetype.column=File Type
settings.external.diff.table.difftool.column=Diff Tool
settings.external.diff.table.mergetool.column=Merge Tool

17
platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffSettings.kt vendored
View File

@@ -6,11 +6,11 @@ import com.intellij.openapi.components.*
import com.intellij.openapi.diff.DiffBundle
import com.intellij.openapi.fileTypes.FileType
import com.intellij.openapi.fileTypes.FileTypeManager
import com.intellij.openapi.util.NlsSafe
import com.intellij.openapi.util.text.StringUtil
import com.intellij.util.PathUtilRt
import com.intellij.util.xmlb.annotations.OptionTag
import org.jetbrains.annotations.Nls
import org.jetbrains.annotations.NonNls
@State(name = "ExternalDiffSettings", storages = [Storage(DiffUtil.DIFF_CONFIG)], category = SettingsCategory.TOOLS)
class ExternalDiffSettings : BaseState(), PersistentStateComponent<ExternalDiffSettings> {
@@ -42,16 +42,13 @@ class ExternalDiffSettings : BaseState(), PersistentStateComponent<ExternalDiffS
}
data class ExternalToolConfiguration(
@NonNls var fileTypeName: String = DEFAULT_TOOL_NAME,
@NonNls var diffToolName: String = BUILTIN_TOOL,
@NonNls var mergeToolName: String = BUILTIN_TOOL
var fileTypeName: @NlsSafe String = DEFAULT_TOOL_NAME,
var diffToolName: @NlsSafe String = BUILTIN_TOOL,
var mergeToolName: @NlsSafe String = BUILTIN_TOOL
) {
companion object {
@NonNls
const val DEFAULT_TOOL_NAME = "Default"
@NonNls
const val BUILTIN_TOOL = "Built-in"
val DEFAULT_TOOL_NAME = DiffBundle.message("settings.external.diff.table.filetype.default")
val BUILTIN_TOOL = DiffBundle.message("settings.external.diff.table.tool.default")
val builtinInstance = ExternalToolConfiguration()
}
@@ -63,7 +60,7 @@ class ExternalDiffSettings : BaseState(), PersistentStateComponent<ExternalDiffS
}
data class ExternalTool(
@NonNls var name: String = "",
var name: @NlsSafe String = "",
var programPath: String = "",
var argumentPattern: String = "",
var isMergeTrustExitCode: Boolean = false,