Merge branch 'master' into feat-HospitalRun#1969

README.md

@@ -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
 
@@ -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
 
@@ -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 />
 

src/i18n.ts

@@ -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 = {
   it: {
@@ -33,20 +33,20 @@ const resources = {
   fr: {
     translation: translationFR,
   },
-  in: {
-    translation: translationIN,
+  id: {
+    translation: translationID,
   },
   ja: {
     translation: translationJA,
   },
-  pt: {
+  ptBR: {
     translation: translationPtBR,
   },
   ru: {
     translation: translationRU,
   },
-  zr: {
-    translation: translationZR,
+  zhCN: {
+    translation: translationZhCN,
   },
 }
 

src/locales/README.md

@@ -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)

src/locales/zr/translations/patients/index.ts → src/locales/zhCN/translations/patients/index.ts

@@ -1,6 +1,6 @@
 export default {
   patients: {
-    label: '耐心',
+    label: '标签',
     viewPatients: '查看患者',
     viewPatient: '查看患者',
     newPatient: '新病人',