More regex path-fixes

master
Eugene E. Kashpureff Jr 9 years ago
parent ab0ac29be8
commit 88b01ca563
  1. 2
      libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema35.java
  2. 4
      libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java
  3. 4
      libresonic-main/src/test/java/org/libresonic/player/MissingTranslations.java

@ -151,4 +151,4 @@ public class Schema35 extends Schema {
}
}
}
}
}

@ -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);

@ -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<Object,Object> enSorted = new TreeMap<Object, Object>(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;

Loading…
Cancel
Save