Revert "use defaultLocale value as default if it exists"

This reverts commit abf44df.
IQSS · Aug 12, 2020 · 37faf80 · 37faf80
1 parent abf44df
commit 37faf80
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
@@ -503,16 +503,15 @@ public boolean isThumbnailGenerationDisabledForPDF() {
     public String getApplicationTermsOfUse() {
         String language = BundleUtil.getCurrentLocale().getLanguage();
         String saneDefaultForAppTermsOfUse = BundleUtil.getStringFromBundle("system.app.terms");
-		// Get the value for the defaultLocale. IT will either be used as the return
-		// value, or as a better default than the saneDefaultForAppTermsOfUse if there
-		// is no language-specific value
-		String appTermsOfUse = settingsService.getValueForKey(SettingsServiceBean.Key.ApplicationTermsOfUse,
-				saneDefaultForAppTermsOfUse);
-		//Now get the language-specific value if it exists
-		if (!language.equalsIgnoreCase(BundleUtil.getDefaultLocale().getLanguage())) {
-			appTermsOfUse = settingsService.getValueForKey(SettingsServiceBean.Key.ApplicationTermsOfUse, language,
-					appTermsOfUse);
-		}
+        String appTermsOfUse = "";
+         if(language.equalsIgnoreCase(BundleUtil.getDefaultLocale().getLanguage()) )
+        {
+             appTermsOfUse = settingsService.getValueForKey(SettingsServiceBean.Key.ApplicationTermsOfUse, saneDefaultForAppTermsOfUse);
+        }
+        else
+        {
+            appTermsOfUse = settingsService.getValueForKey(SettingsServiceBean.Key.ApplicationTermsOfUse, language, saneDefaultForAppTermsOfUse);
+        }
         return appTermsOfUse;
     }