Skip to content

Commit f7cb291

Browse files
committed
Migrate creator package to use message bundles for UI text
1 parent f7f36b1 commit f7cb291

25 files changed

+155
-77
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
.idea/*
77
!.idea/icon.png
8+
!.idea/encodings.xml
9+
!.idea/inspectionProfiles/Project_Default.xml
810

911
**/out/
1012
**/build/

.idea/encodings.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/kotlin/creator/MinecraftModuleBuilder.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
package com.demonwav.mcdev.creator
2222

23+
import com.demonwav.mcdev.asset.MCDevBundle
2324
import com.demonwav.mcdev.asset.PlatformAssets
2425
import com.demonwav.mcdev.creator.buildsystem.BuildSystemPropertiesStep
2526
import com.demonwav.mcdev.creator.platformtype.PlatformTypeStep
@@ -40,7 +41,7 @@ class MinecraftModuleBuilder : AbstractNewProjectWizardBuilder() {
4041
override fun getNodeIcon() = PlatformAssets.MINECRAFT_ICON
4142
override fun getGroupName() = MinecraftModuleType.NAME
4243
override fun getBuilderId() = "MINECRAFT_MODULE"
43-
override fun getDescription() = "Create a new Minecraft project"
44+
override fun getDescription() = MCDevBundle.message("creator.ui.create_minecraft_project")
4445

4546
override fun setupRootModel(modifiableRootModel: ModifiableRootModel) {
4647
if (moduleJdk != null) {

src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
package com.demonwav.mcdev.creator
2222

23+
import com.demonwav.mcdev.asset.MCDevBundle
2324
import com.demonwav.mcdev.creator.ProjectSetupFinalizer.Factory
2425
import com.demonwav.mcdev.creator.step.NewProjectWizardChainStep.Companion.nextStep
2526
import com.demonwav.mcdev.util.mapFirstNotNull
@@ -119,7 +120,7 @@ class JdkProjectSetupFinalizer(
119120
private var sdk by sdkProperty
120121
private var sdkComboBox: JdkComboBoxWithPreference? = null
121122
private var preferredJdkLabel: Placeholder? = null
122-
private var preferredJdkReason = "these settings"
123+
private var preferredJdkReason = MCDevBundle.message("creator.validation.jdk_preferred_default_reason")
123124

124125
var preferredJdk: JavaSdkVersion = JavaSdkVersion.JDK_17
125126
private set
@@ -146,7 +147,7 @@ class JdkProjectSetupFinalizer(
146147
preferredJdkLabel?.component = null
147148
} else {
148149
preferredJdkLabel?.component =
149-
JLabel("Java ${preferredJdk.description} is recommended for $preferredJdkReason")
150+
JLabel(MCDevBundle.message("creator.validation.jdk_preferred", preferredJdk.description, preferredJdkReason))
150151
.also { it.foreground = JBColor.YELLOW }
151152
}
152153
}

src/main/kotlin/creator/buildsystem/AbstractBuildSystemStep.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
package com.demonwav.mcdev.creator.buildsystem
2222

23+
import com.demonwav.mcdev.asset.MCDevBundle
2324
import com.demonwav.mcdev.creator.findStep
2425
import com.demonwav.mcdev.creator.storeToData
2526
import com.intellij.ide.util.projectWizard.WizardContext
@@ -47,7 +48,8 @@ abstract class AbstractBuildSystemStep(
4748
abstract val platformName: String
4849

4950
override val self get() = this
50-
override val label = "Build System:"
51+
override val label
52+
get() = MCDevBundle.message("creator.ui.build_system.label.generic")
5153

5254
override fun initSteps(): LinkedHashMap<String, NewProjectWizardStep> {
5355
context.putUserData(PLATFORM_NAME_KEY, platformName)
@@ -94,11 +96,13 @@ abstract class AbstractBuildSystemStep(
9496
}
9597

9698
class GradleBuildSystem : AbstractBuildSystemStep.Factory {
97-
override val name = "Gradle"
99+
override val name
100+
get() = MCDevBundle.message("creator.ui.build_system.label.gradle")
98101
}
99102

100103
class MavenBuildSystem : AbstractBuildSystemStep.Factory {
101-
override val name = "Maven"
104+
override val name
105+
get() = MCDevBundle.message("creator.ui.build_system.label.maven")
102106
}
103107

104108
abstract class AbstractRunBuildSystemStep(

src/main/kotlin/creator/buildsystem/BuildSystemPropertiesStep.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
package com.demonwav.mcdev.creator.buildsystem
2222

23+
import com.demonwav.mcdev.asset.MCDevBundle
2324
import com.demonwav.mcdev.creator.storeToData
2425
import com.demonwav.mcdev.util.SemanticVersion
2526
import com.intellij.ide.wizard.AbstractNewProjectWizardStep
@@ -37,11 +38,11 @@ import com.intellij.ui.dsl.builder.bindText
3738
import com.intellij.ui.dsl.builder.columns
3839
import com.intellij.ui.dsl.builder.textValidation
3940

40-
private val nonExampleValidation = validationErrorIf<String>("Group ID must be changed from \"org.example\"") {
41+
private val nonExampleValidation = validationErrorIf<String>(MCDevBundle.message("creator.validation.group_id_non_example")) {
4142
it == "org.example"
4243
}
4344

44-
private val versionValidation = validationErrorIf<String>("Version must be a valid semantic version") {
45+
private val versionValidation = validationErrorIf<String>(MCDevBundle.message("creator.validation.semantic_version")) {
4546
SemanticVersion.tryParse(it) == null
4647
}
4748

@@ -66,22 +67,22 @@ class BuildSystemPropertiesStep<ParentStep>(private val parent: ParentStep) : Ab
6667
private fun suggestArtifactId() = parent.name
6768

6869
override fun setupUI(builder: Panel) {
69-
builder.collapsibleGroup("Build System Properties") {
70-
row("Group ID:") {
70+
builder.collapsibleGroup(MCDevBundle.message("creator.ui.group.title")) {
71+
row(MCDevBundle.message("creator.ui.group.group_id")) {
7172
textField()
7273
.bindText(groupIdProperty)
7374
.columns(COLUMNS_MEDIUM)
7475
.validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))
7576
.textValidation(CHECK_NON_EMPTY, CHECK_GROUP_ID, nonExampleValidation)
7677
}
77-
row("Artifact ID:") {
78+
row(MCDevBundle.message("creator.ui.group.artifact_id")) {
7879
textField()
7980
.bindText(artifactIdProperty)
8081
.columns(COLUMNS_MEDIUM)
8182
.validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))
8283
.textValidation(CHECK_NON_EMPTY, CHECK_ARTIFACT_ID)
8384
}
84-
row("Version:") {
85+
row(MCDevBundle.message("creator.ui.group.version")) {
8586
textField()
8687
.bindText(versionProperty)
8788
.columns(COLUMNS_MEDIUM)

src/main/kotlin/creator/buildsystem/gradle-steps.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
package com.demonwav.mcdev.creator.buildsystem
2222

23+
import com.demonwav.mcdev.asset.MCDevBundle
2324
import com.demonwav.mcdev.creator.addTemplates
2425
import com.demonwav.mcdev.creator.findStep
2526
import com.demonwav.mcdev.creator.notifyCreatedProjectNotOpened
@@ -88,7 +89,8 @@ class GradleWrapperStep(parent: NewProjectWizardStep) : AbstractRunGradleTaskSte
8889
}
8990

9091
abstract class AbstractPatchGradleFilesStep(parent: NewProjectWizardStep) : AbstractLongRunningStep(parent) {
91-
override val description = "Patching Gradle files"
92+
override val description
93+
get() = MCDevBundle.message("creator.step.gradle.patch_gradle.description")
9294

9395
abstract fun patch(project: Project, gradleFiles: GradleFiles)
9496

@@ -192,7 +194,8 @@ abstract class AbstractPatchGradleFilesStep(parent: NewProjectWizardStep) : Abst
192194
}
193195

194196
open class GradleImportStep(parent: NewProjectWizardStep) : AbstractLongRunningStep(parent) {
195-
override val description = "Importing Gradle project"
197+
override val description
198+
get() = MCDevBundle.message("creator.step.gradle.import_gradle.description")
196199

197200
open val additionalRunTasks = emptyList<String>()
198201

src/main/kotlin/creator/buildsystem/maven-steps.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
package com.demonwav.mcdev.creator.buildsystem
2222

23+
import com.demonwav.mcdev.asset.MCDevBundle
2324
import com.demonwav.mcdev.creator.findStep
2425
import com.demonwav.mcdev.creator.getVersionJson
2526
import com.demonwav.mcdev.creator.notifyCreatedProjectNotOpened
@@ -62,7 +63,8 @@ fun FixedAssetsNewProjectWizardStep.addDefaultMavenProperties() {
6263
}
6364

6465
abstract class AbstractPatchPomStep(parent: NewProjectWizardStep) : AbstractLongRunningStep(parent) {
65-
override val description = "Patching pom.xml"
66+
override val description
67+
get() = MCDevBundle.message("creator.step.maven.patch_pom.description")
6668

6769
open fun patchPom(model: MavenDomProjectModel, root: XmlTag) {
6870
setupCore(model)
@@ -168,7 +170,8 @@ class ReformatPomStep(parent: NewProjectWizardStep) : AbstractReformatFilesStep(
168170
}
169171

170172
class MavenImportStep(parent: NewProjectWizardStep) : AbstractLongRunningStep(parent) {
171-
override val description = "Importing Maven project"
173+
override val description
174+
get() = MCDevBundle.message("creator.step.maven.import_maven.description")
172175

173176
override fun perform(project: Project) {
174177
val pomFile = VfsUtil.findFile(Path.of(context.projectFileDirectory).resolve("pom.xml"), true)

src/main/kotlin/creator/platformtype/ModPlatformStep.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
package com.demonwav.mcdev.creator.platformtype
2222

23+
import com.demonwav.mcdev.asset.MCDevBundle
2324
import com.demonwav.mcdev.creator.platformtype.ModPlatformStep.Factory
2425
import com.intellij.ide.wizard.AbstractNewProjectWizardMultiStep
2526
import com.intellij.ide.wizard.NewProjectWizardMultiStepFactory
@@ -39,10 +40,12 @@ class ModPlatformStep(
3940
}
4041

4142
override val self = this
42-
override val label = "Platform:"
43+
override val label
44+
get() = MCDevBundle.message("creator.ui.platform.label")
4345

4446
class TypeFactory : PlatformTypeStep.Factory {
45-
override val name = "Mod"
47+
override val name
48+
get() = MCDevBundle.message("creator.ui.platform.mod.name")
4649
override fun createStep(parent: PlatformTypeStep) = ModPlatformStep(parent)
4750
}
4851

src/main/kotlin/creator/platformtype/PlatformTypeStep.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
package com.demonwav.mcdev.creator.platformtype
2222

23+
import com.demonwav.mcdev.asset.MCDevBundle
2324
import com.demonwav.mcdev.creator.platformtype.PlatformTypeStep.Factory
2425
import com.intellij.ide.wizard.AbstractNewProjectWizardMultiStep
2526
import com.intellij.ide.wizard.NewProjectWizardBaseData
@@ -45,7 +46,8 @@ class PlatformTypeStep private constructor(
4546
}
4647

4748
override val self = this
48-
override val label = "Platform Type:"
49+
override val label
50+
get() = MCDevBundle.message("creator.ui.platform.type.label")
4951

5052
interface Factory : NewProjectWizardMultiStepFactory<PlatformTypeStep>
5153
}

0 commit comments

Comments
 (0)