Merge branch 'develop' of https://github.com/Chaitanya1672/talawa-adm…

…in-os into fix/event-organization-action-item-layout-to-be-same

package.json

@@ -30,7 +30,7 @@
     "history": "^5.3.0",
     "i18next": "^21.8.14",
     "i18next-browser-languagedetector": "^8.0.0",
-    "i18next-http-backend": "^1.4.1",
+    "i18next-http-backend": "^2.5.2",
     "inquirer": "^8.0.0",
     "js-cookie": "^3.0.1",
     "markdown-toc": "^1.2.0",
@@ -41,19 +41,19 @@
     "react-bootstrap": "^2.7.4",
     "react-datepicker": "^7.2.0",
     "react-dom": "^17.0.2",
-    "react-google-recaptcha": "^2.1.0",
+    "react-google-recaptcha": "^3.1.0",
     "react-i18next": "^11.18.1",
     "react-icons": "^5.2.1",
     "react-infinite-scroll-component": "^6.1.0",
     "react-multi-carousel": "^2.8.5",
     "react-redux": "^7.2.5",
-    "react-router-dom": "^6.23.1",
+    "react-router-dom": "^6.24.1",
     "react-scripts": "5.0.1",
     "react-toastify": "^9.0.3",
     "redux": "^4.1.1",
     "redux-thunk": "^2.3.0",
     "sanitize-html": "^2.13.0",
-    "typedoc-plugin-markdown": "^4.0.3",
+    "typedoc-plugin-markdown": "^4.1.2",
     "typescript": "^4.3.5",
     "web-vitals": "^1.0.1"
   },
@@ -128,7 +128,7 @@
     "lint-staged": "^15.2.7",
     "postcss-modules": "^6.0.0",
     "sass": "^1.77.4",
-    "tsx": "^4.16.0"
+    "tsx": "^4.16.2"
   },
   "resolutions": {
     "@apollo/client": "^3.4.0-beta.19",

public/locales/en/common.json

@@ -76,5 +76,10 @@
   "noFiltersApplied": "No filters applied",
   "manage": "Manage",
   "searchResultsFor": "Search results for {{text}}",
-  "none": "None"
+  "none": "None",
+  "Donate": "Donate",
+  "addedSuccessfully": "{{item}} added Successfully",
+  "updatedSuccessfully": "{{item}} updated Successfully",
+  "removedSuccessfully": "{{item}} removed Successfully",
+  "successfullyUpdated": "Successfully Updated"
 }

public/locales/en/errors.json

@@ -5,5 +5,6 @@
   "notAuthorised": "Sorry! you are not Authorised!",
   "errorSendingMail": "Error sending mail",
   "emailNotRegistered": "Email not registered",
-  "notFoundMsg": "Oops! The Page you requested was not found!"
+  "notFoundMsg": "Oops! The Page you requested was not found!",
+  "errorOccurredCouldntCreate": "An error occurred. Couldn't create {{entity}}"
 }

public/locales/en/translation.json

@@ -589,7 +589,9 @@
   "userPasswordUpdate": {
     "previousPassword": "Previous Password",
     "newPassword": "New Password",
-    "confirmNewPassword": "Confirm New Password"
+    "confirmNewPassword": "Confirm New Password",
+    "passCantBeEmpty": "Password can't be empty",
+    "passNoMatch": "New and Confirm password do not match."
   },
   "orgDelete": {
     "deleteOrg": "Delete Org"
@@ -728,7 +730,10 @@
   },
   "postCard": {
     "likes": "Likes",
-    "comments": "Comments"
+    "comments": "Comments",
+    "viewPost": "View Post",
+    "editPost": "Edit Post",
+    "postedOn": "Posted on {{date}}"
   },
   "home": {
     "posts": "Posts",
@@ -745,7 +750,8 @@
     "startPost": "Start a post",
     "media": "Media",
     "event": "Event",
-    "article": "Article"
+    "article": "Article",
+    "postNowVisibleInFeed": "Post now visible in feed"
   },
   "settings": {
     "profileSettings": "Profile Settings",
@@ -854,7 +860,10 @@
     "deleteAdvertisement": "Delete Advertisement",
     "deleteAdvertisementMsg": "Do you want to remove this advertisement?",
     "view": "View",
-    "editAdvertisement": "Edit Advertisement"
+    "editAdvertisement": "Edit Advertisement",
+    "advertisementDeleted": "Advertisement deleted successfully.",
+    "endDateGreaterOrEqual": "End Date should be greater than or equal to Start Date",
+    "advertisementCreated": "Advertisement created successfully."
   },
   "userChat": {
     "chat": "Chat",
@@ -956,5 +965,13 @@
     "successfulUpdation": "Action Item updated successfully",
     "notes": "Notes",
     "save": "Save"
+  },
+  "checkIn": {
+    "errorCheckingIn": "Error checking in",
+    "checkedInSuccessfully": "Checked in successfully"
+  },
+  "eventRegistrantsModal": {
+    "errorAddingAttendee": "Error adding attendee",
+    "errorRemovingAttendee": "Error removing attendee"
   }
 }

