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

Commit 642ae8a

Browse files
lgallgal
authored andcommitted
SORMAS-Foundation#3411 fix captions + handle country dependent fields in person fragments
1 parent 9e098c2 commit 642ae8a

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,9 +1215,9 @@ EndOfQuarantineReason.ISOLATED_AS_CASE=Isolated as Case
12151215
EndOfQuarantineReason.LOST_TO_FOLLOWUP=Lost to follow-up
12161216
EndOfQuarantineReason.OTHER=Other
12171217

1218-
Salutation.MR=dear Sir
1219-
Salutation.MRS=dear Madame
1220-
Salutation.MR_AND_MRS=dear Sir and Madame
1221-
Salutation.FAMILY=dear family
1222-
Salutation.GUARDIAN_OF_MINOR=dear guardian of the child
1218+
Salutation.MR=Dear Sir
1219+
Salutation.MRS=Dear Madame
1220+
Salutation.MR_AND_MRS=Dear Sir and Madame
1221+
Salutation.FAMILY=Dear family
1222+
Salutation.GUARDIAN_OF_MINOR=Dear guardian of the child
12231223
Salutation.OTHER=Other

sormas-app/app/src/main/java/de/symeda/sormas/app/person/edit/PersonEditFragment.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import de.symeda.sormas.api.utils.DateHelper;
5050
import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers;
5151
import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
52+
import de.symeda.sormas.api.utils.fieldvisibility.checkers.CountryFieldVisibilityChecker;
5253
import de.symeda.sormas.app.BaseActivity;
5354
import de.symeda.sormas.app.BaseEditFragment;
5455
import de.symeda.sormas.app.R;
@@ -86,7 +87,8 @@ public static PersonEditFragment newInstance(Case activityRootData) {
8687
PersonEditFragment.class,
8788
null,
8889
activityRootData,
89-
FieldVisibilityCheckers.withDisease(activityRootData.getDisease()),
90+
FieldVisibilityCheckers.withDisease(activityRootData.getDisease())
91+
.add(new CountryFieldVisibilityChecker(ConfigProvider.getServerLocale())),
9092
UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized()));
9193
}
9294

0 commit comments

Comments
 (0)