MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the parseLocale function in SettingsService

Browse Source
This commit is contained in:
jvoisin
2019-10-24 21:42:50 +02:00
parent d2ad85447b
commit 1bc5729cfb
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java
+1 -16
View File
@@ -901,7 +901,7 @@ public class SettingsService {
String[] lines = StringUtil.readLines(in); String[] lines = StringUtil.readLines(in);
for (String line : lines) { for (String line : lines) {
locales.add(parseLocale(line)); locales.add(StringUtil.parseLocale(line));
} }
} catch (IOException x) { } catch (IOException x) {
@@ -912,21 +912,6 @@ public class SettingsService {
return locales.toArray(new Locale[locales.size()]); return locales.toArray(new Locale[locales.size()]);
} }
private Locale parseLocale(String line) {
String[] s = line.split("_");
String language = s[0];
String country = "";
String variant = "";
if (s.length > 1) {
country = s[1];
}
if (s.length > 2) {
variant = s[2];
}
return new Locale(language, country, variant);
}
/** /**
* Returns the "brand" name. Normally, this is just "Airsonic". * Returns the "brand" name. Normally, this is just "Airsonic".
* *