public/locales/fr/common.json

@@ -76,5 +76,10 @@
   "noFiltersApplied": "Aucun filtre appliqué",
   "manage": "Gérer",
   "searchResultsFor": "Résultats de recherche pour {{text}}",
-  "none": "Aucun"
+  "none": "Aucun",
+  "Donate": "Faire un don",
+  "addedSuccessfully": "{{item}} ajouté avec succès",
+  "updatedSuccessfully": "{{item}} mis à jour avec succès",
+  "removedSuccessfully": "{{item}} supprimé avec succès",
+  "successfullyUpdated": "Mis à jour avec succès"
 }

public/locales/fr/errors.json

@@ -5,5 +5,6 @@
   "notAuthorised": "Désolé! ",
   "errorSendingMail": "Erreur lors de l'envoi du courrier",
   "emailNotRegistered": "Email non enregistré",
-  "notFoundMsg": "Oops! "
+  "notFoundMsg": "Oops! ",
+  "errorOccurredCouldntCreate": "Une erreur s'est produite. Impossible de créer {{entity}}"
 }

public/locales/fr/translation.json

@@ -594,7 +594,9 @@
   "userPasswordUpdate": {
     "previousPassword": "Mot de passe précédent",
     "newPassword": "nouveau mot de passe",
-    "confirmNewPassword": "Confirmer le nouveau mot de passe"
+    "confirmNewPassword": "Confirmer le nouveau mot de passe",
+    "passCantBeEmpty": "Le mot de passe ne peut pas être vide",
+    "passNoMatch": "Le nouveau mot de passe et la confirmation du mot de passe ne correspondent pas."
   },
   "orgDelete": {
     "deleteOrg": "Supprimer l'organisation"
@@ -732,7 +734,10 @@
   },
   "postCard": {
     "likes": "Aime",
-    "comments": "commentaires"
+    "comments": "commentaires",
+    "viewPost": "Voir le message",
+    "editPost": "Modifier le message",
+    "postedOn": "Publié le {{date}}"
   },
   "home": {
     "posts": "Des postes",
@@ -749,7 +754,8 @@
     "startPost": "Démarrer un message",
     "media": "Médias",
     "event": "Événement",
-    "article": "Article"
+    "article": "Article",
+    "postNowVisibleInFeed": "Le post est maintenant visible dans le fil d'actualité"
   },
   "settings": {
     "profileSettings": "Paramètres de profil",
@@ -861,7 +867,10 @@
     "deleteAdvertisement": "Supprimer la publicité",
     "deleteAdvertisementMsg": "Voulez-vous supprimer cette publicité ?",
     "view": "Voir",
-    "editAdvertisement": "Modifier l'annonce"
+    "editAdvertisement": "Modifier l'annonce",
+    "advertisementDeleted": "Publicité supprimée avec succès.",
+    "endDateGreaterOrEqual": "La date de fin doit être supérieure ou égale à la date de début",
+    "advertisementCreated": "Publicité créée avec succès."
   },
   "userChat": {
     "chat": "Chat",
@@ -954,14 +963,22 @@
     "successfulCreation": "Élément d'action créé avec succès",
     "successfulUpdation": "Élément d'action mis à jour avec succès",
     "notes": "Remarques",
-    "save": "Sauvegarder",
     "assignee": "Cessionnaire",
     "assigner": "Assigner",
     "assignmentDate": "Date d'affectation",
     "status": "Statut",
     "actionItemActive": "Actif",
     "actionItemStatus": "Statut de l'action",
     "actionItemCompleted": "Élément d'action terminé",
-    "markCompletion": "Marquer l'achèvement"
+    "markCompletion": "Marquer l'achèvement",
+    "save": "Sauvegarder"
+  },
+  "checkIn": {
+    "errorCheckingIn": "Erreur lors de l'enregistrement",
+    "checkedInSuccessfully": "Enregistrement réussi"
+  },
+  "eventRegistrantsModal": {
+    "errorAddingAttendee": "Erreur lors de l'ajout du participant",
+    "errorRemovingAttendee": "Erreur lors de la suppression du participant"
   }
 }

public/locales/hi/common.json

