From 1bc5729cfb520b4f874bc766b1f6568e601bc9da Mon Sep 17 00:00:00 2001 From: jvoisin Date: Thu, 17 Oct 2019 23:24:53 +0200 Subject: [PATCH] Remove the parseLocale function in SettingsService --- .../player/service/SettingsService.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java b/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java index 5ee92d33..4f59ae06 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java @@ -901,7 +901,7 @@ public class SettingsService { String[] lines = StringUtil.readLines(in); for (String line : lines) { - locales.add(parseLocale(line)); + locales.add(StringUtil.parseLocale(line)); } } catch (IOException x) { @@ -912,21 +912,6 @@ public class SettingsService { 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". *