Revision: 7267
http://languagetool.svn.sourceforge.net/languagetool/?rev=7267&view=rev
Author: dnaber
Date: 2012-06-06 19:08:18 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
check the user's country setting to choose a more specific default
Modified Paths:
--------------
trunk/JLanguageTool/src/java/org/languagetool/gui/LanguageComboBox.java
Modified:
trunk/JLanguageTool/src/java/org/languagetool/gui/LanguageComboBox.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/gui/LanguageComboBox.java
2012-06-06 17:43:45 UTC (rev 7266)
+++ trunk/JLanguageTool/src/java/org/languagetool/gui/LanguageComboBox.java
2012-06-06 19:08:18 UTC (rev 7267)
@@ -53,8 +53,7 @@
}
private void preselectDefaultLanguage(List<I18nLanguage> i18nLanguages) {
- final String defaultLocale = Locale.getDefault().getLanguage();
- final String defaultGuiLocale = getDefaultGuiLanguage(defaultLocale);
+ final String defaultGuiLocale = getDefaultGuiLanguage(Locale.getDefault());
for (final I18nLanguage i18nLanguage : i18nLanguages) {
addItem(i18nLanguage);
if (i18nLanguage.toString().equals(defaultGuiLocale)) {
@@ -63,12 +62,17 @@
}
}
- private String getDefaultGuiLanguage(String defaultLocale) {
+ private String getDefaultGuiLanguage(Locale defaultLocale) {
String defaultGuiLocale = null;
try {
- defaultGuiLocale = messages.getString(defaultLocale);
+ defaultGuiLocale = messages.getString(defaultLocale.getLanguage() + "-"
+ defaultLocale.getCountry());
} catch (final MissingResourceException e) {
- // language not supported, so don't select a default
+ // this specific language/variant combination is not supported
+ try {
+ defaultGuiLocale = messages.getString(defaultLocale.getLanguage());
+ } catch (final MissingResourceException e2) {
+ // language not supported, so don't select a default
+ }
}
return defaultGuiLocale;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Languagetool-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
