Merge pull request #4 from HospitalRun/master

Merge from Origin

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [12.x, 13.x]
+        node-version: [12.x]
         os: [ubuntu-latest, windows-latest, macOS-latest]
         # exclude:
         #   - os: windows-latest
@@ -41,7 +41,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [12.x, 13.x]
+        node-version: [12.x]
         os: [ubuntu-latest, windows-latest, macOS-latest]
         # exclude:
         #   - os: windows-latest

.travis.yml

@@ -14,9 +14,8 @@ before_script:
   - npm run lint
 script:
   - npm run build
-after_script:
   - COVERALLS_REPO_TOKEN=$coveralls_repo_token npm run coveralls
-
+  
 notifications:
   email:
     on_success: never

package.json

@@ -26,7 +26,7 @@
     "react-redux": "~7.2.0",
     "react-router": "~5.1.2",
     "react-router-dom": "~5.1.2",
-    "react-scripts": "3.4.0",
+    "react-scripts": "~3.4.0",
     "redux": "~4.0.5",
     "redux-thunk": "~2.3.0",
     "shortid": "^2.2.15",
@@ -60,8 +60,8 @@
     "@types/redux-mock-store": "~1.0.1",
     "@types/shortid": "^0.0.29",
     "@types/uuid": "^7.0.0",
-    "@typescript-eslint/eslint-plugin": "~2.22.0",
-    "@typescript-eslint/parser": "~2.22.0",
+    "@typescript-eslint/eslint-plugin": "~2.23.0",
+    "@typescript-eslint/parser": "~2.23.0",
     "commitizen": "~4.0.3",
     "commitlint-config-cz": "~0.13.0",
     "coveralls": "~3.0.9",
@@ -77,7 +77,7 @@
     "eslint-plugin-jest": "~23.8.0",
     "eslint-plugin-jsx-a11y": "~6.2.3",
     "eslint-plugin-prettier": "~3.1.1",
-    "eslint-plugin-react": "~7.18.0",
+    "eslint-plugin-react": "~7.19.0",
     "eslint-plugin-react-hooks": "~2.5.0",
     "history": "~4.10.1",
     "husky": "~4.2.1",

src/__tests__/HospitalRun.test.tsx

@@ -295,7 +295,7 @@ describe('HospitalRun', () => {
         expect(store.getActions()).toContainEqual(
           addBreadcrumbs([
             { i18nKey: 'scheduling.appointments.label', location: '/appointments' },
-            { i18nKey: 'scheduling.appointments.newAppointment', location: '/appointments/new' },
+            { i18nKey: 'scheduling.appointments.new', location: '/appointments/new' },
             { i18nKey: 'dashboard.label', location: '/' },
           ]),
         )

src/__tests__/components/Navbar.test.tsx

@@ -75,7 +75,7 @@ describe('Navbar', () => {
         'scheduling.appointments.label',
       )
       expect(scheduleLinkList.first().props().children[1].props.children).toEqual(
-        'scheduling.appointments.newAppointment',
+        'scheduling.appointments.new',
       )
     })
 

src/__tests__/scheduling/appointments/Appointments.test.tsx

@@ -62,9 +62,7 @@ describe('Appointments', () => {
     })
 
     const actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]
-    expect((actualButtons[0] as any).props.children).toEqual(
-      'scheduling.appointments.newAppointment',
-    )
+    expect((actualButtons[0] as any).props.children).toEqual('scheduling.appointments.new')
   })
 
   it('should render a calendar with the proper events', async () => {

src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx

@@ -62,7 +62,7 @@ describe('New Appointment', () => {
         await setup()
       })
 
-      expect(titleUtil.default).toHaveBeenCalledWith('scheduling.appointments.newAppointment')
+      expect(titleUtil.default).toHaveBeenCalledWith('scheduling.appointments.new')
     })
   })
 

src/components/Navbar.tsx

