|
|
@ -116,12 +116,27 @@ public final class HTTPDFileHandler {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/** Returns a path to the localized or default file according to the locale.language (from he switchboard)
|
|
|
|
/** Returns a path to the localized or default file according to the locale.language (from he switchboard)
|
|
|
|
* @param path relative from htroot */
|
|
|
|
* @param path relative from htroot
|
|
|
|
public static File getLocalizedFile(final String path){
|
|
|
|
* @param clientLang preferred client language (browser setting), applied if config locale.language=browser
|
|
|
|
String localeSelection = switchboard.getConfig("locale.language","default");
|
|
|
|
*/
|
|
|
|
|
|
|
|
public static File getLocalizedFile(final String path, final String clientLang){
|
|
|
|
|
|
|
|
String localeSelection = switchboard.getConfig("locale.language", "browser");
|
|
|
|
if (!(localeSelection.equals("default"))) {
|
|
|
|
if (!(localeSelection.equals("default"))) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (localeSelection.equals("browser")) { // handle preferred language of client browser
|
|
|
|
|
|
|
|
if (clientLang != null && !clientLang.isEmpty()) {
|
|
|
|
|
|
|
|
final File localePath = new File(htLocalePath, clientLang + '/' + path);
|
|
|
|
|
|
|
|
if (localePath.exists()) { // on success return otherwise continue with default htDocsPath
|
|
|
|
|
|
|
|
return localePath; // avoid "NoSuchFile" troubles if the "localeSelection" is misspelled
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} else { // use language from switchboard config
|
|
|
|
|
|
|
|
|
|
|
|
final File localePath = new File(htLocalePath, localeSelection + '/' + path);
|
|
|
|
final File localePath = new File(htLocalePath, localeSelection + '/' + path);
|
|
|
|
if (localePath.exists()) return localePath; // avoid "NoSuchFile" troubles if the "localeSelection" is misspelled
|
|
|
|
if (localePath.exists()) {
|
|
|
|
|
|
|
|
return localePath; // avoid "NoSuchFile" troubles if the "localeSelection" is misspelled
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
final File docsPath = new File(htDocsPath, path);
|
|
|
|
final File docsPath = new File(htDocsPath, path);
|
|
|
@ -131,7 +146,7 @@ public final class HTTPDFileHandler {
|
|
|
|
|
|
|
|
|
|
|
|
public static final File getOverlayedFile(final String path) {
|
|
|
|
public static final File getOverlayedFile(final String path) {
|
|
|
|
File targetFile;
|
|
|
|
File targetFile;
|
|
|
|
targetFile = getLocalizedFile(path);
|
|
|
|
targetFile = getLocalizedFile(path, null);
|
|
|
|
if (!targetFile.exists()) {
|
|
|
|
if (!targetFile.exists()) {
|
|
|
|
targetFile = new File(htDocsPath, path);
|
|
|
|
targetFile = new File(htDocsPath, path);
|
|
|
|
}
|
|
|
|
}
|
|
|
|