Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 6e0c9a5

Browse files
Merge pull request SORMAS-Foundation#2961 from hzi-braunschweig/bug-2943-followup-popup
SORMAS-Foundation#2943 fix adjust quarantine pop-up
2 parents a6ba013 + 9aa6951 commit 6e0c9a5

39 files changed

Lines changed: 127 additions & 115 deletions

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public interface Strings {
4242
String classificationYearsOrLess = "classificationYearsOrLess";
4343
String classificationYearsOrMore = "classificationYearsOrMore";
4444
String comparedTo = "comparedTo";
45-
String confirmationAlsoExtendQuarantine = "confirmationAlsoExtendQuarantine";
45+
String confirmationAlsoAdjustQuarantine = "confirmationAlsoAdjustQuarantine";
4646
String confirmationArchiveArea = "confirmationArchiveArea";
4747
String confirmationArchiveAreas = "confirmationArchiveAreas";
4848
String confirmationArchiveCampaign = "confirmationArchiveCampaign";
@@ -170,6 +170,7 @@ public interface Strings {
170170
String forEventParticipant = "forEventParticipant";
171171
String headingAccessDenied = "headingAccessDenied";
172172
String headingAdditionalTests = "headingAdditionalTests";
173+
String headingAdjustQuarantine = "headingAdjustQuarantine";
173174
String headingAllContacts = "headingAllContacts";
174175
String headingAnimalContacts = "headingAnimalContacts";
175176
String headingArchiveCampaign = "headingArchiveCampaign";

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ classificationYearsOrLess = years or less
103103
classificationYearsOrMore = years or more
104104

105105
# Confirmation
106-
confirmationAlsoExtendQuarantine = You have extended the follow-up. Should the end of the quarantine be adjusted accordingly?
106+
confirmationAlsoAdjustQuarantine = You have extended the follow-up. Should the end of the quarantine be adjusted accordingly?
107107
confirmationArchiveCampaign = Are you sure you want to archive this campaign? This will not remove it from the system or any statistics, but only hide it from the normal campaign directory.
108108
confirmationArchiveCase = Are you sure you want to archive this case? This will not remove it from the system or any statistics, but only hide it from the normal case directory.
109109
confirmationArchiveCases = Are you sure you want to archive all %d selected cases?
@@ -426,6 +426,7 @@ headingSaveUser = Save User
426426
headingCreateCampaignDataForm = New %s
427427
headingExtendQuarantine = Extend quarantine
428428
headingReduceQuarantine = Reduce quarantine
429+
headingAdjustQuarantine = Adjust quarantine
429430
headingExtendFollowUp = Extend follow-up period
430431

431432
# Info texts

sormas-api/src/main/resources/strings_de-CH.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ classificationYearsOrLess = Jahre oder weniger
103103
classificationYearsOrMore = Jahre oder mehr
104104

105105
# Confirmation
106-
confirmationAlsoExtendQuarantine = Sie haben das Follow-up verlängert. Soll das Ende der Isolation/Quarantäne entsprechend angepasst werden?
106+
confirmationAlsoAdjustQuarantine = Sie haben das Follow-up verlängert. Soll das Ende der Isolation/Quarantäne entsprechend angepasst werden?
107107
confirmationArchiveCampaign = Sind Sie sicher, dass Sie diese Kampagne archivieren wollen? Dadurch wird sie weder aus dem System noch aus den Statistiken entfernt, sondern nur aus dem normalen Kampagnen-Verzeichnis ausgeblendet.
108108
confirmationArchiveCase = Sind Sie sicher, dass Sie diesen Fall archivieren möchten? Dies entfernt ihn nicht aus dem System oder irgendwelchen Statistiken, sondern blendet ihn nur im normalen Fallverzeichnis aus.
109109
confirmationArchiveCases = Sind Sie sicher, dass Sie alle %d ausgewählten Fälle archivieren möchten?

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ classificationYearsOrLess = Jahre oder weniger
103103
classificationYearsOrMore = Jahre oder mehr
104104

105105
# Confirmation
106-
confirmationAlsoExtendQuarantine = Sie haben das Follow-up verlängert. Soll das Ende der Quarantäne entsprechend angepasst werden?
106+
confirmationAlsoAdjustQuarantine = Sie haben das Follow-up verlängert. Soll das Ende der Quarantäne entsprechend angepasst werden?
107107
confirmationArchiveCampaign = Sind Sie sicher, dass Sie diese Kampagne archivieren wollen? Dadurch wird sie weder aus dem System noch aus den Statistiken entfernt, sondern nur aus dem normalen Kampagnen-Verzeichnis ausgeblendet.
108108
confirmationArchiveCase = Sind Sie sicher, dass Sie diesen Fall archivieren möchten? Dies entfernt ihn nicht aus dem System oder irgendwelchen Statistiken, sondern blendet ihn nur im normalen Fallverzeichnis aus.
109109
confirmationArchiveCases = Sind Sie sicher, dass Sie alle %d ausgewählten Fälle archivieren möchten?

sormas-api/src/main/resources/strings_en-AF.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ classificationYearsOrLess = years or less
103103
classificationYearsOrMore = years or more
104104

105105
# Confirmation
106-
confirmationAlsoExtendQuarantine = You have extended the follow-up. Should the end of the quarantine be adjusted accordingly?
106+
confirmationAlsoAdjustQuarantine = You have extended the follow-up. Should the end of the quarantine be adjusted accordingly?
107107
confirmationArchiveCampaign = Are you sure you want to archive this campaign? This will not remove it from the system or any statistics, but only hide it from the normal campaign directory.
108108
confirmationArchiveCase = Are you sure you want to archive this case? This will not remove it from the system or any statistics, but only hide it from the normal case directory.
109109
confirmationArchiveCases = Are you sure you want to archive all %d selected cases?

sormas-api/src/main/resources/strings_es-CU.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ classificationYearsOrLess = años o menos
103103
classificationYearsOrMore = años o más
104104

105105
# Confirmation
106-
confirmationAlsoExtendQuarantine = Ha prolongado el seguimiento. ¿Debiera ajustarse el final de la cuarentena en consecuencia?
106+
confirmationAlsoAdjustQuarantine = Ha prolongado el seguimiento. ¿Debiera ajustarse el final de la cuarentena en consecuencia?
107107
confirmationArchiveCampaign = ¿Está seguro de que desea archivar esta campaña? Esto no la eliminará del sistema ni de ninguna estadística; sólo la ocultará del directorio normal de campañas.
108108
confirmationArchiveCase = ¿Está seguro de que desea archivar este caso? Esto no lo eliminará del sistema ni de ninguna estadística; sólo lo ocultará del directorio normal de casos.
109109
confirmationArchiveCases = ¿Está seguro de que desea archivar todos los %d casos seleccionados?

sormas-api/src/main/resources/strings_es-EC.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ classificationYearsOrLess = años o menos
103103
classificationYearsOrMore = años o más
104104

105105
# Confirmation
106-
confirmationAlsoExtendQuarantine = You have extended the follow-up. Should the end of the quarantine be adjusted accordingly?
106+
confirmationAlsoAdjustQuarantine = You have extended the follow-up. Should the end of the quarantine be adjusted accordingly?
107107
confirmationArchiveCampaign = Are you sure you want to archive this campaign? This will not remove it from the system or any statistics, but only hide it from the normal campaign directory.
108108
confirmationArchiveCase = ¿Estás seguro de que deseas archivar este caso? Esto no lo eliminará del sistema ni de ninguna estadística, sino que solo lo ocultará del directorio de casos.
109109
confirmationArchiveCases = ¿Está seguro de que desea archivar todos los %d casos seleccionados?

sormas-api/src/main/resources/strings_es-ES.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ classificationYearsOrLess = years or less
103103
classificationYearsOrMore = years or more
104104

105105
# Confirmation
106-
confirmationAlsoExtendQuarantine = You have extended the follow-up. Should the end of the quarantine be adjusted accordingly?
106+
confirmationAlsoAdjustQuarantine = You have extended the follow-up. Should the end of the quarantine be adjusted accordingly?
107107
confirmationArchiveCampaign = Are you sure you want to archive this campaign? This will not remove it from the system or any statistics, but only hide it from the normal campaign directory.
108108
confirmationArchiveCase = Are you sure you want to archive this case? This will not remove it from the system or any statistics, but only hide it from the normal case directory.
109109
confirmationArchiveCases = Are you sure you want to archive all %d selected cases?

sormas-api/src/main/resources/strings_fa-AF.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ classificationYearsOrLess = years or less
103103
classificationYearsOrMore = years or more
104104

105105
# Confirmation
106-
confirmationAlsoExtendQuarantine = You have extended the follow-up. Should the end of the quarantine be adjusted accordingly?
106+
confirmationAlsoAdjustQuarantine = You have extended the follow-up. Should the end of the quarantine be adjusted accordingly?
107107
confirmationArchiveCampaign = Are you sure you want to archive this campaign? This will not remove it from the system or any statistics, but only hide it from the normal campaign directory.
108108
confirmationArchiveCase = Are you sure you want to archive this case? This will not remove it from the system or any statistics, but only hide it from the normal case directory.
109109
confirmationArchiveCases = Are you sure you want to archive all %d selected cases?

sormas-api/src/main/resources/strings_fi-FI.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ classificationYearsOrLess = vuotta tai vähemmän
103103
classificationYearsOrMore = vuotta tai enemmän
104104

105105
# Confirmation
106-
confirmationAlsoExtendQuarantine = You have extended the follow-up. Should the end of the quarantine be adjusted accordingly?
106+
confirmationAlsoAdjustQuarantine = You have extended the follow-up. Should the end of the quarantine be adjusted accordingly?
107107
confirmationArchiveCampaign = Haluatko varmasti arkistoida tämän kampanjan tiedot? Arkistointi ei poista tietoja järjestelmästä tai tilastoista, mutta piilottaa sen tavallisesta kampanjalistasta.
108108
confirmationArchiveCase = Haluatko varmasti arkistoida tämän potilaan tiedot? Arkistointi ei poista tietoja järjestelmästä tai tilastoista, mutta piilottaa sen tavallisesta potilaslistasta.
109109
confirmationArchiveCases = Oletko varma, että haluat arkistoida kaikki %d valittua potilasta?

0 commit comments

Comments
 (0)