@@ -63,7 +63,7 @@ const Navbar = () => {
             },
             {
               type: 'link',
-              label: t('scheduling.appointments.newAppointment'),
+              label: t('scheduling.appointments.new'),
               onClick: () => {
                 history.push('/appointments/new')
               },

src/i18n.ts

@@ -0,0 +1,64 @@
+import i18n from 'i18next'
+import LanguageDetector from 'i18next-browser-languagedetector'
+import { initReactI18next } from 'react-i18next'
+
+import translationAR from './locales/ar/translations'
+import translationDE from './locales/de/translations'
+import translationEnUs from './locales/enUs/translations'
+import translationES from './locales/es/translations'
+import translationIN from './locales/in/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'
+
+const resources = {
+  ar: {
+    translation: translationAR,
+  },
+  de: {
+    translation: translationDE,
+  },
+  en: {
+    translation: translationEnUs,
+  },
+  es: {
+    translation: translationES,
+  },
+  in: {
+    translation: translationIN,
+  },
+  ja: {
+    translation: translationJA,
+  },
+  pt: {
+    translation: translationPtBR,
+  },
+  ru: {
+    translation: translationRU,
+  },
+  zr: {
+    translation: translationZR,
+  },
+}
+
+i18n
+  // load translation using xhr -> see /public/locales
+  // learn more: https://github.com/i18next/i18next-xhr-backend
+  // detect user language
+  // learn more: https://github.com/i18next/i18next-browser-languageDetector
+  .use(LanguageDetector)
+  // pass the i18n instance to react-i18next.
+  .use(initReactI18next)
+  // init i18next
+  // for all options read: https://www.i18next.com/overview/configuration-options
+  .init({
+    fallbackLng: 'en',
+    debug: true,
+    resources,
+    interpolation: {
+      escapeValue: false, // not needed for react as it escapes by default
+    },
+  })
+
+export default i18n

src/locales/ar/translations/actions/index.ts

@@ -0,0 +1,9 @@
+export default {
+  actions: {
+    edit: 'تصحيح',
+    save: 'حفظ',
+    cancel: 'إلغاء',
+    new: 'الجديد',
+    list: 'قائمة',
+  },
+}

src/locales/ar/translations/dashboard/index.ts

@@ -0,0 +1,5 @@
+export default {
+  dashboard: {
+    label: 'لوحة القيادة',
+  },
+}

src/locales/ar/translations/index.ts

@@ -0,0 +1,11 @@
+import actions from './actions'
+import dashboard from './dashboard'
+import patient from './patient'
+import patients from './patients'
+
+export default {
+  ...actions,
+  ...dashboard,
+  ...patient,
+  ...patients,
+}

src/locales/ar/translations/patient/index.ts

@@ -0,0 +1,6 @@
+export default {
+  patient: {
+    firstName: 'الاسم الاول',
+    lastName: 'الكنية',
+  },
+}

src/locales/ar/translations/patients/index.ts

@@ -0,0 +1,8 @@
+export default {
+  patients: {
+    label: 'المرضى',
+    viewPatients: 'عرض المرضى',
+    viewPatient: 'عرض المريض',
+    newPatient: 'مريض جديد',
+  },
+}

src/locales/de/translations/actions/index.ts

@@ -0,0 +1,9 @@
+export default {
+  actions: {
+    edit: 'Bearbeiten',
+    save: 'speichern',
+    cancel: 'Stornieren',
+    new: 'Neu',
+    list: 'Liste',
+  },
+}

src/locales/de/translations/dashboard/index.ts

@@ -0,0 +1,5 @@
+export default {
+  dashboard: {
+    label: 'Instrumententafel',
+  },
+}

src/locales/de/translations/index.ts

@@ -0,0 +1,11 @@
+import actions from './actions'
+import dashboard from './dashboard'
+import patient from './patient'
+import patients from './patients'
+
+export default {
+  ...actions,
+  ...dashboard,
+  ...patient,
+  ...patients,
+}

src/locales/de/translations/patient/index.ts

@@ -0,0 +1,6 @@
+export default {
+  patient: {
+    firstName: 'Vorname',
+    lastName: 'Nachname',
+  },
+}

src/locales/de/translations/patients/index.ts

@@ -0,0 +1,8 @@
+export default {
+  patients: {
+    label: 'Patienten',
+    viewPatients: 'Patienten anzeigen',
+    viewPatient: 'Patient anzeigen',
+    newPatient: 'Neuer Patient',
+  },
+}