From 88b01ca56316cfa434b5a6835872072537e7d24a Mon Sep 17 00:00:00 2001 From: "Eugene E. Kashpureff Jr" Date: Sun, 15 May 2016 20:08:34 +0000 Subject: [PATCH] More regex path-fixes --- .../java/org/libresonic/player/dao/schema/hsql/Schema35.java | 2 +- .../java/org/libresonic/player/service/SettingsService.java | 4 ++-- .../test/java/org/libresonic/player/MissingTranslations.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema35.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema35.java index fd0ab7a0..c7244686 100644 --- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema35.java +++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema35.java @@ -151,4 +151,4 @@ public class Schema35 extends Schema { } } } -} \ No newline at end of file +} diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java b/libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java index 2295b9a7..894dadf2 100644 --- a/libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java +++ b/libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java @@ -218,8 +218,8 @@ public class SettingsService { "VideoMask", "CoverArtMask, HlsCommand", "HlsCommand2", "JukeboxCommand", "UrlRedirectTrialExpires", "VideoTrialExpires", "CoverArtFileTypes", "UrlRedirectCustomHost", "CoverArtLimit", "StreamPort"); - private static final String LOCALES_FILE = "/org.libresonic.player/i18n/locales.txt"; - private static final String THEMES_FILE = "/org.libresonic.player/theme/themes.txt"; + private static final String LOCALES_FILE = "/org/libresonic/player/i18n/locales.txt"; + private static final String THEMES_FILE = "/org/libresonic/player/theme/themes.txt"; private static final Logger LOG = Logger.getLogger(SettingsService.class); diff --git a/libresonic-main/src/test/java/org/libresonic/player/MissingTranslations.java b/libresonic-main/src/test/java/org/libresonic/player/MissingTranslations.java index e6fc7b25..7c67efc4 100644 --- a/libresonic-main/src/test/java/org/libresonic/player/MissingTranslations.java +++ b/libresonic-main/src/test/java/org/libresonic/player/MissingTranslations.java @@ -19,11 +19,11 @@ public class MissingTranslations { private static void diff(String locale1, String locale2) throws IOException { Properties en = new Properties(); - en.load(MissingTranslations.class.getResourceAsStream("/org.libresonic.player/i18n/ResourceBundle_" + locale1 + ".properties")); + en.load(MissingTranslations.class.getResourceAsStream("/org/libresonic/player/i18n/ResourceBundle_" + locale1 + ".properties")); SortedMap enSorted = new TreeMap(en); Properties mk = new Properties(); - mk.load(MissingTranslations.class.getResourceAsStream("/org.libresonic.player/i18n/ResourceBundle_" + locale2 + ".properties")); + mk.load(MissingTranslations.class.getResourceAsStream("/org/libresonic/player/i18n/ResourceBundle_" + locale2 + ".properties")); System.out.println("\nMessages present in locale " + locale1 + " and missing in locale " + locale2 + ":"); int count = 0;