Skip to content

Commit e480e3a

Browse files
committed
fix: commit message locale issue (#39)
Use locale.displayLanguage instead of locale.displayName.
1 parent 43a886d commit e480e3a

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Changelog
22

33
## [Unreleased]
4+
### Fixed
5+
- Commit message generation does not respect locale.
46

57
## [1.0.0] - 2023-04-19
68

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/AppSettings.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class AppSettings : PersistentStateComponent<AppSettings> {
4949

5050
fun getPrompt(diff: String): String {
5151
var content = currentPrompt.content
52-
content = content.replace("{locale}", locale.displayName)
52+
content = content.replace("{locale}", locale.displayLanguage)
5353

5454
return if (content.contains("{diff}")) {
5555
content.replace("{diff}", diff)

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/AppSettingsConfigurable.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,11 @@ class AppSettingsConfigurable : BoundConfigurable(message("settings.general.grou
111111
group(JBLabel("Prompt")) {
112112
row {
113113
label(message("settings.locale")).widthGroup("labelPrompt")
114-
comboBox(Locale.getAvailableLocales().toList().sortedBy { it.displayName }, AppSettingsListCellRenderer())
114+
comboBox(Locale.getAvailableLocales()
115+
.distinctBy { it.displayLanguage }
116+
.sortedBy { it.displayLanguage },
117+
AppSettingsListCellRenderer()
118+
)
115119
.bindItem(AppSettings.instance::locale.toNullableProperty())
116120
browserLink(message("settings.more-prompts"), AICommitsBundle.URL_PROMPTS_DISCUSSION.toString())
117121
.align(AlignX.RIGHT)

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/AppSettingsListCellRenderer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class AppSettingsListCellRenderer : DefaultListCellRenderer() {
1717
): Component {
1818
val component = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus)
1919
if (value is Locale) {
20-
text = value.displayName
20+
text = value.displayLanguage
2121
}
2222
if (value is Prompt) {
2323
text = value.name

0 commit comments

Comments
 (0)