mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-10-29 11:47:01 +00:00
Code Issues Projects Releases Wiki Activity

LanguagePlugin: Use locale.getDisplayName()

Browse Source
This commit is contained in:
Sergey Ponomarev 2025-07-26 08:37:18 +03:00 committed by Guus der Kinderen
parent 4499d1eaf2
commit 68ce7b08ae
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/org/jivesoftware/sparkimpl/plugin/language/LanguagePlugin.java
View File

@ -45,11 +45,12 @@ public class LanguagePlugin implements Plugin {
// Load files
for (final Locale locale : locales) {
String code = locale.toString();
final String targetI18nFileName;
if (locale.toString().equals("en")) {
if (code.equals("en")) {
targetI18nFileName = "/i18n/spark_i18n.properties";
} else {
targetI18nFileName = "/i18n/spark_i18n_" + locale.toString() + ".properties";
targetI18nFileName = "/i18n/spark_i18n_" + code + ".properties";
}
// If we can find an translation file for this locale, we can support the language!
@ -80,10 +81,7 @@ public class LanguagePlugin implements Plugin {
}
}
};
String label = locale.getDisplayLanguage(locale);
if (!locale.getDisplayCountry(locale).isEmpty()) {
label = label + "-" + locale.getDisplayCountry(locale);
}
String label = locale.getDisplayName(locale);
action.putValue(Action.NAME, label);
languageMenu.add(action);
}