Skip to content

Commit

Permalink
Merge development into master
Browse files Browse the repository at this point in the history
  • Loading branch information
SORMAS-Robot committed Aug 13, 2024
2 parents 37f996b + 97a30a8 commit ae95283
Show file tree
Hide file tree
Showing 33 changed files with 1,303 additions and 1,298 deletions.
2 changes: 1 addition & 1 deletion docs/I18N.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ Click on the file to open the Crowdin editor that allows you to go through all t

## How to add a new language to SORMAS

If the language you would like to translate is not available yet, please get in contact with us: <https://github.com/sormas-foundation/SORMAS-Project>
If the language you would like to translate is not available yet, please get in contact with us at [email protected], through our community at <https://community.sormas.org>, or by creating an issue on the main repository at: <https://github.com/sormas-foundation/SORMAS-Project>
2 changes: 1 addition & 1 deletion sormas-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>de.symeda.sormas</groupId>
<artifactId>sormas-base</artifactId>
<version>1.97.0</version>
<version>1.98.0-SNAPSHOT</version>
<relativePath>../sormas-base</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 4 additions & 0 deletions sormas-api/src/main/java/de/symeda/sormas/api/Language.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@ public enum Language {

EN(new Locale("en"), "M/d/yyyy", "M/d/yyyy h:mm a", "M/d"),
EN_NG(new Locale("en", "NG"), "dd/MM/yyyy", "dd/MM/yyyy h:mm a", "dd/MM"),
EN_GM(new Locale("en", "GM"), "dd/MM/yyyy", "dd/MM/yyyy h:mm", "dd/MM"),
EN_LR(new Locale("en", "LR"), "dd/MM/yyyy", "dd/MM/yyyy h:mm", "dd/MM"),
EN_GH(new Locale("en", "GH"), "dd/MM/yyyy", "dd/MM/yyyy h:mm a", "dd/MM"),
EN_KE(new Locale("en", "KE"), "dd/MM/yyyy", "dd/MM/yyyy h:mm", "dd/MM"),
EN_AF(new Locale("en", "AF"), "dd/MM/yyyy", "dd/MM/yyyy h:mm a", "dd/MM"),
FR(new Locale("fr", "FR"), "dd/MM/yyyy", "dd/MM/yyyy HH:mm", "dd/MM"),
FR_CH(new Locale("fr", "CH"), "dd/MM/yyyy", "dd/MM/yyyy HH:mm", "dd/MM"),
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"),
PT_CV(new Locale("pt", "CV"), "dd/MM/yyyy", "dd/MM/yyyy H: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"),
Expand Down
2,412 changes: 1,206 additions & 1,206 deletions sormas-api/src/main/resources/captions_ar-SA.properties

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions sormas-api/src/main/resources/captions_en-KE.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2937,11 +2937,11 @@ environmentSampleDeletedSamples=Deleted environment samples
humanSampleViewType=Human
environmentSampleViewType=Environment
environmentSampleNewSample=New sample
ExternalEmailOptions.templateName=Choose email template
ExternalEmailOptions.templateName=Choose template
ExternalEmailOptions.recipientEmail=Email address
ExternalEmailOptions.attachedDocuments=Attach document(s)
ExternalEmailOptionsWithAttachments.attachedDocuments=Attach document(s)
ExternalEmailOptionsWithAttachments.templateName=Choose email template
ExternalEmailOptionsWithAttachments.templateName=Choose template
externalEmailUsedTemplate=Template
externalEmailSentBy=Sent by
externalEmailSentTo=Sent to
Expand Down
14 changes: 7 additions & 7 deletions sormas-api/src/main/resources/captions_es-CU.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2937,11 +2937,11 @@ environmentSampleDeletedSamples=Muestras ambientales eliminadas
humanSampleViewType=Humano
environmentSampleViewType=Ambiente
environmentSampleNewSample=Nueva muestra
ExternalEmailOptions.templateName=Seleccionar plantilla de correo electrónico
ExternalEmailOptions.templateName=Seleccionar plantilla
ExternalEmailOptions.recipientEmail=Dirección de correo electrónico
ExternalEmailOptions.attachedDocuments=Adjuntar documento(s)
ExternalEmailOptionsWithAttachments.attachedDocuments=Adjuntar documento(s)
ExternalEmailOptionsWithAttachments.templateName=Seleccionar plantilla de correo electrónico
ExternalEmailOptionsWithAttachments.templateName=Seleccionar plantilla
externalEmailUsedTemplate=Plantilla
externalEmailSentBy=Enviado por
externalEmailSentTo=Enviado a
Expand All @@ -2962,15 +2962,15 @@ specailCaseAccessNoAccessGranted=No se otorgó acceso especial para este caso
SelfReport = Informe personal
SelfReport.type = Tipo
SelfReport.reportDate = Fecha de informe
SelfReport.caseReference = Case reference number
SelfReport.caseReference = Número de referencia del caso
SelfReport.disease = Enfermedad
SelfReport.diseaseDetails = Disease details
SelfReport.diseaseDetails = Detalles de la enfermedad
SelfReport.diseaseVariant = Variante de enfermedad
SelfReport.diseaseVariantDetails = Disease variant details
SelfReport.diseaseVariantDetails = Detalles de la variante de enfermedad
SelfReport.firstName = Nombre
SelfReport.lastName = Apellidos
SelfReport.sex = Sexo
SelfReport.birthDate = Birth date
SelfReport.birthDate = Fecha de nacimiento
SelfReport.birthdateDD = Día de nacimiento
SelfReport.birthdateMM = Mes de nacimiento
SelfReport.birthdateYYYY = Año de nacimiento
Expand All @@ -2993,5 +2993,5 @@ selfReportArchivedEnvironments=Informes personales archivados
selfReportAllActiveAndArchivedEnvironments=Todos los informes personales activos y archivados
selfReportDeletedEnvironments=Informes personales eliminados
selfReportSelfReportsList=Lista de informes personales
selfReportProcess=Process
selfReportProcess=Procesar

Binary file modified sormas-api/src/main/resources/doc/SORMAS_Data_Dictionary.xlsx
Binary file not shown.
Binary file modified sormas-api/src/main/resources/doc/SORMAS_User_Roles.xlsx
Binary file not shown.
8 changes: 6 additions & 2 deletions sormas-api/src/main/resources/enum.properties
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ Disease.EVD = Ebola Virus Disease
Disease.GUINEA_WORM = Guinea Worm
Disease.LASSA = Lassa
Disease.MEASLES = Measles
Disease.MONKEYPOX = Monkeypox
Disease.MONKEYPOX = Mpox
Disease.NEW_INFLUENZA = Influenza (New subtype)
Disease.UNDEFINED = Not Yet Defined
Disease.OTHER = Other Epidemic Disease
Expand Down Expand Up @@ -524,7 +524,7 @@ Disease.Short.EVD = EVD
Disease.Short.GUINEA_WORM = Guinea Worm
Disease.Short.LASSA = Lassa
Disease.Short.MEASLES = Measles
Disease.Short.MONKEYPOX = Monkeypox
Disease.Short.MONKEYPOX = Mpox
Disease.Short.NEW_INFLUENZA = New Flu
Disease.Short.UNDEFINED = Undefined
Disease.Short.OTHER = Other
Expand Down Expand Up @@ -873,9 +873,12 @@ KindOfInvolvement.POTENTIALLY_EXPOSED = Potentially exposed
KindOfInvolvement.POTENTIAL_INDEX_CASE = Potential index case

Language.EN = English
Language.EN_GM = English (The Gambia)
Language.EN_LR = English (Liberia)
Language.EN_AF = English (Afghanistan)
Language.EN_NG = English (Nigeria)
Language.EN_GH = English (Ghana)
Language.EN_KE = English (Kenya)
Language.FR = Français
Language.DE = Deutsch
Language.ES_BO = Español (Bolivia)
Expand All @@ -884,6 +887,7 @@ Language.ES_CU = Español (Cuba)
Language.FI = Suomi
Language.IT = Italiano
Language.DE_CH = Deutsch (Schweiz)
Language.PT_CV = Português (Cabo Verde)
Language.IT_CH = Italiano (Svizzera)
Language.FR_CH = Français (Suisse)
Language.PS = Pashto
Expand Down
38 changes: 19 additions & 19 deletions sormas-api/src/main/resources/enum_en-KE.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1618,7 +1618,7 @@ UserRight.Desc.CASE_EDIT = Able to edit existing cases
UserRight.Desc.CASE_EXPORT = Able to export cases from SORMAS
UserRight.Desc.CASE_IMPORT = Able to import cases into SORMAS
UserRight.Desc.CASE_INVESTIGATE = Able to edit case investigation status
UserRight.Desc.CASE_TRANSFER = Able to transfer cases to another region/district/facility
UserRight.Desc.CASE_TRANSFER = Able to transfer cases to another county/sub county/facility
UserRight.Desc.CASE_REFER_FROM_POE = Able to refer case from point of entry
UserRight.Desc.CASE_RESPONSIBLE = Can be responsible for a case
UserRight.Desc.CASE_VIEW = Able to view existing cases
Expand Down Expand Up @@ -1650,9 +1650,9 @@ UserRight.Desc.EVENTPARTICIPANT_EDIT = Able to edit existing event participants
UserRight.Desc.EVENTPARTICIPANT_ARCHIVE = Able to archive event participants
UserRight.Desc.EVENTPARTICIPANT_VIEW = Able to view existing event participants
UserRight.Desc.EVENTPARTICIPANT_VIEW_ARCHIVED = Able to view archived event participants
UserRight.Desc.INFRASTRUCTURE_CREATE = Able to create new regions/districts/communities/facilities
UserRight.Desc.INFRASTRUCTURE_EDIT = Able to edit regions/districts/communities/facilities
UserRight.Desc.INFRASTRUCTURE_VIEW = Able to view regions/districts/communities/facilities in the system
UserRight.Desc.INFRASTRUCTURE_CREATE = Able to create new counties/sub counties/wards/facilities
UserRight.Desc.INFRASTRUCTURE_EDIT = Able to edit counties/sub counties/wards/facilities
UserRight.Desc.INFRASTRUCTURE_VIEW = Able to view counties/sub counties/wards/facilities in the system
UserRight.Desc.INFRASTRUCTURE_VIEW_ARCHIVED = Able to view archived infrastructure data
UserRight.Desc.PERFORM_BULK_OPERATIONS = Able to perform bulk operations in lists
UserRight.Desc.SAMPLE_CREATE = Able to create new samples
Expand Down Expand Up @@ -1759,7 +1759,7 @@ UserRight.Desc.EXTERNAL_MESSAGE_PUSH = Able to push external messages to the sys
UserRight.Desc.EXTERNAL_MESSAGE_DELETE = Able to delete messages
UserRight.Desc.CASE_SHARE = Able to share cases with the whole country
UserRight.Desc.IMMUNIZATION_VIEW = Able to view existing immunizations and vaccinations
UserRight.Desc.IMMUNIZATION_VIEW_ARCHIVED = Able to view arhived immunizations and vaccinations
UserRight.Desc.IMMUNIZATION_VIEW_ARCHIVED = Able to view archived immunizations and vaccinations
UserRight.Desc.IMMUNIZATION_CREATE = Able to create new immunizations and vaccinations
UserRight.Desc.IMMUNIZATION_EDIT = Able to edit existing immunizations and vaccinations
UserRight.Desc.IMMUNIZATION_DELETE = Able to delete immunizations and vaccinations from the system
Expand Down Expand Up @@ -1934,9 +1934,9 @@ SamplePurpose.INTERNAL = Internal/in-house testing
#JurisdictionLevel
JurisdictionLevel.NONE = None
JurisdictionLevel.NATION = Nation
JurisdictionLevel.REGION = Region
JurisdictionLevel.DISTRICT = District
JurisdictionLevel.COMMUNITY = Community
JurisdictionLevel.REGION = County
JurisdictionLevel.DISTRICT = Sub County
JurisdictionLevel.COMMUNITY = Ward
JurisdictionLevel.HEALTH_FACILITY = Facility
JurisdictionLevel.LABORATORY = Laboratory
JurisdictionLevel.POINT_OF_ENTRY = Point of entry
Expand All @@ -1960,7 +1960,7 @@ SamplingReason.MOVING_RETURNING_RETIREMENT_HOME=Moving/returning into retirement
SamplingReason.QUARANTINE_END=Quarantine end
SamplingReason.UNKNOWN=Unknown
SamplingReason.OTHER_REASON=Other reason
ContactTracingContactType.TELEPHONE=Telephone
ContactTracingContactType.TELEPHONE=Mobile Phone
ContactTracingContactType.SMS=SMS
ContactTracingContactType.EMAIL=E-Mail
QuarantineReason.IDENTIFIED_BY_CONTACT_TRACING=Identified by contact tracing
Expand Down Expand Up @@ -2009,8 +2009,8 @@ SymptomGroup.OTHER=Other

#Salutation
Salutation.MR=Dear Sir
Salutation.MRS=Dear Madame
Salutation.MR_AND_MRS=Dear Sir and Madame
Salutation.MRS=Dear Madam
Salutation.MR_AND_MRS=Dear Sir and Madam
Salutation.FAMILY=Dear family
Salutation.GUARDIAN_OF_MINOR=Dear guardian of the child
Salutation.OTHER=Other
Expand Down Expand Up @@ -2201,33 +2201,33 @@ EnumColumn.SHORT = Short

#NotificationType
NotificationType.CASE_CLASSIFICATION_CHANGED = Case classification changed
NotificationType.Desc.CASE_CLASSIFICATION_CHANGED = Sent to all users associated to the region or responsible region of a case.
NotificationType.Desc.CASE_CLASSIFICATION_CHANGED = Sent to all users associated to the county or responsible county of a case.
NotificationType.CASE_INVESTIGATION_DONE = Case investigation done
NotificationType.Desc.CASE_INVESTIGATION_DONE = Sent to all users associated to the region or responsible region of a case.
NotificationType.Desc.CASE_INVESTIGATION_DONE = Sent to all users associated with the county or responsible county of a case.
NotificationType.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED = Event participant case classification confirmed
NotificationType.Desc.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED = When a case is set to a confirmed classification, this is sent to all responsible users of active events in which the case person participated and which took place no earlier than 30 days before the case was classified.
NotificationType.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS = Event participant related to other events
NotificationType.Desc.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS = When a new event participant is created, this is sent to all responsible users of active events in which the person also participated and which took place no earlier than 30 days before.
NotificationType.CASE_LAB_RESULT_ARRIVED = Case lab result arrived
NotificationType.Desc.CASE_LAB_RESULT_ARRIVED = Sent to all users associated to the region or responsible region of a case when a pathogen test result is entered or modified (non-pending).
NotificationType.Desc.CASE_LAB_RESULT_ARRIVED = Sent to all users associated with the county or responsible county of a case when a pathogen test result is entered or modified (non-pending).
NotificationType.CONTACT_LAB_RESULT_ARRIVED = Contact lab result arrived
NotificationType.Desc.CONTACT_LAB_RESULT_ARRIVED = Sent to all users associated to the region of a contact when a pathogen test result is entered or modified (non-pending). If the contact has no region the region of the source case is used.
NotificationType.Desc.CONTACT_LAB_RESULT_ARRIVED = Sent to all users associated with the county of contact when a pathogen test result is entered or modified (non-pending). If the contact has no county the county of the source case is used.
NotificationType.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED = Event participant lab result arrived
NotificationType.Desc.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED = Sent to all users associated to the region of an event participant when a pathogen test result is entered or modified (non-pending).
NotificationType.Desc.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED = Sent to all users associated to the county of an event participant when a pathogen test result is entered or modified (non-pending).
NotificationType.LAB_SAMPLE_SHIPPED = Lab sample shipped
NotificationType.Desc.LAB_SAMPLE_SHIPPED = Sent to all users of a laboratory when a sample of that laboratory is shipped.
NotificationType.CONTACT_SYMPTOMATIC = Contact symptomatic
NotificationType.Desc.CONTACT_SYMPTOMATIC = Sent to all users associated to the region of a contact when a new symptomatic visit is created and the contact was previously asymptomatic. If the contact has no region the region of the source case is used.
NotificationType.Desc.CONTACT_SYMPTOMATIC = Sent to all users associated with the county of a contact when a new symptomatic visit is created and the contact was previously asymptomatic. If the contact has no county the county of the source case is used.
NotificationType.TASK_START= Task start
NotificationType.Desc.TASK_START= Sent to the assignee of a task and all observer users when the task start date is within the last 10 minutes.
NotificationType.TASK_DUE = Task due
NotificationType.Desc.TASK_DUE = Sent to the assignee of a task and all observer users when the task due date is within the last 10 minutes.
NotificationType.TASK_UPDATED_ASSIGNEE = Task assignee updated
NotificationType.Desc.TASK_UPDATED_ASSIGNEE = Sent to the previous and new assignee of a task.
NotificationType.CONTACT_VISIT_COMPLETED = Contact visit completed
NotificationType.Desc.CONTACT_VISIT_COMPLETED = Sent to all users associated to the region of a contact and all observer users when a "Contact follow-up" task is completed. If the contact has no region the region of the source case is used.
NotificationType.Desc.CONTACT_VISIT_COMPLETED = Sent to all users associated with the county of a contact and all observer users when a "Contact follow-up" task is completed. If the contact has no county the county of the source case is used.
NotificationType.CASE_DISEASE_CHANGED = Case disease changed
NotificationType.Desc.CASE_DISEASE_CHANGED = Sent to all users associated to the region or responsible region of a case when the disease was previously set to 'Unspecified VHF'.
NotificationType.Desc.CASE_DISEASE_CHANGED = Sent to all users associated with the county or responsible county of a case when the disease was previously set to 'Unspecified VHF'.
NotificationType.EVENT_GROUP_CREATED = Event group created
NotificationType.Desc.EVENT_GROUP_CREATED = Sent to all responsible users of events that are part of a newly created event group.
NotificationType.EVENT_ADDED_TO_EVENT_GROUP = Event added to event group
Expand Down
12 changes: 6 additions & 6 deletions sormas-api/src/main/resources/enum_es-CU.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1602,9 +1602,9 @@ UserRight.SELF_REPORT_ARCHIVE=Archivar informes personales
UserRight.SELF_REPORT_CREATE=Crear informes personales
UserRight.SELF_REPORT_DELETE=Eliminar informes personales
UserRight.SELF_REPORT_EDIT=Editar informes personales
UserRight.SELF_REPORT_EXPORT=Export self reports
UserRight.SELF_REPORT_IMPORT=Import self reports
UserRight.SELF_REPORT_PROCESS=Process self reports
UserRight.SELF_REPORT_EXPORT=Exportar informes personales
UserRight.SELF_REPORT_IMPORT=Importar informes personales
UserRight.SELF_REPORT_PROCESS=Procesar informes personales
UserRight.SELF_REPORT_VIEW=Ver informes personales

# UserRight descriptions
Expand Down Expand Up @@ -1818,9 +1818,9 @@ UserRight.Desc.SELF_REPORT_ARCHIVE=Puede archivar informes personales
UserRight.Desc.SELF_REPORT_CREATE=Puede crear informes personales
UserRight.Desc.SELF_REPORT_DELETE=Puede eliminar informes personales
UserRight.Desc.SELF_REPORT_EDIT=Puede editar informes personales
UserRight.Desc.SELF_REPORT_EXPORT=Able to export self reports
UserRight.Desc.SELF_REPORT_IMPORT=Able to import self reports
UserRight.Desc.SELF_REPORT_PROCESS=Able to process self reports
UserRight.Desc.SELF_REPORT_EXPORT=Puede exportar informes personales
UserRight.Desc.SELF_REPORT_IMPORT=Puede importar informes personales
UserRight.Desc.SELF_REPORT_PROCESS=Puede procesar informes personales
UserRight.Desc.SELF_REPORT_VIEW=Puede ver informes personales

# UserRightGroup
Expand Down
Loading

0 comments on commit ae95283

Please sign in to comment.