Merge branch 'develop' into talawa-user-portal

beingnoble03 · Sep 18, 2023 · 0deca89 · 0deca89
2 parents f1fa30b + b1f513f
commit 0deca89
Show file tree

Hide file tree

Showing 266 changed files with 6,366 additions and 2,415 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -97,13 +97,11 @@ jobs:
 
   Copy-docs-to-talawa-docs:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/automated-docs'
-    needs: Generate-Documentation
     steps:
     - uses: actions/checkout@v3
     - uses: dmnemec/[email protected]
       env:
-        API_TOKEN_GITHUB: ${{ secrets.TALAWA_DOCS_SYNC }}    
+        API_TOKEN_GITHUB: ${{ secrets.TALAWA_DOCS_SYNC_NEW }}    
       with:
         source_file: 'talawa-admin-docs/'
         destination_repo: 'PalisadoesFoundation/talawa-docs'

diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
     "redux": "^4.1.1",
     "redux-thunk": "^2.3.0",
     "typedoc": "^0.24.8",
-    "typedoc-plugin-markdown": "^3.15.4",
+    "typedoc-plugin-markdown": "^3.16.0",
     "typescript": "^4.3.5",
     "web-vitals": "^1.0.1",
     "yarn": "^1.22.17"

diff --git a/public/locales/en.json b/public/locales/en.json
@@ -86,6 +86,11 @@
     "cancel": "Cancel",
     "noOrgErrorTitle": "Organizations Not Found",
     "noOrgErrorDescription": "Please create an organization through dashboard",
+
+    "manageFeatures": "Manage Features",
+    "manageFeaturesInfo": "Creation Successful ! Please select features that you want to enale for this organization from the plugin store.",
+    "goToStore": "Go to Plugin Store",
+    "enableEverything": "Enable Everything",
     "noResultsFoundFor": "No results found for "
   },
   "orgListCard": {
@@ -147,11 +152,7 @@
     "posts": "Posts",
     "events": "Events",
     "blockedUsers": "Blocked Users",
-    "membershipRequests": "Membership Requests",
-    "deleteOrganization": "Delete Organization",
-    "deleteMsg": "Do you want to delete this organization?",
-    "no": "No",
-    "yes": "Yes",
+    "requests": "Requests",
     "talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too."
   },
   "organizationPeople": {
@@ -299,6 +300,7 @@
   },
   "blockUnblockUser": {
     "title": "Talawa Block/Unblock User",
+    "pageName": "Block/Unblock",
     "searchByName": "Search By Name",
     "listOfUsers": "List of Users who spammed",
     "name": "Name",
@@ -312,8 +314,10 @@
     "talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too.",
     "allMembers": "All Members",
     "blockedUsers": "Blocked Users",
-    "searchFirstName": "Enter First Name",
-    "searchLastName": "Enter Last Name"
+    "searchByFirstName": "Search By First Name",
+    "searchByLastName": "Search By Last Name",
+    "noResultsFoundFor": "No results found for",
+    "noSpammerFound": "No spammer found"
   },
   "forgotPassword": {
     "title": "Talawa Forgot Password",
@@ -362,13 +366,20 @@
   },
   "orgSettings": {
     "title": "Talawa Setting",
-    "updateYourDetails": "Update Your Details",
-    "updateYourPassword": "Update Your Password",
+    "pageName": "Settings",
     "updateOrganization": "Update Organization",
-    "deleteOrganization": "Delete Organization",
     "seeRequest": "See Request",
     "settings": "Settings",
-    "noData": "No data"
+    "noData": "No data",
+    "otherSettings": "Other Settings",
+    "changeLanguage": "Change Language"
+  },
+  "deleteOrg": {
+    "deleteOrganization": "Delete Organization",
+    "deleteMsg": "Do you want to delete this organization?",
+    "no": "No",
+    "yes": "Yes",
+    "longDelOrgMsg": "By clicking on Delete organization button you will the organization will be permanently deleted along with its events, tags and all related data."
   },
   "userUpdate": {
     "firstName": "First Name",
@@ -383,15 +394,13 @@
     "saveChanges": "Save Changes",
     "cancel": "Cancel"
   },
