Merge branch 'development' into #13070-Add_import_and_export_for_self…

…_reporting
SORMAS-Foundation · Jun 3, 2024 · d7ec8bc · d7ec8bc
2 parents 1dfbf84 + 8573b3a
commit d7ec8bc
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 2 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/Language.java b/sormas-api/src/main/java/de/symeda/sormas/api/Language.java
@@ -19,6 +19,7 @@ public enum Language {
 	FR_TN(new Locale("fr", "TN"), "dd/MM/yyyy", "dd/MM/yyyy HH:mm", "dd/MM"),
 	DE(new Locale("de", "DE"), "dd.MM.yyyy", "dd.MM.yyyy HH:mm", "dd.MM"),
 	DE_CH(new Locale("de", "CH"), "dd.MM.yyyy", "dd.MM.yyyy HH:mm", "dd.MM"),
+	ES_BO(new Locale("es", "BO"), "dd/MM/yyyy", "dd/MM/yyyy H:mm", "dd/MM"),
 	ES_EC(new Locale("es", "EC"), "dd/MM/yyyy", "dd/MM/yyyy H:mm", "dd/MM"),
 	ES_CU(new Locale("es", "CU"), "dd/MM/yyyy", "dd/MM/yyyy H:mm", "dd/MM"),
 	IT(new Locale("it", "IT"), "dd/MM/yyyy", "dd/MM/yyyy H:mm", "dd/MM"),

diff --git a/sormas-api/src/main/resources/enum.properties b/sormas-api/src/main/resources/enum.properties
@@ -878,6 +878,7 @@ Language.EN_NG = English (Nigeria)
 Language.EN_GH = English (Ghana)
 Language.FR = Français
 Language.DE = Deutsch
+Language.ES_BO = Español (Bolivia)
 Language.ES_EC = Español (Ecuador)
 Language.ES_CU = Español (Cuba)
 Language.FI = Suomi

diff --git a/sormas-api/src/test/java/de/symeda/sormas/api/LanguageTest.java b/sormas-api/src/test/java/de/symeda/sormas/api/LanguageTest.java
@@ -44,7 +44,7 @@ public void testFromLocaleString() {
 		assertThat(Language.fromLocaleString("de"), is(Language.DE));
 		assertThat(Language.fromLocaleString("DE"), is(Language.DE));
 		assertThat(Language.fromLocaleString("fi"), is(Language.FI));
-		assertThat(Language.fromLocaleString("es"), is(Language.ES_EC));
+		assertThat(Language.fromLocaleString("es"), is(Language.ES_BO));
 		assertThat(Language.fromLocaleString("fr"), is(Language.FR));
 		assertThat(Language.fromLocaleString("it"), is(Language.IT));
 

diff --git a/sormas-rest/swagger.json b/sormas-rest/swagger.json
@@ -25045,7 +25045,7 @@
           },
           "language" : {
             "type" : "string",
-            "enum" : [ "EN", "EN_NG", "EN_GH", "EN_AF", "FR", "FR_CH", "FR_TN", "DE", "DE_CH", "ES_EC", "ES_CU", "IT", "IT_CH", "FI", "PS", "FA", "CZ", "UR_PK" ]
+            "enum" : [ "EN", "EN_NG", "EN_GH", "EN_AF", "FR", "FR_CH", "FR_TN", "DE", "DE_CH", "ES_BO", "ES_EC", "ES_CU", "IT", "IT_CH", "FI", "PS", "FA", "CZ", "UR_PK" ]
           },
           "lastName" : {
             "type" : "string",

diff --git a/sormas-rest/swagger.yaml b/sormas-rest/swagger.yaml
@@ -25083,6 +25083,7 @@ components:
           - FR_TN
           - DE
           - DE_CH
+          - ES_BO
           - ES_EC
           - ES_CU
           - IT

diff --git a/sormas-ui/src/main/webapp/VAADIN/themes/sormas/img/flag-icons/es_bo.png b/sormas-ui/src/main/webapp/VAADIN/themes/sormas/img/flag-icons/es_bo.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -25083,6 +25083,7 @@ components: @@
               - FR_TN
               - DE
               - DE_CH
+              - ES_BO
               - ES_EC
               - ES_CU
               - IT
@@ Expand Down @@