mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of all locales

Browse Source
This commit is contained in:
Manfred Karrer 2016-10-09 18:33:42 +02:00
parent 3361de2c72
commit da50166865
3 changed files with 181 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/io/bitsquare/locale/CountryUtil.java
View File

@ -23,10 +23,7 @@ import io.bitsquare.user.Preferences;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.*;
import java.util.stream.Collectors;
public class CountryUtil {
@ -145,8 +142,15 @@ public class CountryUtil {
private static List<Locale> getAllCountryLocales() {
List<Locale> allLocales = LocaleUtil.getAllLocales();
allLocales.sort((locale1, locale2) -> locale1.getDisplayCountry().compareTo(locale2.getDisplayCountry()));
return allLocales;
// Filter duplicate locale entries
Set<Locale> allLocalesAsSet = allLocales.stream().filter(locale -> !locale.getCountry().isEmpty())
.collect(Collectors.toSet());
List<Locale> allCountryLocales = new ArrayList<>();
allCountryLocales.addAll(allLocalesAsSet);
allCountryLocales.sort((locale1, locale2) -> locale1.getDisplayCountry().compareTo(locale2.getDisplayCountry()));
return allCountryLocales;
}
private static List<String> getNamesByCodes(List<String> countryCodes) {

14
core/src/main/java/io/bitsquare/locale/LanguageUtil.java
View File

@ -33,15 +33,15 @@ public class LanguageUtil {
public static List<String> getAllLanguageCodes() {
List<Locale> allLocales = LocaleUtil.getAllLocales();
final Set<String> allLocaleCodesAsSet = allLocales.stream()
.filter(locale -> !"".equals(locale.getLanguage()) && !"".equals(locale.getDisplayLanguage()))
.map(locale -> new Locale(locale.getLanguage(), "").getLanguage())
// Filter duplicate locale entries
Set<String> allLocalesAsSet = allLocales.stream().filter(locale -> !locale.getLanguage().isEmpty() && !locale.getDisplayLanguage().isEmpty())
.map(locale -> locale.getLanguage())
.collect(Collectors.toSet());
List<String> allLocaleCodes = new ArrayList<>();
allLocaleCodes.addAll(allLocaleCodesAsSet);
allLocaleCodes.sort((o1, o2) -> getDisplayName(o1).compareTo(getDisplayName(o2)));
return allLocaleCodes;
List<String> allLanguageCodes = new ArrayList<>();
allLanguageCodes.addAll(allLocalesAsSet);
allLanguageCodes.sort((o1, o2) -> getDisplayName(o1).compareTo(getDisplayName(o2)));
return allLanguageCodes;
}
public static String getDefaultLanguage() {

263
core/src/main/java/io/bitsquare/locale/LocaleUtil.java
View File

@ -28,107 +28,172 @@ public class LocaleUtil {
private static final Logger log = LoggerFactory.getLogger(LocaleUtil.class);
public static List<Locale> getAllLocales() {
// derived form Locale.getAvailableLocales() and added some missing locales
List<Locale> allLocales = new ArrayList<>();
allLocales.add(new Locale("", "AE", ""));
allLocales.add(new Locale("", "AL", ""));
allLocales.add(new Locale("", "AR", ""));
allLocales.add(new Locale("", "AT", ""));
allLocales.add(new Locale("", "AU", ""));
allLocales.add(new Locale("", "BA", ""));
allLocales.add(new Locale("", "BE", ""));
allLocales.add(new Locale("", "BG", ""));
allLocales.add(new Locale("", "BH", ""));
allLocales.add(new Locale("", "BO", ""));
allLocales.add(new Locale("", "BR", ""));
allLocales.add(new Locale("", "BY", ""));
allLocales.add(new Locale("", "CA", ""));
allLocales.add(new Locale("", "CH", ""));
allLocales.add(new Locale("", "CL", ""));
allLocales.add(new Locale("", "CN", ""));
allLocales.add(new Locale("", "CO", ""));
allLocales.add(new Locale("", "CR", ""));
allLocales.add(new Locale("", "CS", ""));
allLocales.add(new Locale("", "CU", ""));
allLocales.add(new Locale("", "CY", ""));
allLocales.add(new Locale("", "CZ", ""));
allLocales.add(new Locale("", "DE", ""));
allLocales.add(new Locale("", "DK", ""));
allLocales.add(new Locale("", "DO", ""));
allLocales.add(new Locale("", "DZ", ""));
allLocales.add(new Locale("", "EC", ""));
allLocales.add(new Locale("", "EE", ""));
allLocales.add(new Locale("", "EG", ""));
allLocales.add(new Locale("", "ES", ""));
allLocales.add(new Locale("", "FI", ""));
allLocales.add(new Locale("", "FR", ""));
allLocales.add(new Locale("", "GB", ""));
allLocales.add(new Locale("", "GR", ""));
allLocales.add(new Locale("", "GT", ""));
allLocales.add(new Locale("", "HK", ""));
allLocales.add(new Locale("", "HN", ""));
allLocales.add(new Locale("", "HR", ""));
allLocales.add(new Locale("", "HU", ""));
allLocales.add(new Locale("", "ID", ""));
allLocales.add(new Locale("", "IE", ""));
allLocales.add(new Locale("", "IL", ""));
allLocales.add(new Locale("", "IN", ""));
allLocales.add(new Locale("", "IQ", ""));
allLocales.add(new Locale("", "IS", ""));
allLocales.add(new Locale("", "IT", ""));
allLocales.add(new Locale("", "JO", ""));
allLocales.add(new Locale("", "JP", ""));
allLocales.add(new Locale("", "KH", ""));
allLocales.add(new Locale("", "KR", ""));
allLocales.add(new Locale("", "KW", ""));
allLocales.add(new Locale("", "KZ", ""));
allLocales.add(new Locale("", "LB", ""));
allLocales.add(new Locale("", "LT", ""));
allLocales.add(new Locale("", "LU", ""));
allLocales.add(new Locale("", "LV", ""));
allLocales.add(new Locale("", "LY", ""));
allLocales.add(new Locale("", "MA", ""));
allLocales.add(new Locale("", "MD", ""));
allLocales.add(new Locale("", "ME", ""));
allLocales.add(new Locale("", "MK", ""));
allLocales.add(new Locale("", "MT", ""));
allLocales.add(new Locale("", "MX", ""));
allLocales.add(new Locale("", "MY", ""));
allLocales.add(new Locale("", "NI", ""));
allLocales.add(new Locale("", "NL", ""));
allLocales.add(new Locale("", "NO", ""));
allLocales.add(new Locale("", "NZ", ""));
allLocales.add(new Locale("", "OM", ""));
allLocales.add(new Locale("", "PA", ""));
allLocales.add(new Locale("", "PE", ""));
allLocales.add(new Locale("", "PH", ""));
allLocales.add(new Locale("", "PL", ""));
allLocales.add(new Locale("", "PR", ""));
allLocales.add(new Locale("", "PT", ""));
allLocales.add(new Locale("", "PY", ""));
allLocales.add(new Locale("", "QA", ""));
allLocales.add(new Locale("", "RO", ""));
allLocales.add(new Locale("", "RS", ""));
allLocales.add(new Locale("", "RU", ""));
allLocales.add(new Locale("", "SA", ""));
allLocales.add(new Locale("", "SD", ""));
allLocales.add(new Locale("", "SE", ""));
allLocales.add(new Locale("", "SG", ""));
allLocales.add(new Locale("", "SI", ""));
allLocales.add(new Locale("", "SK", ""));
allLocales.add(new Locale("", "SV", ""));
allLocales.add(new Locale("", "SY", ""));
allLocales.add(new Locale("", "TH", ""));
allLocales.add(new Locale("", "TN", ""));
allLocales.add(new Locale("", "TR", ""));
allLocales.add(new Locale("", "TW", ""));
allLocales.add(new Locale("", "UA", ""));
allLocales.add(new Locale("", "US", ""));
allLocales.add(new Locale("", "UY", ""));
allLocales.add(new Locale("", "VE", ""));
allLocales.add(new Locale("", "VN", ""));
allLocales.add(new Locale("", "YE", ""));
allLocales.add(new Locale("", "ZA", ""));
allLocales.add(new Locale("bg", "", ""));
allLocales.add(new Locale("it", "", ""));
allLocales.add(new Locale("ko", "", ""));
allLocales.add(new Locale("uk", "", ""));
allLocales.add(new Locale("lv", "", ""));
allLocales.add(new Locale("pt", "", ""));
allLocales.add(new Locale("sk", "", ""));
allLocales.add(new Locale("ga", "", ""));
allLocales.add(new Locale("et", "", ""));
allLocales.add(new Locale("sv", "", ""));
allLocales.add(new Locale("cs", "", ""));
allLocales.add(new Locale("el", "", ""));
allLocales.add(new Locale("hu", "", ""));
allLocales.add(new Locale("in", "", ""));
allLocales.add(new Locale("be", "", ""));
allLocales.add(new Locale("es", "", ""));
allLocales.add(new Locale("tr", "", ""));
allLocales.add(new Locale("hr", "", ""));
allLocales.add(new Locale("lt", "", ""));
allLocales.add(new Locale("sq", "", ""));
allLocales.add(new Locale("fr", "", ""));
allLocales.add(new Locale("ja", "", ""));
allLocales.add(new Locale("is", "", ""));
allLocales.add(new Locale("de", "", ""));
allLocales.add(new Locale("en", "", ""));
allLocales.add(new Locale("ca", "", ""));
allLocales.add(new Locale("sl", "", ""));
allLocales.add(new Locale("fi", "", ""));
allLocales.add(new Locale("mk", "", ""));
allLocales.add(new Locale("sr", "", ""));
allLocales.add(new Locale("th", "", ""));
allLocales.add(new Locale("ar", "", ""));
allLocales.add(new Locale("ru", "", ""));
allLocales.add(new Locale("ms", "", ""));
allLocales.add(new Locale("hi", "", ""));
allLocales.add(new Locale("nl", "", ""));
allLocales.add(new Locale("vi", "", ""));
allLocales.add(new Locale("sr", "", ""));
allLocales.add(new Locale("mt", "", ""));
allLocales.add(new Locale("da", "", ""));
allLocales.add(new Locale("ro", "", ""));
allLocales.add(new Locale("no", "", ""));
allLocales.add(new Locale("pl", "", ""));
allLocales.add(new Locale("iw", "", ""));
allLocales.add(new Locale("zh", "", ""));
allLocales.add(new Locale("ar", "AE", ""));
allLocales.add(new Locale("sq", "AL", ""));
allLocales.add(new Locale("es", "AR", ""));
allLocales.add(new Locale("de", "AT", ""));
allLocales.add(new Locale("en", "AU", ""));
allLocales.add(new Locale("sr", "BA", ""));
allLocales.add(new Locale("sr", "BA", ""));
allLocales.add(new Locale("fr", "BE", ""));
allLocales.add(new Locale("nl", "BE", ""));
allLocales.add(new Locale("bg", "BG", ""));
allLocales.add(new Locale("ar", "BH", ""));
allLocales.add(new Locale("es", "BO", ""));
allLocales.add(new Locale("pt", "BR", ""));
allLocales.add(new Locale("be", "BY", ""));
allLocales.add(new Locale("fr", "CA", ""));
allLocales.add(new Locale("en", "CA", ""));
allLocales.add(new Locale("fr", "CH", ""));
allLocales.add(new Locale("de", "CH", ""));
allLocales.add(new Locale("it", "CH", ""));
allLocales.add(new Locale("es", "CL", ""));
allLocales.add(new Locale("zh", "CN", ""));
allLocales.add(new Locale("es", "CO", ""));
allLocales.add(new Locale("es", "CR", ""));
allLocales.add(new Locale("sr", "CS", ""));
allLocales.add(new Locale("es", "CU", ""));
allLocales.add(new Locale("el", "CY", ""));
allLocales.add(new Locale("cs", "CZ", ""));
allLocales.add(new Locale("de", "DE", ""));
allLocales.add(new Locale("da", "DK", ""));
allLocales.add(new Locale("es", "DO", ""));
allLocales.add(new Locale("ar", "DZ", ""));
allLocales.add(new Locale("es", "EC", ""));
allLocales.add(new Locale("et", "EE", ""));
allLocales.add(new Locale("ar", "EG", ""));
allLocales.add(new Locale("ca", "ES", ""));
allLocales.add(new Locale("es", "ES", ""));
allLocales.add(new Locale("fi", "FI", ""));
allLocales.add(new Locale("fr", "FR", ""));
allLocales.add(new Locale("en", "GB", ""));
allLocales.add(new Locale("el", "GR", ""));
allLocales.add(new Locale("de", "GR", ""));
allLocales.add(new Locale("es", "GT", ""));
allLocales.add(new Locale("zh", "HK", ""));
allLocales.add(new Locale("es", "HN", ""));
allLocales.add(new Locale("hr", "HR", ""));
allLocales.add(new Locale("hu", "HU", ""));
allLocales.add(new Locale("in", "ID", ""));
allLocales.add(new Locale("ga", "IE", ""));
allLocales.add(new Locale("en", "IE", ""));
allLocales.add(new Locale("iw", "IL", ""));
allLocales.add(new Locale("hi", "IN", ""));
allLocales.add(new Locale("en", "IN", ""));
allLocales.add(new Locale("ar", "IQ", ""));
allLocales.add(new Locale("is", "IS", ""));
allLocales.add(new Locale("it", "IT", ""));
allLocales.add(new Locale("ar", "JO", ""));
allLocales.add(new Locale("ja", "JP", ""));
allLocales.add(new Locale("ja", "JP", ""));
allLocales.add(new Locale("km", "KH", ""));
allLocales.add(new Locale("ko", "KR", ""));
allLocales.add(new Locale("ar", "KW", ""));
allLocales.add(new Locale("kk", "KZ", ""));
allLocales.add(new Locale("ar", "LB", ""));
allLocales.add(new Locale("lt", "LT", ""));
allLocales.add(new Locale("fr", "LU", ""));
allLocales.add(new Locale("de", "LU", ""));
allLocales.add(new Locale("lv", "LV", ""));
allLocales.add(new Locale("ar", "LY", ""));
allLocales.add(new Locale("ar", "MA", ""));
allLocales.add(new Locale("ro", "MD", ""));
allLocales.add(new Locale("sr", "ME", ""));
allLocales.add(new Locale("sr", "ME", ""));
allLocales.add(new Locale("mk", "MK", ""));
allLocales.add(new Locale("mt", "MT", ""));
allLocales.add(new Locale("en", "MT", ""));
allLocales.add(new Locale("es", "MX", ""));
allLocales.add(new Locale("ms", "MY", ""));
allLocales.add(new Locale("es", "NI", ""));
allLocales.add(new Locale("nl", "NL", ""));
allLocales.add(new Locale("no", "NO", ""));
allLocales.add(new Locale("no", "NO", ""));
allLocales.add(new Locale("en", "NZ", ""));
allLocales.add(new Locale("ar", "OM", ""));
allLocales.add(new Locale("es", "PA", ""));
allLocales.add(new Locale("es", "PE", ""));
allLocales.add(new Locale("en", "PH", ""));
allLocales.add(new Locale("pl", "PL", ""));
allLocales.add(new Locale("es", "PR", ""));
allLocales.add(new Locale("pt", "PT", ""));
allLocales.add(new Locale("es", "PY", ""));
allLocales.add(new Locale("ar", "QA", ""));
allLocales.add(new Locale("ro", "RO", ""));
allLocales.add(new Locale("sr", "RS", ""));
allLocales.add(new Locale("sr", "RS", ""));
allLocales.add(new Locale("ru", "RU", ""));
allLocales.add(new Locale("ar", "SA", ""));
allLocales.add(new Locale("ar", "SD", ""));
allLocales.add(new Locale("sv", "SE", ""));
allLocales.add(new Locale("en", "SG", ""));
allLocales.add(new Locale("zh", "SG", ""));
allLocales.add(new Locale("sl", "SI", ""));
allLocales.add(new Locale("sk", "SK", ""));
allLocales.add(new Locale("es", "SV", ""));
allLocales.add(new Locale("ar", "SY", ""));
allLocales.add(new Locale("th", "TH", ""));
allLocales.add(new Locale("th", "TH", ""));
allLocales.add(new Locale("ar", "TN", ""));
allLocales.add(new Locale("tr", "TR", ""));
allLocales.add(new Locale("zh", "TW", ""));
allLocales.add(new Locale("uk", "UA", ""));
allLocales.add(new Locale("en", "US", ""));
allLocales.add(new Locale("es", "US", ""));
allLocales.add(new Locale("es", "UY", ""));
allLocales.add(new Locale("es", "VE", ""));
allLocales.add(new Locale("vi", "VN", ""));
allLocales.add(new Locale("ar", "YE", ""));
allLocales.add(new Locale("en", "ZA", ""));
return allLocales;
}