-
   "userPasswordUpdate": {
     "previousPassword": "Previous Password",
     "newPassword": "New Password",
     "confirmNewPassword": "Confirm New Password",
     "saveChanges": "Save Changes",
     "cancel": "Cancel"
   },
-
   "orgDelete": {
     "deleteOrg": "Delete Org"
   },
@@ -407,10 +416,9 @@
     "description": "Description",
     "location": "Location",
     "displayImage": "Display Image",
-    "isPublic": "Is Public",
-    "isRegistrable": "Is Registrable",
+    "isPublic": "Public",
+    "isVisibleInSearch": "Visible in Search",
     "saveChanges": "Save Changes",
-    "cancel": "Cancel",
     "enterNameOrganization": "Enter Organization Name",
     "successfulUpdated": "Organization updated successfully",
     "talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too."
@@ -442,7 +450,9 @@
   "addOnEntry": {
     "enable": "Enabled",
     "install": "Install",
-    "uninstall": "Uninstall"
+    "uninstall": "Uninstall",
+    "uninstallMsg": "This feature is now removed from your organization",
+    "installMsg": "This feature is now enabled in your organization"
   },
   "memberDetail": {
     "title": "User Details",

diff --git a/public/locales/fr.json b/public/locales/fr.json
@@ -145,11 +145,7 @@
     "posts": "Des postes",
     "events": "Événements",
     "blockedUsers": "Utilisateurs bloqués",
-    "membershipRequests": "Demandes d'adhésion",
-    "deleteOrganization": "Supprimer l'organisation",
-    "deleteMsg": "Voulez-vous supprimer cette organisation ?",
-    "no": "Non",
-    "yes": "Oui",
+    "requests": "Demandes",
     "talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Est-il en cours d'exécution ? Vérifiez également votre connectivité réseau."
   },
   "organizationPeople": {
@@ -297,6 +293,7 @@
   },
   "blockUnblockUser": {
     "title": "Talawa Bloquer/Débloquer l'utilisateur",
+    "pageName": "Bloquer/Débloquer'",
     "searchByName": "Recherche par nom",
     "listOfUsers": "Liste des utilisateurs qui ont spammé",
     "name": "Nom",
@@ -310,8 +307,10 @@
     "talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Est-il en cours d'exécution ? Vérifiez également votre connectivité réseau.",
     "allMembers": "Tous les membres",
     "blockedUsers": "Utilisateurs bloqués",
-    "searchFirstName": "Entrez votre prénom",
-    "searchLastName": "Entrer le nom de famille"
+    "searchByFirstName": "Rechercher par prénom",
+    "searchByLastName": "Rechercher par nom de famille",
+    "noResultsFoundFor": "Aucun résultat trouvé pour ",
+    "noSpammerFound": "Aucun spammeur trouvé"
   },
   "forgotPassword": {
     "title": "Mot de passe oublié Talawa",
@@ -360,13 +359,22 @@
   },
   "orgSettings": {
     "title": "Paramètre Talawa",
+    "pageName": "Paramètres",
     "updateYourDetails": "Mettre à jour vos informations",
     "updateYourPassword": "Mettez à jour votre mot de passe",
     "updateOrganization": "Mettre à jour l'organisation",
-    "deleteOrganization": "Supprimer l'organisation",
     "seeRequest": "Voir demande",
     "settings": "Réglages",
-    "noData": "Pas de données"
+    "noData": "Pas de données",
+    "otherSettings": "Autres paramètres",
+    "changeLanguage": "Changer la langue"
+  },
+  "deleteOrg": {
+    "deleteOrganization": "Supprimer l'organisation",
+    "deleteMsg": "Voulez-vous supprimer cette organisation ?",
+    "no": "Non",
+    "yes": "Oui",
+    "longDelOrgMsg": "En cliquant sur le bouton Supprimer l'organisation, l'organisation sera définitivement supprimée, ainsi que ses événements, étiquettes et toutes les données associées."
   },
   "userUpdate": {
     "firstName": "Prénom",
@@ -403,10 +411,9 @@
     "description": "La description",
     "location": "emplacement",
     "displayImage": "Afficher l'image",
-    "isPublic": "Est publique",
-    "isRegistrable": "Est enregistrable",
+    "isPublic": "Public",
+    "isVisibleInSearch": "Visible dans la recherche",
     "saveChanges": "Sauvegarder les modifications",
-    "cancel": "Annuler",
     "enterNameOrganization": "Entrez le nom de l'organisation",
     "successfulUpdated": "Mise à jour réussie",
     "talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Est-il en cours d'exécution ? Vérifiez également votre connectivité réseau."

diff --git a/public/locales/hi.json b/public/locales/hi.json
@@ -145,11 +145,7 @@
     "posts": "पोस्ट",
     "events": "आयोजन",
     "blockedUsers": "रोके गए उपयोगकर्ता",
-    "membershipRequests": "सदस्यता अनुरोध",
-    "deleteOrganization": "संगठन हटाएं",
-    "deleteMsg": "क्या आप इस संगठन को हटाना चाहते हैं?",
-    "no": "नहीं",
-    "yes": "हाँ",
+    "requests": "अनुरोध",
     "talawaApiUnavailable": "तलवा-एपीआई सेवा उपलब्ध नहीं है। क्या यह चल रहा है? अपनी नेटवर्क कनेक्टिविटी भी जांचें।"
   },
   "organizationPeople": {
@@ -297,6 +293,7 @@
   },
   "blockUnblockUser": {
     "title": "तलावा ब्लॉक/अनब्लॉक यूजर",
+    "pageName": "ब्लॉक/अनब्लॉक",
     "searchByName": "नाम से खोजें",
     "listOfUsers": "स्पैम करने वाले उपयोगकर्ताओं की सूची",
     "name": "नाम",
@@ -310,8 +307,10 @@
     "talawaApiUnavailable": "तलवा-एपीआई सेवा उपलब्ध नहीं है। क्या यह चल रहा है? अपनी नेटवर्क कनेक्टिविटी भी जांचें।",
     "allMembers": "सभी सदस्य",
     "blockedUsers": "रोके गए उपयोगकर्ता",
-    "searchFirstName": "प्रथम नाम दर्ज करें",
-    "searchLastName": "अंतिम नाम दर्ज करो"
+    "searchByFirstName": "पहले नाम से खोजें",
+    "searchByLastName": "उपनाम से खोजें",
+    "noResultsFoundFor": "के लिए कोई परिणाम नहीं मिला ",
+    "noSpammerFound": "कोई स्पैमर नहीं मिला"
   },
   "forgotPassword": {
     "title": "तलवा पासवर्ड भूल गए",
@@ -360,13 +359,22 @@
   },
   "orgSettings": {
     "title": "तलावा सेटिंग",
+    "pageName": "सेटिंग्स",
     "updateYourDetails": "अपना विवरण अपडेट करें",
     "updateYourPassword": "अपना पासवर्ड अपडेट करें",
     "updateOrganization": "अद्यतन संगठन",
-    "deleteOrganization": "संगठन हटाएं",
     "seeRequest": "अनुरोध देखें",
     "settings": "समायोजन",
-    "noData": "कोई डेटा नहीं"
+    "noData": "कोई डेटा नहीं",
+    "otherSettings": "अन्य सेटिंग्स",
+    "changeLanguage": "भाषा बदलें"
+  },
+  "deleteOrg": {
+    "deleteOrganization": "संगठन हटाएं",
+    "deleteMsg": "क्या आप इस संगठन को हटाना चाहते हैं?",
+    "no": "नहीं",
+    "yes": "हां",
+    "longDelOrgMsg": "संगठन हटाने के बटन पर क्लिक करके, संगठन को स्थायित रूप से हटा दिया जाएगा, साथ ही उसके आयोजन, टैग और सभी संबंधित डेटा भी हटा दिया जाएगा।"
   },
   "userUpdate": {
     "firstName": "पहला नाम",
@@ -403,8 +411,8 @@
     "description": "विवरण",
     "location": "जगह",
     "displayImage": "प्रदर्शन छवि",
-    "isPublic": "सार्वजनिक है",
-    "isRegistrable": "पंजीकरण योग्य है",
+    "isPublic": "सार्वजनिक",
+    "isVisibleInSearch": "खोज में दिखाए जा सकते हैं",
     "saveChanges": "परिवर्तनों को सुरक्षित करें",
     "cancel": "रद्द करना",
     "enterNameOrganization": "संगठन का नाम दर्ज करें",

diff --git a/public/locales/sp.json b/public/locales/sp.json
@@ -145,11 +145,7 @@
     "posts": "Publicaciones",
     "events": "Eventos",
     "blockedUsers": "Usuarios bloqueados",
-    "membershipRequests": "Solicitudes de membresía",
-    "deleteOrganization": "Eliminar Organización",
-    "deleteMsg": "¿Desea eliminar esta organización?",
-    "no": "No",
-    "yes": "Sí",
+    "requests": "Solicitudes",
     "talawaApiUnavailable": "El servicio Talawa-API no está disponible. ¿Está funcionando? Compruebe también la conectividad de su red."
   },
   "organizationPeople": {
@@ -297,6 +293,7 @@
   },
   "blockUnblockUser": {
     "title": "Usuario de bloqueo/desbloqueo de Talawa",
+    "pageName": "Bloqueo/desbloqueo",
     "searchByName": "Buscar por nombre",
     "listOfUsers": "Lista de Usuarios que enviaron spam",
     "name": "Nombre",
@@ -310,8 +307,10 @@
     "talawaApiUnavailable": "El servicio Talawa-API no está disponible. ¿Está funcionando? Compruebe también la conectividad de su red.",
     "allMembers": "Todos los miembros",
     "blockedUsers": "Usuarios bloqueados",
-    "searchFirstName": "Ingrese el nombre",
-    "searchLastName": "Introduzca el apellido"
+    "searchByFirstName": "Buscar por nombre de pila",
+    "searchByLastName": "Buscar por apellido",
+    "noResultsFoundFor": "No se encontraron resultados para ",
+    "noSpammerFound": "No se encontró ningún spammer"
   },
   "forgotPassword": {
     "title": "Talawa olvidó su contraseña",
@@ -360,13 +359,22 @@
   },
   "orgSettings": {
     "title": "Configuración Talawa",
+    "pageName": "Configuración",
     "updateYourDetails": "Actualiza tus datos",
     "updateYourPassword": "Actualice su contraseña",
     "updateOrganization": "Actualizar Organización",
-    "deleteOrganization": "Eliminar Organización",
     "seeRequest": "Ver Solicitud",
     "settings": "Ajustes",
-    "noData": "Sin datos"
+    "noData": "Sin datos",
+    "otherSettings": "Otras Configuraciones",
+    "changeLanguage": "Cambiar Idioma"
+  },
+  "deleteOrg": {
+    "deleteOrganization": "Eliminar organización",
+    "deleteMsg": "¿Desea eliminar esta organización?",
+    "no": "No",
+    "yes": "Sí",
+    "longDelOrgMsg": "Al hacer clic en el botón de Eliminar organización, se eliminará permanentemente la organización junto con sus eventos, etiquetas y todos los datos relacionados."
   },
   "userUpdate": {
     "firstName": "Primer nombre",
@@ -403,8 +411,8 @@
     "description": "Descripción",
     "location": "ubicación",
     "displayImage": "Mostrar imagen",
-    "isPublic": "Es público",
-    "isRegistrable": "Es registrable",
+    "isPublic": "Público",
+    "isVisibleInSearch": "Visible en la búsqueda",
     "saveChanges": "Guardar cambios",
     "cancel": "Cancelar",
     "enterNameOrganization": "Ingrese el nombre de la organización",