MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-93048

Browse Source
This commit is contained in:
Alexander Lobas
2012-11-14 17:02:23 +04:00
parent 8a4f10412d
commit 55c9106e2e
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-designer/src/com/intellij/android/designer/profile/ProfileManager.java
+17 -5
View File
@@ -28,6 +28,7 @@ import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.android.facet.AndroidFacet;
import org.jetbrains.android.sdk.AndroidPlatform;
@@ -424,14 +425,25 @@ public class ProfileManager {
locales.add(new LocaleData(null, null, language2Regions.isEmpty() ? "Any locale" : "Other locale"));
LocaleData newLocale = null;
if (myProfile.getLocaleLanguage() != null && myProfile.getLocaleRegion() != null) {
LocaleData oldLocale = new LocaleData(myProfile.getLocaleLanguage(), myProfile.getLocaleRegion(), "");
if (myProfile.getLocaleLanguage() != null || myProfile.getLocaleRegion() != null) {
String localeLanguage = myProfile.getLocaleLanguage();
String localeRegion = myProfile.getLocaleRegion();
LocaleData newLocaleWithoutRegion = null;
for (LocaleData locale : locales) {
if (locale.equals(oldLocale)) {
newLocale = locale;
break;
if (Comparing.equal(locale.getLanguage(), localeLanguage)) {
if (Comparing.equal(locale.getRegion(), localeRegion)) {
newLocale = locale;
break;
}
if (newLocaleWithoutRegion == null) {
newLocaleWithoutRegion = locale;
}
}
}
if (newLocale == null) {
newLocale = newLocaleWithoutRegion;
}
}
if (newLocale == null) {
Locale defaultLocale = Locale.getDefault();