SORMAS-Foundation#3610 fix captions and merge issues

Author: lgal

sormas-api/src/main/java/de/symeda/sormas/api/caze/InfectionSetting.java

@@ -20,11 +20,11 @@
 public enum InfectionSetting {
 
 	UNKNOWN(null),
-	AMBULANT(null),
-	MEDICAL_PRACTICE(AMBULANT),
-	OPERATIVE_1200(AMBULANT),
-	HOSPITAL_1300(AMBULANT),
-	OTHER_OUTPATIENT_FACILITY(AMBULANT),
+	AMBULATORY(null),
+	MEDICAL_PRACTICE(AMBULATORY),
+	OPERATIVE_1200(AMBULATORY),
+	HOSPITAL_1300(AMBULATORY),
+	OTHER_OUTPATIENT_FACILITY(AMBULATORY),
 	STATIONARY(null),
 	HOSPITAL_2100(STATIONARY),
 	NORMAL_WARD(HOSPITAL_2100),

sormas-api/src/main/resources/captions_de-DE.properties

@@ -390,7 +390,7 @@ CaseData.quarantineReasonBeforeIsolationDetails=Anderer Grund
 CaseData.endOfIsolationReason=Grund für das Ende der Isolation
 CaseData.endOfIsolationReasonDetails=Anderer Grund
 CaseData.sormasToSormasOriginInfo=Geteilt von
-CaseData.nosocomialOutbreak=Nosocomialer Ausbruch
+CaseData.nosocomialOutbreak=Nosokomialer Ausbruch
 CaseData.infectionSetting=Infektionsumfeld
 
 # CaseExport

sormas-api/src/main/resources/enum.properties

@@ -1220,8 +1220,9 @@ EndOfQuarantineReason.ISOLATED_AS_CASE=Isolated as Case
 EndOfQuarantineReason.LOST_TO_FOLLOWUP=Lost to follow-up
 EndOfQuarantineReason.OTHER=Other
 
+#InfectionSetting
 InfectionSetting.UNKNOWN=Unknown
-InfectionSetting.AMBULANT=Ambulant
+InfectionSetting.AMBULANT=Ambulatory
 InfectionSetting.MEDICAL_PRACTICE=Medical practice
 InfectionSetting.OPERATIVE_1200=Operative
 InfectionSetting.HOSPITAL_1300=Hospital
@@ -1234,7 +1235,7 @@ InfectionSetting.NOT_OPERATIVE=Non-operative
 InfectionSetting.HEMATOLOGICAL_ONCOLOGY=Hematological oncology
 InfectionSetting.CHILDREN_WARD=Children's ward
 InfectionSetting.NEONATOLOGY=Neonatology
-InfectionSetting.INTENSIVE_CARE_UNIT=Intensive Care Unit
+InfectionSetting.INTENSIVE_CARE_UNIT=Intensive care unit
 InfectionSetting.OTHER_STATION=Other station
 InfectionSetting.NURSING_HOME=Nursing home
 InfectionSetting.REHAB_FACILITY=Rehab facility

sormas-api/src/main/resources/enum_de-DE.properties

@@ -1215,22 +1215,23 @@ EndOfQuarantineReason.ISOLATED_AS_CASE=Als Fall isoliert
 EndOfQuarantineReason.LOST_TO_FOLLOWUP=Keine Nachverfolgung möglich
 EndOfQuarantineReason.OTHER=Sonstiges
 
+#InfectionSetting
 InfectionSetting.UNKNOWN=Nicht erhoben
 InfectionSetting.AMBULANT=Ambulant
 InfectionSetting.MEDICAL_PRACTICE=Arztpraxis
 InfectionSetting.OPERATIVE_1200=Operativ
 InfectionSetting.HOSPITAL_1300=Krankenhaus
-InfectionSetting.OTHER_OUTPATIENT_FACILITY=Sonstige Ambulante Einrichtung
+InfectionSetting.OTHER_OUTPATIENT_FACILITY=Sonstige ambulante Einrichtung
 InfectionSetting.STATIONARY=Stationär
 InfectionSetting.HOSPITAL_2100=Krankenhaus
 InfectionSetting.NORMAL_WARD=Normalstation
 InfectionSetting.OPERATIVE_2111=Operativ
-InfectionSetting.NOT_OPERATIVE=Nicht Operativ
-InfectionSetting.HEMATOLOGICAL_ONCOLOGY=Hamatoonkologie
+InfectionSetting.NOT_OPERATIVE=Nicht operativ
+InfectionSetting.HEMATOLOGICAL_ONCOLOGY=Hämatoonkologie
 InfectionSetting.CHILDREN_WARD=Kinderstation
 InfectionSetting.NEONATOLOGY=Neonatologie
 InfectionSetting.INTENSIVE_CARE_UNIT=Intensivstation
 InfectionSetting.OTHER_STATION=Sonstige Station
-InfectionSetting.NURSING_HOME=Pflege Einrichtung
+InfectionSetting.NURSING_HOME=Pflegeeinrichtung
 InfectionSetting.REHAB_FACILITY=Reha-Einrichtung
-InfectionSetting.OTHER_STATIONARY_FACILITY=Sonstige Stationare Einrichtung
+InfectionSetting.OTHER_STATIONARY_FACILITY=Sonstige stationäre Einrichtung

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java

@@ -152,7 +152,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 	public static final String DATABASE_NAME = "sormas.db";
 	// any time you make changes to your database objects, you may have to increase the database version
 
-	public static final int DATABASE_VERSION = 249;
+	public static final int DATABASE_VERSION = 250;
 
 	private static DatabaseHelper instance = null;
 
@@ -1783,8 +1783,8 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 
 				getDao(Person.class).executeRaw("ALTER TABLE person ADD COLUMN armedForcesRelationType varchar(255);");
 
-				case 248:
-				currentVersion = 248;
+			case 249:
+				currentVersion = 249;
 
 				getDao(Case.class).executeRaw("ALTER TABLE cases ADD COLUMN nosocomialOutbreak boolean DEFAULT false");
 				getDao(Case.class).executeRaw("ALTER TABLE cases ADD COLUMN infectionSetting varchar(255)");