From e26fcde7721e5903999c535611778af9bd2916da Mon Sep 17 00:00:00 2001 From: Obinna Henry <55580796+obinna-h-n@users.noreply.github.com> Date: Mon, 27 May 2024 10:55:37 +0100 Subject: [PATCH 1/2] =?UTF-8?q?#12941=20-=20Added=20"Espa=C3=B1ol=20(Boliv?= =?UTF-8?q?ia)"=20in=20UI=20for=20Spanish=20(Bolivia)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/de/symeda/sormas/api/Language.java | 1 + sormas-api/src/main/resources/enum.properties | 1 + .../themes/sormas/img/flag-icons/es_bo.png | Bin 0 -> 2073 bytes 3 files changed, 2 insertions(+) create mode 100644 sormas-ui/src/main/webapp/VAADIN/themes/sormas/img/flag-icons/es_bo.png 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 index c3a2bc768b7..c4c4ece19bc 100644 --- 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 index 004dcf723c3..ae14c47f5c1 100644 --- 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-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 new file mode 100644 index 0000000000000000000000000000000000000000..83a9efbd9f40b43a76aad1327d380dc674a41e88 GIT binary patch literal 2073 zcmV+!2RP)L&g*GwX#R*`XnX(y|vf_VpaZMaNrw1`#JW(Z4?0k@k1aw z7$AcMBver4kC#w^WUQqMk38OEDi0h_F+YwGPZ1vt@zLmGpOXvVU^sgIDPDc)`v42T zRs%rgfTT#ecNZ6FsWB_zfVmS^&QsR4YX1Ou2*k|?#Cz-LECaB$2_XQHy#N4l{SLOX z4KoZtT)#uNvReSmVZ3%5v4o4voai~=?$m3yai0Q!1D+D3gv}@e+#OOnfB}G;ff+J` z44?oYZrDL3&@jM7m^BKxPZ%&2fYdS|1K=~t05_Xn0$u>{lxDgM1o!D87~M&+M$>F} z0a7F#D1z>o8K|P}GYNp3PuGCepDwZTe4ii-Xehp2W~u(c%?Z6et6y7$AB^^uK!TJK zqBV$8_78|2KMIvPB2Xtm6{^a?g}UakiLY5+{eWRMg#mT#m_>{PVrY~2V>qMt-tY0j z(E0M!$kqel_iqMP7L8}G7*%!rUzu0GDS=3u27p;+fRYdq%t2L)Vjj;ai9i*MVIBCz z^&U5VGve=W8@qA9i{DB-`%D4^x8omqxI4*=3L~XyT_A#4BoP5YRdBaf2ac)-B2HZg zHg*>|Z##VcymE8>IY#xnJpV$U@4m3Z{Y_XJ?9!_e?s9Ca-z@>Rh$Wv=0?~;vAt526 zZPFrg^=4te$>{f4n+o?Oz+Le&r08FKx4Q zYK$EbgeH0S41k&Ao~WlWppKAIM2Uzf?pdHjK#MaxED#AewKQVmwJrR{4r@PrlIy*1 z^QF%&Ak`UOxw*u5c7Da+`UW43c6sKd0cmW^47Lf)mQlIt-sOho#uIOD~<*RV+#{-r&6PHJ0&X4{;+;txOs87}FGguBR ze=1=^JCgHopWLkR|9RGfTO!6OC6EtHxEpzHP>3(Zn5dA8!4GwE4h#Z(=BY$4fGCVd zeE^;w7R{`{KfyC2L6BzUC$#{{ zSvmV8Z{An~9_*V4IoTvwZWTGvyy|FHKeKYl?9heqzXQPC%Mi4T`m!4$S=zI;sk;0$ zZvYTb#obYpM*4A;PJj7?Pd~DU!#WIbv&sMa0T9RlbPf=Nqyi?nEG&Bg{LxcmeT|Wgq0A~3juNjy>bbQr4(9B7e5YM%rvutdzmv&g5_J?WLe$-fjJ0O|X)Rfn!I)pAL zo@=xf!NP#72}a8P_y7jDk=zi^y8*GXnH7+>{bfVcTyxiwgo;kJzyDRSK0;O+08=ps zU5A|fVaM3Cx;-Ue6K7<0AOrH7o5^V_dS-}9yQh}o2O2TlPj?k*!4Ra?gDyai@)2Do zw3-Bja=ekBb9V&tigp0Zd0H_;x&KRB2Kh4|(FO9@C~pND@hi*Sv_RGN%chB)bO2Bh zf@(=1w6Dv))!j?=&KA~FKA#Tt^J{q_vbphg;?sy<+xv?SSeF4DPy${6a3&iGm10ZX z5z(^p~t=}JQ>2Ym=M?J&XitbCJHAWCY%z{_wZ)#WEIla+50YpgsC zlgUhJ#IOPIApn8~f(Vsp&b(Fp{8&}-l1Q73YMWrMxepb+P!%vH05tdAvN)*CHH#1} z5zF|dVZyj1F9pE5EJ~hQdA`Wo>{_JL^Og2}K|_0WsG7{`1FK7C8T1Fa=7l^PEW1Gs zc|Im845~hh{RR4=Vo>!7qV!ABgR0*G(9;T4$xH~7A4i2Lg4q?ey8JjQ8#AZ2*a9(% zV@9zirNk(X*&Oarr$|f*C?hYMlz`KCn#_XL<#T+ff$@F-2Fs_o^TsVywG2XKviFw> zBSeHDaR2{x*=XOeucdT(+|u3mwo)nV`sZ6~^s62_`?}9EaIxH Date: Mon, 27 May 2024 10:55:37 +0100 Subject: [PATCH 2/2] =?UTF-8?q?#12941=20-=20Added=20"Espa=C3=B1ol=20(Boliv?= =?UTF-8?q?ia)"=20in=20UI=20for=20Spanish=20(Bolivia)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/de/symeda/sormas/api/Language.java | 1 + sormas-api/src/main/resources/enum.properties | 1 + .../java/de/symeda/sormas/api/LanguageTest.java | 2 +- .../themes/sormas/img/flag-icons/es_bo.png | Bin 0 -> 2073 bytes 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 sormas-ui/src/main/webapp/VAADIN/themes/sormas/img/flag-icons/es_bo.png 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 index c3a2bc768b7..c4c4ece19bc 100644 --- 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 index 004dcf723c3..ae14c47f5c1 100644 --- 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 index de01b1f410f..2029ac07dc8 100644 --- 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-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 new file mode 100644 index 0000000000000000000000000000000000000000..83a9efbd9f40b43a76aad1327d380dc674a41e88 GIT binary patch literal 2073 zcmV+!2RP)L&g*GwX#R*`XnX(y|vf_VpaZMaNrw1`#JW(Z4?0k@k1aw z7$AcMBver4kC#w^WUQqMk38OEDi0h_F+YwGPZ1vt@zLmGpOXvVU^sgIDPDc)`v42T zRs%rgfTT#ecNZ6FsWB_zfVmS^&QsR4YX1Ou2*k|?#Cz-LECaB$2_XQHy#N4l{SLOX z4KoZtT)#uNvReSmVZ3%5v4o4voai~=?$m3yai0Q!1D+D3gv}@e+#OOnfB}G;ff+J` z44?oYZrDL3&@jM7m^BKxPZ%&2fYdS|1K=~t05_Xn0$u>{lxDgM1o!D87~M&+M$>F} z0a7F#D1z>o8K|P}GYNp3PuGCepDwZTe4ii-Xehp2W~u(c%?Z6et6y7$AB^^uK!TJK zqBV$8_78|2KMIvPB2Xtm6{^a?g}UakiLY5+{eWRMg#mT#m_>{PVrY~2V>qMt-tY0j z(E0M!$kqel_iqMP7L8}G7*%!rUzu0GDS=3u27p;+fRYdq%t2L)Vjj;ai9i*MVIBCz z^&U5VGve=W8@qA9i{DB-`%D4^x8omqxI4*=3L~XyT_A#4BoP5YRdBaf2ac)-B2HZg zHg*>|Z##VcymE8>IY#xnJpV$U@4m3Z{Y_XJ?9!_e?s9Ca-z@>Rh$Wv=0?~;vAt526 zZPFrg^=4te$>{f4n+o?Oz+Le&r08FKx4Q zYK$EbgeH0S41k&Ao~WlWppKAIM2Uzf?pdHjK#MaxED#AewKQVmwJrR{4r@PrlIy*1 z^QF%&Ak`UOxw*u5c7Da+`UW43c6sKd0cmW^47Lf)mQlIt-sOho#uIOD~<*RV+#{-r&6PHJ0&X4{;+;txOs87}FGguBR ze=1=^JCgHopWLkR|9RGfTO!6OC6EtHxEpzHP>3(Zn5dA8!4GwE4h#Z(=BY$4fGCVd zeE^;w7R{`{KfyC2L6BzUC$#{{ zSvmV8Z{An~9_*V4IoTvwZWTGvyy|FHKeKYl?9heqzXQPC%Mi4T`m!4$S=zI;sk;0$ zZvYTb#obYpM*4A;PJj7?Pd~DU!#WIbv&sMa0T9RlbPf=Nqyi?nEG&Bg{LxcmeT|Wgq0A~3juNjy>bbQr4(9B7e5YM%rvutdzmv&g5_J?WLe$-fjJ0O|X)Rfn!I)pAL zo@=xf!NP#72}a8P_y7jDk=zi^y8*GXnH7+>{bfVcTyxiwgo;kJzyDRSK0;O+08=ps zU5A|fVaM3Cx;-Ue6K7<0AOrH7o5^V_dS-}9yQh}o2O2TlPj?k*!4Ra?gDyai@)2Do zw3-Bja=ekBb9V&tigp0Zd0H_;x&KRB2Kh4|(FO9@C~pND@hi*Sv_RGN%chB)bO2Bh zf@(=1w6Dv))!j?=&KA~FKA#Tt^J{q_vbphg;?sy<+xv?SSeF4DPy${6a3&iGm10ZX z5z(^p~t=}JQ>2Ym=M?J&XitbCJHAWCY%z{_wZ)#WEIla+50YpgsC zlgUhJ#IOPIApn8~f(Vsp&b(Fp{8&}-l1Q73YMWrMxepb+P!%vH05tdAvN)*CHH#1} z5zF|dVZyj1F9pE5EJ~hQdA`Wo>{_JL^Og2}K|_0WsG7{`1FK7C8T1Fa=7l^PEW1Gs zc|Im845~hh{RR4=Vo>!7qV!ABgR0*G(9;T4$xH~7A4i2Lg4q?ey8JjQ8#AZ2*a9(% zV@9zirNk(X*&Oarr$|f*C?hYMlz`KCn#_XL<#T+ff$@F-2Fs_o^TsVywG2XKviFw> zBSeHDaR2{x*=XOeucdT(+|u3mwo)nV`sZ6~^s62_`?}9EaIxH