@@ -76,5 +76,10 @@
   "noFiltersApplied": "कोई फ़िल्टर लागू नहीं हैं",
   "manage": "प्रबंधित करें",
   "searchResultsFor": "{{text}} के लिए खोज परिणाम",
-  "none": "कोई नहीं"
+  "none": "कोई नहीं",
+  "Donate": "दान करें",
+  "addedSuccessfully": "{{item}} सफलतापूर्वक जोड़ा गया",
+  "updatedSuccessfully": "{{item}} सफलतापूर्वक अपडेट किया गया",
+  "removedSuccessfully": "{{item}} सफलतापूर्वक हटाया गया",
+  "successfullyUpdated": "सफलतापूर्वक अपडेट किया गया"
 }

public/locales/hi/errors.json

@@ -5,5 +5,6 @@
   "notAuthorised": "क्षमा मांगना! ",
   "errorSendingMail": "मेल भेजने में त्रुटि",
   "emailNotRegistered": "ईमेल पंजीकृत नहीं है",
-  "notFoundMsg": "उफ़! "
+  "notFoundMsg": "उफ़! ",
+  "errorOccurredCouldntCreate": "एक त्रुटि हुई। {{entity}} नहीं बना सके"
 }

public/locales/hi/translation.json

@@ -594,7 +594,9 @@
   "userPasswordUpdate": {
     "previousPassword": "पिछला पासवर्ड",
     "newPassword": "नया पासवर्ड",
-    "confirmNewPassword": "नए पासवर्ड की पुष्टि करें"
+    "confirmNewPassword": "नए पासवर्ड की पुष्टि करें",
+    "passCantBeEmpty": "पासवर्ड खाली नहीं हो सकता",
+    "passNoMatch": "नया पासवर्ड और पुष्टि पासवर्ड मेल नहीं खाते।"
   },
   "orgDelete": {
     "deleteOrg": "संगठन हटाएं"
@@ -732,7 +734,10 @@
   },
   "postCard": {
     "likes": "पसंद है",
-    "comments": "टिप्पणियाँ"
+    "comments": "टिप्पणियाँ",
+    "viewPost": "पोस्ट देखें",
+    "editPost": "पोस्ट संपादित करें",
+    "postedOn": "{{date}} को पोस्ट किया गया"
   },
   "home": {
     "posts": "पदों",
@@ -749,7 +754,8 @@
     "startPost": "एक पोस्ट प्रारंभ करें",
     "media": "मिडिया",
     "event": "आयोजन",
-    "article": "लेख"
+    "article": "लेख",
+    "postNowVisibleInFeed": "पोस्ट अब फीड में दिखाई दे रहा है"
   },
   "settings": {
     "profileSettings": "पार्श्वचित्र समायोजन",
@@ -861,7 +867,10 @@
     "deleteAdvertisement": "विज्ञापन हटाएँ",
     "deleteAdvertisementMsg": "क्या आप यह विज्ञापन हटाना चाहते हैं?",
     "view": "देखना",
-    "editAdvertisement": "विज्ञापन संपादित करें"
+    "editAdvertisement": "विज्ञापन संपादित करें",
+    "advertisementDeleted": "विज्ञापन सफलतापूर्वक हटाया गया।",
+    "endDateGreaterOrEqual": "समाप्ति तिथि प्रारंभ तिथि से अधिक या उसके बराबर होनी चाहिए",
+    "advertisementCreated": "विज्ञापन सफलतापूर्वक बनाया गया।"
   },
   "userChat": {
     "chat": "बात करना",
@@ -954,14 +963,22 @@
     "successfulCreation": "कार्रवाई आइटम सफलतापूर्वक बनाया गया",
     "successfulUpdation": "कार्रवाई आइटम सफलतापूर्वक अपडेट किया गया",
     "notes": "टिप्पणियाँ",
-    "save": "बचाना",
     "assignee": "संपत्ति-भागी",
     "assigner": "असाइनर",
     "assignmentDate": "असाइनमेंट तिथि",
     "status": "स्थिति",
     "actionItemActive": "सक्रिय",
     "actionItemStatus": "कार्रवाई आइटम स्थिति",
     "actionItemCompleted": "कार्रवाई आइटम पूर्ण हुआ",
-    "markCompletion": "पूर्णता को चिह्नित करें"
+    "markCompletion": "पूर्णता को चिह्नित करें",
+    "save": "बचाना"
+  },
+  "checkIn": {
+    "errorCheckingIn": "चेक-इन में त्रुटि",
+    "checkedInSuccessfully": "सफलतापूर्वक चेक-इन किया गया"
+  },
+  "eventRegistrantsModal": {
+    "errorAddingAttendee": "उपस्थित होने वाले को जोड़ने में त्रुटि",
+    "errorRemovingAttendee": "उपस्थित होने वाले को हटाने में त्रुटि"
   }
 }

