fix alibaba#60

骏烈 · 骏烈 · commit 863fd771e6f9 · 2017-11-01T20:17:19.000+08:00
Use english as initial language if default language is neither zh nor en.
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
@@ -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
@@ -43,7 +43,7 @@ class P3cConfig : PersistentStateComponent<P3cConfig> {
             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
             }
 

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ class SmartfoxActivator : AbstractUIPlugin() {`
`79`	`79`	`if (language.isNullOrBlank()) {`
`80`	`80`	`val lang = Locale.getDefault().language`
`81`	`81`	`return if (lang != Locale.ENGLISH.language && lang != Locale.CHINESE.language) {`
`82`		`- Locale.CHINESE.language`
	`82`	`+ Locale.ENGLISH.language`
`83`	`83`	`} else Locale.getDefault().language`
`84`	`84`	`}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class P3cConfig : PersistentStateComponent<P3cConfig> {`
`43`	`43`	`if (field.isEmpty()) {`
`44`	`44`	`val lang = Locale.getDefault().language`
`45`	`45`	`return if (lang != Locale.ENGLISH.language && lang != Locale.CHINESE.language) {`
`46`		`- Locale.CHINESE.language`
	`46`	`+ Locale.ENGLISH.language`
`47`	`47`	`} else Locale.getDefault().language`
`48`	`48`	`}`
`49`	`49`