fix(conflict): merge master

src/components/Navbar.tsx

@@ -15,6 +15,7 @@ const Navbar = () => {
           history.push('/')
         },
       }}
+<<<<<<< HEAD
       search={{
         onClickButton: () => {
           // no oop
@@ -31,15 +32,27 @@ const Navbar = () => {
           onClick: () => {
             // no oop
           },
+=======
+      bg="dark"
+      variant="dark"
+      search={{
+        onClickButton: () => console.log('hello'),
+        onChangeInput: () => console.log('hello'),
+      }}
+      navLinks={[
+        {
+          label: t('patients.label', 'patients'),
+          onClick: () => {},
+>>>>>>> add-translation-resources
           children: [
             {
-              label: t('actions.list'),
+              label: t('actions.list', 'list'),
               onClick: () => {
                 history.push('/patients')
               },
             },
             {
-              label: t('actions.new'),
+              label: t('actions.new', 'new'),
               onClick: () => {
                 history.push('/patients/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 translationEN from './locales/en/translations';
+import translationES from './locales/es/translations';
+import translationIN from './locales/in/translations';
+import translationJA from './locales/ja/translations';
+import translationPT from './locales/pt/translations';
+import translationRU from './locales/ru/translations';
+import translationZR from './locales/zr/translations';
+
+const resources = {
+  ar: {
+    translation: translationAR,
+  },
+  de: {
+    translation: translationDE,
+  },
+  en: {
+    translation: translationEN,
+  },
+  es: {
+    translation: translationES,
+  },
+  in: {
+    translation: translationIN,
+  },
+  ja: {
+    translation: translationJA,
+  },
+  pt: {
+    translation: translationPT,
+  },
+  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: resources,
+    interpolation: {
+      escapeValue: false, // not needed for react as it escapes by default
+    },
+  });
+
+export default i18n;

src/index.tsx

@@ -4,7 +4,7 @@ import '@hospitalrun/components/scss/main.scss'
 import './index.css'
 import App from './App'
 import * as serviceWorker from './serviceWorker'
-import './i18n'
+import './i18n.ts'
 
 ReactDOM.render(<App />, document.getElementById('root'))
 

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"
+  }
+}

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

@@ -0,0 +1,9 @@
+export default {
+  "actions": {
+    "edit": "Edit",
+    "save": "Save",
+    "cancel": "Cancel",
+    "new": "New",
+    "list": "List"
+  }
+}

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

@@ -0,0 +1,5 @@
+export default {
+  "dashboard": {
+    "label": "Dashboard"
+  }
+}

src/locales/en/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/en/translations/patient/index.ts

@@ -0,0 +1,6 @@
+export default {
+  "patient": {
+    "firstName": "First Name",
+    "lastName": "Last Name"
+  }
+}

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

@@ -0,0 +1,8 @@
+export default {
+  "patients": {
+    "label": "Patients",
+    "viewPatients": "View Patients",
+    "viewPatient": "View Patient",
+    "newPatient": "New Patient"
+  }
+}

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

@@ -0,0 +1,9 @@
+export default {
+  "actions": {
+    "edit": "Editar",
+    "save": "Guardar",
+    "cancel": "Cancelar",
+    "new": "Nuevo",
+    "list": "Lista"
+  }
+}

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

@@ -0,0 +1,5 @@
+export default {
+  "dashboard": {
+    "label": "Panel"
+  }
+}

src/locales/es/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/es/translations/patient/index.ts

@@ -0,0 +1,6 @@
+export default {
+  "patient": {
+    "firstName": "Nombre de pila",
+    "lastName": "Apellido"
+  }
+}

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

@@ -0,0 +1,8 @@
+export default {
+  "patients": {
+    "label": "Pacientes",
+    "viewPatients": "Ver pacientes",
+    "viewPatient": "Ver pacientes",
+    "newPatient": "Nuevo paciente"
+  }
+}

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

@@ -0,0 +1,9 @@
+export default {
+  "actions": {
+    "edit": "Edit",
+    "save": "Menyimpan",
+    "cancel": "Membatalkan",
+    "new": "Baru",
+    "list": "Daftar"
+  }
+}

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

@@ -0,0 +1,5 @@
+export default {
+  "dashboard": {
+    "label": "Dasbor"
+  }
+}

src/locales/in/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/in/translations/patient/index.ts

@@ -0,0 +1,6 @@
+export default {
+  "patient": {
+    "firstName": "Nama depan",
+    "lastName": "Nama keluarga"
+  }
+}

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

@@ -0,0 +1,8 @@
+export default {
+  "patients": {
+    "label": "Pasien",
+    "viewPatients": "Lihat Pasien",
+    "viewPatient": "Lihat Pasien",
+    "newPatient": "Pasien Baru"
+  }
+}

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

@@ -0,0 +1,9 @@
+export default {
+  "actions": {
+    "edit": "編集",
+    "save": "セーブ",
+    "cancel": "キャンセル",
+    "new": "新しい",
+    "list": "リスト"
+  }
+}

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

@@ -0,0 +1,5 @@
+export default {
+  "dashboard": {
+    "label": "ダッシュボード"
+  }
+}

src/locales/ja/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/ja/translations/patient/index.ts

@@ -0,0 +1,6 @@
+export default {
+  "patient": {
+    "firstName": "ファーストネーム",
+    "lastName": "苗字"
+  }
+}

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

@@ -0,0 +1,8 @@
+export default {
+  "patients": {
+    "label": "患者さん",
+    "viewPatients": "患者を見る",
+    "viewPatient": "患者を見る",
+    "newPatient": "新しい患者"
+  }
+}

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

@@ -0,0 +1,9 @@
+export default {
+  "actions": {
+    "edit": "Editar",
+    "save": "Salvar",
+    "cancel": "Cancelar",
+    "new": "Novo",
+    "list": "Lista"
+  }
+}

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

@@ -0,0 +1,5 @@
+export default {
+  "dashboard": {
+    "label": "Painel de controle"
+  }
+}