public/locales/sp/common.json

@@ -76,5 +76,10 @@
   "noFiltersApplied": "No se aplicaron filtros",
   "manage": "Administrar",
   "searchResultsFor": "Resultados de búsqueda para {{text}}",
-  "none": "Ninguno"
+  "none": "Ninguno",
+  "Donate": "Donar",
+  "addedSuccessfully": "{{item}} agregado con éxito",
+  "updatedSuccessfully": "{{item}} actualizado con éxito",
+  "removedSuccessfully": "{{item}} eliminado con éxito",
+  "successfullyUpdated": "Actualizado con éxito"
 }

public/locales/sp/errors.json

@@ -5,5 +5,6 @@
   "notAuthorised": "Sorry! you are not Authorised!",
   "errorSendingMail": "Error sending mail",
   "emailNotRegistered": "Email not registered",
-  "notFoundMsg": "Oops! The Page you requested was not found!"
+  "notFoundMsg": "Oops! The Page you requested was not found!",
+  "errorOccurredCouldntCreate": "Ocurrió un error. No se pudo crear {{entity}}"
 }

public/locales/sp/translation.json

@@ -762,7 +762,9 @@
     "newPassword": "Nueva contraseña",
     "confirmNewPassword": "Confirmar nueva contraseña",
     "saveChanges": "Guardar cambios",
-    "cancel": "Cancelar"
+    "cancel": "Cancelar",
+    "passCantBeEmpty": "La contraseña no puede estar vacía",
+    "passNoMatch": "La nueva contraseña y la confirmación no coinciden."
   },
   "orgDelete": {
     "deleteOrg": "Eliminar organización"
@@ -943,7 +945,10 @@
   },
   "postCard": {
     "likes": "Gustos",
-    "comments": "Comentarios"
+    "comments": "Comentarios",
+    "viewPost": "Ver publicación",
+    "editPost": "Editar publicación",
+    "postedOn": "Publicado el {{date}}"
   },
   "home": {
     "feed": "Alimentar",
@@ -953,7 +958,8 @@
     "startPost": "Comenzar una publicación",
     "media": "Medios",
     "event": "Evento",
-    "article": "Artículo"
+    "article": "Artículo",
+    "postNowVisibleInFeed": "La publicación ahora es visible en el feed"
   },
   "settings": {
     "settings": "Ajustes",
@@ -1081,6 +1087,9 @@
     "view": "Ver",
     "edit": "Editar",
     "editAdvertisement": "Editar Anuncio",
+    "advertisementDeleted": "Anuncio eliminado con éxito.",
+    "endDateGreaterOrEqual": "La fecha de finalización debe ser mayor o igual a la fecha de inicio",
+    "advertisementCreated": "Anuncio creado con éxito.",
     "saveChanges": "Guardar Cambios",
     "endOfResults": "Fin de los resultados"
   },
@@ -1196,14 +1205,22 @@
     "successfulCreation": "Elemento de acción creado exitosamente",
     "successfulUpdation": "Elemento de acción actualizado correctamente",
     "notes": "Notas",
-    "save": "Guardar",
     "assignee": "Cesionario",
     "assigner": "Asignador",
     "assignmentDate": "Fecha de asignación",
     "status": "Estado",
     "actionItemActive": "Activo",
     "actionItemStatus": "Estado del elemento de acción",
     "actionItemCompleted": "Elemento de acción completado",
-    "markCompletion": "Marcar finalización"
+    "markCompletion": "Marcar finalización",
+    "save": "Guardar"
+  },
+  "checkIn": {
+    "errorCheckingIn": "Error al registrarse",
+    "checkedInSuccessfully": "Registrado con éxito"
+  },
+  "eventRegistrantsModal": {
+    "errorAddingAttendee": "Error al agregar asistente",
+    "errorRemovingAttendee": "Error al eliminar asistente"
   }
 }

public/locales/zh/common.json

@@ -76,5 +76,10 @@
   "noFiltersApplied": "未应用筛选器",
   "manage": "管理",
   "searchResultsFor": "搜索结果：{{text}}",
-  "none": "没有"
+  "none": "没有",
+  "Donate": "捐赠",
+  "addedSuccessfully": "{{item}} 添加成功",
+  "updatedSuccessfully": "{{item}} 更新成功",
+  "removedSuccessfully": "{{item}} 删除成功",
+  "successfullyUpdated": "更新成功"
 }