From 863fd771e6f9ca1b8d856eb9f197ceb75b8b43b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=8F=E7=83=88?= Date: Wed, 1 Nov 2017 20:17:19 +0800 Subject: [PATCH] fix https://github.com/alibaba/p3c/issues/60 Use english as initial language if default language is neither zh nor en. --- .../kotlin/com/alibaba/smartfox/eclipse/SmartfoxActivator.kt | 2 +- .../src/main/kotlin/com/alibaba/p3c/idea/config/P3cConfig.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/src/main/kotlin/com/alibaba/smartfox/eclipse/SmartfoxActivator.kt b/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/src/main/kotlin/com/alibaba/smartfox/eclipse/SmartfoxActivator.kt index e60d963..4895aa0 100644 --- a/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/src/main/kotlin/com/alibaba/smartfox/eclipse/SmartfoxActivator.kt +++ b/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/src/main/kotlin/com/alibaba/smartfox/eclipse/SmartfoxActivator.kt @@ -79,7 +79,7 @@ class SmartfoxActivator : AbstractUIPlugin() { if (language.isNullOrBlank()) { val lang = Locale.getDefault().language return if (lang != Locale.ENGLISH.language && lang != Locale.CHINESE.language) { - Locale.CHINESE.language + Locale.ENGLISH.language } else Locale.getDefault().language } diff --git a/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/config/P3cConfig.kt b/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/config/P3cConfig.kt index df1b09f..9ec3a86 100644 --- a/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/config/P3cConfig.kt +++ b/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/config/P3cConfig.kt @@ -43,7 +43,7 @@ class P3cConfig : PersistentStateComponent { if (field.isEmpty()) { val lang = Locale.getDefault().language return if (lang != Locale.ENGLISH.language && lang != Locale.CHINESE.language) { - Locale.CHINESE.language + Locale.ENGLISH.language } else Locale.getDefault().language }