From 59b55053795ecd80a1da732b23c6cc53da448ccd Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Mon, 17 Feb 2020 15:20:28 +0900
Subject: [PATCH] i18n: Add bundle for idea-git

---
 .../idea/git/KotlinGitBundle.properties       |  2 ++
 .../git/KotlinExplicitMovementProvider.kt     |  5 ++--
 .../git/KotlinExplicitMovementProvider.kt.192 |  5 ++--
 .../kotlin/idea/git/KotlinGitBundle.kt        | 24 +++++++++++++++++++
 4 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 idea/idea-git/resources/org/jetbrains/kotlin/idea/git/KotlinGitBundle.properties
 create mode 100644 idea/idea-git/src/org/jetbrains/kotlin/idea/git/KotlinGitBundle.kt

diff --git a/idea/idea-git/resources/org/jetbrains/kotlin/idea/git/KotlinGitBundle.properties b/idea/idea-git/resources/org/jetbrains/kotlin/idea/git/KotlinGitBundle.properties
new file mode 100644
index 00000000000..31447825fca
--- /dev/null
+++ b/idea/idea-git/resources/org/jetbrains/kotlin/idea/git/KotlinGitBundle.properties
@@ -0,0 +1,2 @@
+j2k.extra.commit.description=Extra commit for .java > .kt renames
+j2k.extra.commit.commit.message=Rename .java to .kt
\ No newline at end of file
diff --git a/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt b/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt
index 3b6520e0331..9eeb04a8071 100644
--- a/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt
+++ b/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt
@@ -10,6 +10,7 @@ import com.intellij.openapi.util.Couple
 import com.intellij.openapi.vcs.FilePath
 import git4idea.checkin.GitCheckinExplicitMovementProvider
 import org.jetbrains.kotlin.idea.actions.pathBeforeJ2K
+import org.jetbrains.kotlin.idea.git.KotlinGitBundle
 import java.util.*
 
 class KotlinExplicitMovementProvider : GitCheckinExplicitMovementProvider() {
@@ -18,11 +19,11 @@ class KotlinExplicitMovementProvider : GitCheckinExplicitMovementProvider() {
     }
 
     override fun getDescription(): String {
-        return "Extra commit for .java > .kt renames"
+        return KotlinGitBundle.message("j2k.extra.commit.description")
     }
 
     override fun getCommitMessage(oldCommitMessage: String): String {
-        return "Rename .java to .kt"
+        return KotlinGitBundle.message("j2k.extra.commit.commit.message")
     }
 
     override fun collectExplicitMovements(
diff --git a/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.192 b/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.192
index c9628aceb6e..b6befac5b09 100644
--- a/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.192
+++ b/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.192
@@ -11,6 +11,7 @@ import com.intellij.openapi.util.registry.Registry
 import com.intellij.openapi.vcs.FilePath
 import git4idea.checkin.GitCheckinExplicitMovementProvider
 import org.jetbrains.kotlin.idea.actions.pathBeforeJ2K
+import org.jetbrains.kotlin.idea.git.KotlinGitBundle
 import java.util.*
 
 class KotlinExplicitMovementProvider : GitCheckinExplicitMovementProvider() {
@@ -23,11 +24,11 @@ class KotlinExplicitMovementProvider : GitCheckinExplicitMovementProvider() {
     }
 
     override fun getDescription(): String {
-        return "Extra commit for .java > .kt renames"
+        return KotlinGitBundle.message("j2k.extra.commit.description")
     }
 
     override fun getCommitMessage(oldCommitMessage: String): String {
-        return "Rename .java to .kt"
+        return KotlinGitBundle.message("j2k.extra.commit.commit.message")
     }
 
     override fun collectExplicitMovements(
diff --git a/idea/idea-git/src/org/jetbrains/kotlin/idea/git/KotlinGitBundle.kt b/idea/idea-git/src/org/jetbrains/kotlin/idea/git/KotlinGitBundle.kt
new file mode 100644
index 00000000000..0046a3a1e13
--- /dev/null
+++ b/idea/idea-git/src/org/jetbrains/kotlin/idea/git/KotlinGitBundle.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.git
+
+import com.intellij.CommonBundle
+import org.jetbrains.annotations.NonNls
+import org.jetbrains.annotations.PropertyKey
+import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase
+import java.util.*
+
+object KotlinGitBundle : KotlinBundleBase() {
+    @NonNls
+    private const val BUNDLE = "org.jetbrains.kotlin.idea.git.KotlinGitBundle"
+
+    override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
+
+    @JvmStatic
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String {
+        return CommonBundle.message(bundle, key, *params)
+    }
+}
\ No newline at end of file