Merge branch 'feature-2735-CloneChildEntitiesForContactCaseConversion' into development

Author: MateStrysewske

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/config/ConfigProvider.java

@@ -37,6 +37,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import javax.crypto.Cipher;
@@ -79,6 +80,8 @@ public final class ConfigProvider {
 	private static String SERVER_LOCALE = "locale";
 	private static String INITIAL_SYNC_REQUIRED = "initialSyncRequired";
 
+	private static final String FULL_COUNTRY_LOCALE_PATTERN = "[a-zA-Z]*-[a-zA-Z]*";
+
 	public static ConfigProvider instance = null;
 
 	public static void init(Context context) {
@@ -645,7 +648,11 @@ public static String getServerLocale() {
 	}
 
 	public static boolean isGermanServer() {
-		return getServerLocale().toLowerCase().startsWith("de");
+		if (Pattern.matches(FULL_COUNTRY_LOCALE_PATTERN, getServerLocale())) {
+			return getServerLocale().toLowerCase().endsWith("de");
+		} else {
+			return getServerLocale().toLowerCase().startsWith("de");
+		}
 	}
 
 	/**

sormas-backend/src/main/java/de/symeda/sormas/backend/common/ConfigFacadeEjb.java

@@ -17,20 +17,6 @@
  *******************************************************************************/
 package de.symeda.sormas.backend.common;
 
-import java.util.Locale;
-import java.util.Properties;
-
-import java.util.regex.Pattern;
-
-import javax.annotation.Resource;
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.validator.routines.UrlValidator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import de.symeda.sormas.api.ConfigFacade;
 import de.symeda.sormas.api.Language;
 import de.symeda.sormas.api.person.PersonHelper;
@@ -39,6 +25,17 @@
 import de.symeda.sormas.api.utils.DataHelper;
 import de.symeda.sormas.api.utils.InfoProvider;
 import de.symeda.sormas.api.utils.VersionHelper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.validator.routines.UrlValidator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Resource;
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.regex.Pattern;
 
 /**
  * Provides the application configuration settings
@@ -171,21 +168,20 @@ static String normalizeLocaleString(String locale) {
 
 	@Override
 	public boolean isGermanServer() {
-		return getCountryLocale().startsWith("de");
+		if (Pattern.matches(FULL_COUNTRY_LOCALE_PATTERN, getCountryLocale())) {
+			return getCountryLocale().toLowerCase().endsWith("de");
+		} else {
+			return getCountryLocale().toLowerCase().startsWith("de");
+		}
 	}
 
 	@Override
 	public boolean isSwissServer() {
 		if (Pattern.matches(FULL_COUNTRY_LOCALE_PATTERN, getCountryLocale())) {
-			if (getCountryLocale().toLowerCase().endsWith("ch")) {
-				return true;
-			}
+			return getCountryLocale().toLowerCase().endsWith("ch");
 		} else {
-			if (getCountryLocale().toLowerCase().startsWith("ch")) {
-				return true;
-			}
+			return getCountryLocale().toLowerCase().startsWith("ch");
 		}
-		return false;
 	}
 
 	@Override