aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-04-02 12:29:59 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-04-02 12:29:59 +0200
commitb9b2b0db99b6224e65490db346dfaa1c51c6f0c2 (patch)
treec18856a39fc5c2eebb4d0c63040fad4549f847d7
parente59dac9855fd03794d9b4052465f2bf41fa1bab9 (diff)
downloadmoa-id-spss-b9b2b0db99b6224e65490db346dfaa1c51c6f0c2.tar.gz
moa-id-spss-b9b2b0db99b6224e65490db346dfaa1c51c6f0c2.tar.bz2
moa-id-spss-b9b2b0db99b6224e65490db346dfaa1c51c6f0c2.zip
use German as default language
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java2
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
index 2dce3534f..e4cf5367d 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
@@ -380,7 +380,7 @@ public class ConfigurationProvider {
public String getDefaultLanguage() {
try {
- return props.getProperty("general.defaultlanguage").toLowerCase();
+ return props.getProperty("general.defaultlanguage", "de").toLowerCase();
} catch (Exception ex) {
return "de";
}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java
index 73b2708ae..62ba92539 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java
@@ -75,11 +75,11 @@ public class LanguageHelper {
}
public static String getGUIString(String code, HttpServletRequest request) {
- return guiRes_DE.getString(code);
+ return guiLanguage().getString(code);
}
public static String getGUIString(String code) {
- return guiRes_DE.getString(code);
+ return guiLanguage().getString(code);
}
public static String getErrorString(String code, HttpServletRequest request) {