Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Commit

Permalink
fix(translation): resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
kumikokashii committed May 26, 2020
2 parents bbc0206 + 1333de9 commit c35ab99
Show file tree
Hide file tree
Showing 26 changed files with 294 additions and 17 deletions.
18 changes: 11 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,12 @@ Contributions are always welcome. Before contributing please read our [contribut

1. Fork this repository to your own GitHub account and then clone it to your local device
2. Navigate to the cloned folder: `cd hospitalrun-frontend`
3. Install the dependencies: `yarn`
4. Run `yarn run start` to build and watch for code changes
3. Install the dependencies: `npm install`
4. Run `npm run start` to build and watch for code changes

## Translation

Use the stadards in [this readme](https://github.com/HospitalRun/hospitalrun-frontend/tree/master/src/locales/README.md).

## Online one-click setup for contributing

Expand Down Expand Up @@ -77,13 +81,13 @@ To fix this issue, add `SKIP_PREFLIGHT_CHECK=true` to the `.env` file.

## Running Tests and Linter

`yarn test:ci` will run the entire test suite
`npm run test:ci` will run the entire test suite

`yarn test` will run the test suite in watch mode
`npm run test` will run the test suite in watch mode

`yarn lint` will run the linter
`npm run lint` will run the linter

`yarn lint:fix` will run the linter and fix fixable errors
`npm run lint:fix` will run the linter and fix fixable errors

## Useful Developer Tools

Expand All @@ -98,7 +102,7 @@ In order to optimize the workflow and to prevent multiple contributors working o

## How to commit

This repo uses Conventional Commits. Commitizen is mandatory for making proper commits. Once you have staged your changes, can run `npm run commit` or `yarn commit` from the root directory in order to commit following our standards.
This repo uses Conventional Commits. Commitizen is mandatory for making proper commits. Once you have staged your changes, can run `npm run commit` from the root directory in order to commit following our standards.

<hr />

Expand Down
14 changes: 7 additions & 7 deletions src/i18n.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import translationDE from './locales/de/translations'
import translationEnUs from './locales/enUs/translations'
import translationES from './locales/es/translations'
import translationFR from './locales/fr/translations'
import translationIN from './locales/in/translations'
import translationID from './locales/id/translations'
import translationIT from './locales/it/translations'
import translationJA from './locales/ja/translations'
import translationPtBR from './locales/ptBr/translations'
import translationRU from './locales/ru/translations'
import translationZR from './locales/zr/translations'
import translationZhCN from './locales/zhCN/translations'

const resources: { [language: string]: any } = {
it: {
Expand All @@ -39,25 +39,25 @@ const resources: { [language: string]: any } = {
name: 'French',
translation: translationFR,
},
in: {
id: {
name: 'Indonesian',
translation: translationIN,
translation: translationID,
},
ja: {
name: 'Japanese',
translation: translationJA,
},
pt: {
ptBR: {
name: 'Portuguese',
translation: translationPtBR,
},
ru: {
name: 'Russian',
translation: translationRU,
},
zr: {
zhCN: {
name: 'Chinese',
translation: translationZR,
translation: translationZhCN,
},
}

Expand Down
31 changes: 31 additions & 0 deletions src/locales/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Codes to use to identify languages

The [IETF language tags](http://en.wikipedia.org/wiki/IETF_language_tag) are made up of [ISO 639](http://en.wikipedia.org/wiki/ISO_639) standards for representing language names and [ISO 3166-1](http://en.wikipedia.org/wiki/ISO_3166-1) standards for representing country codes. A sample list:

| English name for language | Tag |
| :------------------------ | :---- |
| English | en |
| English (United States) | en-US |
| English (Great Britain) | en-GB |
| French | fr |
| German | de |
| Polish | pl |
| Dutch | nl |
| Finnish | fi |
| Swedish | sv |
| Italian | it |
| Spanish (Spain) | es |
| Portuguese (Portugal) | pt |
| Russian | ru |
| Portuguese (Brazil) | pt-BR |
| Spanish (Mexico) | es-MX |
| Chinese (PRC) | zh-CN |
| Chinese (Taiwan) | zh-TW |
| Japanese | ja |
| Korean | ko |

Use these two reference lists to create new languages.

[ISO 639-1](https://datahub.io/core/language-codes/r/0.html)

[IETF Language Types](https://datahub.io/core/language-codes/r/3.html)
8 changes: 7 additions & 1 deletion src/locales/de/translations/actions/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
export default {
actions: {
label: 'Aktionen',
edit: 'Bearbeiten',
save: 'speichern',
save: 'Speichern',
update: 'Aktualisieren',
complete: 'Komplett',
delete: 'Löschen',
cancel: 'Stornieren',
new: 'Neu',
list: 'Liste',
search: 'Suche',
confirmDelete: 'Bestätigung der Löschung',
},
}
2 changes: 1 addition & 1 deletion src/locales/de/translations/dashboard/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default {
dashboard: {
label: 'Instrumententafel',
label: 'Dashboard',
},
}
35 changes: 35 additions & 0 deletions src/locales/de/translations/incidents/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
export default {
incidents: {
filterTitle: 'Nach Status filtern',
label: 'Vorfälle',
actions: {
report: 'Bericht',
},
status: {
reported: 'gemeldet',
all: 'alle',
},
reports: {
label: 'Gemeldete Vorfälle',
new: 'Vorfall melden',
view: 'Vorfall ansehen',
dateOfIncident: 'Datum des Vorfalles',
department: 'Abteilung',
category: 'Kategorie',
categoryItem: 'Kategorie Artikel',
description: 'Beschreibung des Vorfalles',
code: 'Code',
reportedBy: 'Gemeldet von',
reportedOn: 'Gemeldet am',
status: 'Status',
error: {
dateRequired: 'Datum is erforderlich.',
dateMustBeInThePast: 'Datum muss in der vergangenheit sein.',
departmentRequired: 'Abteilung ist erforderlich.',
categoryRequired: 'Kategorie ist erforderlich',
categoryItemRequired: 'Kategorie Artikel ist erforderlich',
descriptionRequired: 'Beschreibung ist erforderlich',
},
},
},
}
10 changes: 10 additions & 0 deletions src/locales/de/translations/index.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
import actions from './actions'
import dashboard from './dashboard'
import incidents from './incidents'
import labs from './labs'
import patient from './patient'
import patients from './patients'
import scheduling from './scheduling'
import settings from './settings'
import sex from './sex'
import states from './states'

export default {
...actions,
...dashboard,
...patient,
...patients,
...settings,
...scheduling,
...states,
...sex,
...labs,
...incidents,
}
33 changes: 33 additions & 0 deletions src/locales/de/translations/labs/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,40 @@
export default {
labs: {
label: 'Labor',
filterTitle: 'Nach Status filtern',
search: 'Laborsuche',
status: {
requested: 'Angefordert',
completed: 'Abgeschlossen',
canceled: 'Abgebrochen',
},
filter: {
all: 'Alle Status',
},
requests: {
label: 'Laboranfragen',
new: 'Neue Laboranfrage',
view: 'Labor anzeigen',
cancel: 'Labor stornieren',
complete: 'Labor erledigt',
error: {
unableToRequest: 'Unable to create new lab request.',
unableToComplete: 'Unable to complete lab request.',
typeRequired: 'Type is required.',
resultRequiredToComplete: 'Result is required to complete.',
},
},
lab: {
code: 'Laborcode',
status: 'Status',
for: 'Für',
type: 'Typ',
result: 'Resultat',
notes: 'Notizen',
requestedOn: 'Angefordert am',
completedOn: 'Erledigt am',
canceledOn: 'Storniert am',
patient: 'Patient',
},
},
}
107 changes: 107 additions & 0 deletions src/locales/de/translations/patient/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,113 @@
export default {
patient: {
code: 'Patient Code',
firstName: 'Vorname',
lastName: 'Nachname',
suffix: 'Suffix',
prefix: 'Präfix',
givenName: 'Rufname',
familyName: 'Familienname',
dateOfBirth: 'Geburtsdatum',
approximateDateOfBirth: 'Ungefähres Geburtsdatum',
age: 'Alter',
approximateAge: 'Ungefähres Alter',
placeOfBirth: 'Geburtsort',
sex: 'Geschlecht',
phoneNumber: 'Telefonnummer',
email: 'E-mail',
address: 'Addresse',
occupation: 'Beruf',
type: 'Patiententyp',
preferredLanguage: 'Bevorzugte Sprache',
basicInformation: 'Grundinformation',
generalInformation: 'Allgemeine Information',
contactInformation: 'Kontakt Information',
unknownDateOfBirth: 'Unbekannt',
relatedPerson: 'Verwandte Person',
relatedPersons: {
error: {
unableToAddRelatedPerson: 'Neue verwandte Person kann nicht hinzugefügt werden.',
relatedPersonRequired: 'Verwandte Person ist erforderlich.',
relationshipTypeRequired: 'Beziehungstyp ist erforderlich.',
},
label: 'Verwandte Personen',
new: 'Neue Verwandte Person',
add: 'Verwandte Person hinzufügen',
relationshipType: 'Beziehungstyp',
warning: {
noRelatedPersons: 'Keine verwandten Personen',
},
addRelatedPersonAbove: 'Fügen Sie über den Button oben eine verwandte Person hinzu.',
},
appointments: {
new: 'Termin hinzufügen',
},
allergies: {
label: 'Allergien',
allergyName: 'Name der Allergie',
new: 'Allergie hinzufügen',
error: {
nameRequired: 'Name ist erforderlich.',
unableToAdd: 'Allergie konnte nicht hinzugefügt werden.',
},
warning: {
noAllergies: 'Keine Allergien',
},
addAllergyAbove: 'Fügen Sie über den Button oben eine Allergie hinzu.',
successfullyAdded: 'Erfolgreich eine neue Allergie hinzugefügt!',
},
diagnoses: {
label: 'Diagnosen',
new: 'Diagnose hinzufügen',
diagnosisName: 'Name der Diagnose',
diagnosisDate: 'Diagnosedatum',
warning: {
noDiagnoses: 'Keine Diagnosen',
},
error: {
nameRequired: 'Name der Diagnose ist erforderlich.',
dateRequired: 'Diagnosedatum ist erforderlich.',
unableToAdd: 'Diagnose konnte nicht hinzugefügt werden.',
},
addDiagnosisAbove: 'Fügen Sie über den Button oben eine Diagnose hinzu.',
successfullyAdded: 'Erfolgreich eine neue Diagnose hinzugefügt!',
},
note: 'Notizen',
notes: {
label: 'Notizen',
new: 'Neue Notiz hinzufügen',
warning: {
noNotes: 'Keine Notizen',
},
error: {
noteRequired: 'Notiz ist erforderlich.',
unableToAdd: 'Unable to add new note.',
},
addNoteAbove: 'Fügen Sie über den Button oben eine Notiz hinzu.',
},
labs: {
label: 'Labore',
new: 'Neues Labor hinzufügen',
warning: {
noLabs: 'Keine Labore',
},
noLabsMessage: 'Keine Laboranfragen für diese Person.',
},
types: {
charity: 'Charity',
private: 'Privat',
},
errors: {
createPatientError: 'Neuer Patient konnte nicht erstellt werden.',
updatePatientError: 'Patient konnte nicht aktualisiert werden.',
patientGivenNameFeedback: 'Rufname ist erforderlich.',
patientDateOfBirthFeedback: 'Das Geburtsdatum kann nicht in der Zukunft liegen',
patientNumInSuffixFeedback: 'Kann keine Zahlen enthalten.',
patientNumInPrefixFeedback: 'Kann keine Zahlen enthalten.',
patientNumInFamilyNameFeedback: 'Kann keine Zahlen enthalten.',
patientNumInPreferredLanguageFeedback: 'Kann keine Zahlen enthalten.',
invalidEmail: 'Muss eine gültige E-Mail sein.',
invalidPhoneNumber: 'Muss eine gültige Telefonnummer sein.',
},
},
}
37 changes: 37 additions & 0 deletions src/locales/de/translations/scheduling/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
export default {
scheduling: {
label: 'Planung',
appointments: {
label: 'Termine',
new: 'Neuer Termin',
schedule: 'Terminplan',
editAppointment: 'Termin bearbeiten',
deleteAppointment: 'Termin löschen',
viewAppointment: 'Termin ansehen',
},
appointment: {
startDate: 'Anfangsdatum',
endDate: 'Enddatum',
location: 'Standort',
type: 'Typ',
types: {
checkup: 'Untersuchung',
emergency: 'Notfall',
followUp: 'Nachverfolgen',
routine: 'Routine',
walkIn: 'Walk In',
},
errors: {
createAppointmentError: 'Neuer Termin konnte nicht erstellt werden.',
updateAppointmentError: 'Termin konnte nicht aktualisiert werden.',
patientRequired: 'Patient ist erforderlich.',
startDateMustBeBeforeEndDate: 'Die Startzeit muss vor der Endzeit liegen.',
},
reason: 'Grund',
patient: 'Patient',
deleteConfirmationMessage: 'Sind Sie sicher, dass Sie diesen Termin löschen möchten?',
successfullyCreated: 'Termin erfolgreich erstellt.',
successfullyDeleted: 'Termin erfolgreich gelöscht.',
},
},
}
Loading

0 comments on commit c35ab99

Please # to comment.