Merge branch 'develop' into Branch1

.github/workflows/pull-request.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Count number of lines
         run: |
           chmod +x ./.github/workflows/countline.py
-          ./.github/workflows/countline.py --lines 600 --exclude_files src/screens/LoginPage/LoginPage.tsx src/GraphQl/Queries/Queries.ts src/screens/OrgList/OrgList.tsx src/GraphQl/Mutations/mutations.ts
+          ./.github/workflows/countline.py --lines 600 --exclude_files src/screens/LoginPage/LoginPage.tsx src/GraphQl/Queries/Queries.ts src/screens/OrgList/OrgList.tsx src/GraphQl/Mutations/mutations.ts src/components/EventListCard/EventListCardModals.tsx
 
       - name: Get changed TypeScript files
         id: changed-files

public/locales/en.json

@@ -362,16 +362,18 @@
     "yes": "Yes"
   },
   "eventListCard": {
-    "location": "Location",
-    "on": "On",
-    "end": "End",
+    "location": "Event Location",
     "deleteEvent": "Delete Event",
     "deleteEventMsg": "Do you want to remove this event?",
     "no": "No",
     "yes": "Yes",
     "editEvent": "Edit Event",
     "eventTitle": "Title",
     "description": "Description",
+    "startDate": "Start Date",
+    "endDate": "End Date",
+    "registerEvent": "Register",
+    "alreadyRegistered": "Already registered",
     "startTime": "Start Time",
     "endTime": "End Time",
     "allDay": "All Day",
@@ -386,7 +388,16 @@
     "talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too.",
     "thisInstance": "This Instance",
     "thisAndFollowingInstances": "This & Following Instances",
-    "allInstances": "All Instances"
+    "allInstances": "All Instances",
+    "customRecurrence": "Custom Recurrence",
+    "repeatsEvery": "Repeats Every",
+    "repeatsOn": "Repeats On",
+    "ends": "Ends",
+    "never": "Never",
+    "on": "On",
+    "after": "After",
+    "occurences": "occurences",
+    "done": "Done"
   },
   "funds": {
     "title": "Funds",
@@ -438,11 +449,14 @@
     "noCampaigns": "No Campaigns Found",
     "createCampaign": "Create Fund Campaign",
     "updateCampaign": "Update Fund Campaign",
+    "manageCampaign": "Manage Fund Campaign",
     "deleteCampaign": "Delete Fund Campaign",
     "no": "No",
     "yes": "Yes",
     "currency": "Currency",
-    "selectCurrency": "Select Currency"
+    "selectCurrency": "Select Currency",
+    "filter": "Filter",
+    "searchFullName": "Search By Name"
   },
   "pledges": {
     "title": "Fund Campaign Pledges",
@@ -937,7 +951,9 @@
     "startDate": "Start Date",
     "endDate": "End Date",
     "publicEvent": "Is Public",
-    "registerable": "Is Registerable"
+    "registerable": "Is Registerable",
+    "monthlyCalendarView": "Monthly Calendar",
+    "yearlyCalendarView": "Yearly Calender"
   },
   "userEventCard": {
     "location": "Location",
@@ -973,7 +989,8 @@
     "view": "View",
     "edit": "Edit",
     "editAdvertisement": "Edit Advertisement",
-    "saveChanges": "Save Changes"
+    "saveChanges": "Save Changes",
+    "endOfResults": "End of results"
   },
   "userChat": {
     "chat": "Chat",

public/locales/fr.json

@@ -362,16 +362,18 @@
     "yes": "Oui"
   },
   "eventListCard": {
-    "location": "Emplacement",
-    "on": "Sur",
-    "end": "Fin",
+    "location": "Lieu de l'événement",
     "deleteEvent": "Supprimer l'événement",
     "deleteEventMsg": "Voulez-vous supprimer cet événement ?",
     "no": "Non",
     "yes": "Oui",
     "editEvent": "Modifier l'événement",
     "eventTitle": "Titre",
     "description": "La description",
+    "startDate": "Date de début",
+    "endDate": "Date de fin",
+    "registerEvent": "Registre",
+    "alreadyRegistered": "Déjà enregistré",
     "startTime": "Heure de début",
     "endTime": "Heure de fin",
     "allDay": "Toute la journée",
@@ -386,7 +388,16 @@
     "talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Est-il en cours d'exécution ? Vérifiez également votre connectivité réseau.",
     "thisInstance": "Cette Instance",
     "thisAndFollowingInstances": "Cette et les Instances Suivantes",
-    "allInstances": "Toutes les Instances"
+    "allInstances": "Toutes les Instances",
+    "customRecurrence": "Récurrence personnalisée",
+    "repeatsEvery": "Se répète tous les",
+    "repeatsOn": "Se répète sur",
+    "ends": "Finit",
+    "never": "Jamais",
+    "on": "Sur",
+    "after": "Après",
+    "occurences": "Occurrences",
+    "done": "Fait"
   },
   "funds": {
     "title": "Fonds",
@@ -438,11 +449,14 @@
     "noCampaigns": "Pas de campagnes",
     "createCampaign": "Créer une campagne de fonds",
     "updateCampaign": "Mettre à jour la campagne de fonds",
+    "manageCampaign": "Gérer la campagne de fonds",
     "deleteCampaign": "Supprimer la campagne de fonds",
     "no": "Non",
     "yes": "Oui",
     "currency": "Devise",
-    "selectCurrency": "Sélectionnez la devise"
+    "selectCurrency": "Sélectionnez la devise",
+    "filter": "Filtre",
+    "searchFullName": "Rechercher par nom"
   },
   "pledges": {
     "title": "Engagements de campagne de financement",
@@ -932,7 +946,9 @@
     "startDate": "Date de début",
     "endDate": "Date de fin",
     "publicEvent": "Est public",
-    "registerable": "Est enregistrable"
+    "registerable": "Est enregistrable",
+    "monthlyCalendarView": "Calendrier mensuel",
+    "yearlyCalendarView": "Calendrier annuel"
   },
   "userEventCard": {
     "location": "Emplacement",
@@ -960,7 +976,8 @@
     "view": "Voir",
     "edit": "Éditer",
     "editAdvertisement": "Éditer l'annonce",
-    "saveChanges": "Enregistrer les modifications"
+    "saveChanges": "Enregistrer les modifications",
+    "endOfResults": "Fin des résultats"
   },
   "userChat": {
     "chat": "Chat",

public/locales/hi.json

@@ -363,16 +363,18 @@
     "yes": "हाँ"
   },
   "eventListCard": {
-    "location": "स्थान",
-    "on": "पर",
-    "end": "समाप्त",
+    "location": "आयोजन स्थान",
     "deleteEvent": "घटना हटाएं",
     "deleteEventMsg": "क्या आप इस इवेंट को हटाना चाहते हैं?",
     "no": "नहीं",
     "yes": "हाँ",
     "editEvent": "घटना संपादित करें",
     "eventTitle": "शीर्षक",
     "description": "विवरण",
+    "startDate": "आरंभ करने की तिथि",
+    "endDate": "अंतिम तिथि",
+    "registerEvent": "रजिस्टर करें",
+    "alreadyRegistered": "पहले से ही पंजीकृत",
     "startTime": "समय शुरू",
     "endTime": "अंत समय",
     "allDay": "पूरे दिन",
@@ -387,7 +389,16 @@
     "talawaApiUnavailable": "तलवा-एपीआई सेवा उपलब्ध नहीं है। क्या यह चल रहा है? अपनी नेटवर्क कनेक्टिविटी भी जांचें।",
     "thisInstance": "यह अवसर",
     "thisAndFollowingInstances": "यह और निम्नलिखित अवसर",
-    "allInstances": "सभी अवसर"
+    "allInstances": "सभी अवसर",
+    "customRecurrence": "कस्टम पुनरावृत्ति",
+    "repeatsEvery": "दोहराता है हर",
+    "repeatsOn": "को दोहराएगा",
+    "ends": "समाप्त होता",
+    "never": "कभी नहीं",
+    "on": "पर",
+    "after": "के बाद",
+    "occurences": "'घटित होता है",
+    "done": "समाज-सम्मत"
   },
   "funds": {
     "title": "फंड्स",
@@ -440,11 +451,14 @@
     "noCampaigns": "कोई अभियान नहीं",
     "createCampaign": "अभियान बनाएँ",
     "updateCampaign": "अभियान अपडेट करें",
+    "manageCampaign": "अभियान प्रबंधित करें",
     "deleteCampaign": "अभियान हटाएं",
     "no": "नहीं",
     "yes": "हाँ",
     "currency": "मुद्रा",
-    "selectCurrency": "मुद्रा चुनें"
+    "selectCurrency": "मुद्रा चुनें",
+    "filter": "फ़िल्टर",
+    "searchFullName": "नाम से खोजें"
   },
   "pledges": {
     "title": "फंडकैम्पेन प्रतिज्ञाएं",
@@ -937,7 +951,9 @@
     "startDate": "प्रारंभ तिथि",
     "endDate": "अंतिम तिथि",
     "publicEvent": "सार्वजनिक है",
-    "registerable": "पंजीकृत करने योग्य है"
+    "registerable": "पंजीकृत करने योग्य है",
+    "monthlyCalendarView": "मासिक कैलेंडर",
+    "yearlyCalendarView": "वार्षिक कैलेंडर"
   },
   "userEventCard": {
     "location": "जगह",
@@ -965,7 +981,8 @@
     "view": "देखें",
     "edit": "संपादित करें",
     "editAdvertisement": "विज्ञापन संपादित करें",
-    "saveChanges": "परिवर्तन सहेजें"
+    "saveChanges": "परिवर्तन सहेजें",
+    "endOfResults": "परिणामों का अंत"
   },
   "userChat": {
     "chat": "बात",

public/locales/sp.json

@@ -362,16 +362,18 @@
     "yes": "Sí"
   },
   "eventListCard": {
-    "location": "Ubicación",
-    "on": "En",
-    "end": "Final",
+    "location": "Lugar del evento",
     "deleteEvent": "Eliminar evento",
     "deleteEventMsg": "¿Quieres eliminar este evento?",
     "no": "No",
     "yes": "Sí",
     "editEvent": "Editar evento",
     "eventTitle": "Título",
     "description": "Descripción",
+    "startDate": "Fecha de inicio",
+    "endDate": "Fecha final",
+    "registerEvent": "Registro",
+    "alreadyRegistered": "Ya registrado",
     "startTime": "Hora de inicio",
     "endTime": "Hora de finalización",
     "allDay": "Todo el dia",
@@ -386,7 +388,16 @@
     "talawaApiUnavailable": "El servicio Talawa-API no está disponible. ¿Está funcionando? Compruebe también la conectividad de su red.",
     "thisInstance": "Esta Instancia",
     "thisAndFollowingInstances": "Esta y las Siguientes Instancias",
-    "allInstances": "Todas las Instancias"
+    "allInstances": "Todas las Instancias",
+    "customRecurrence": "Recurrencia personalizada",
+    "repeatsEvery": "Se repite cada",
+    "repeatsOn": "Se repite en",
+    "ends": "Finaliza",
+    "never": "Nunca",
+    "on": "En",
+    "after": "Después de",
+    "occurences": "ocurrencias",
+    "done": "Hecho"
   },
   "funds": {
     "title": "Fondos",
@@ -438,11 +449,14 @@
     "noCampaigns": "No se encontraron campañas",
     "createCampaign": "Crear campaña de recaudación de fondos",
     "updateCampaign": "Actualizar campaña de recaudación de fondos",
+    "manageCampaign": "Administrar campaña de recaudación de fondos",
     "deleteCampaign": "Eliminar campaña de recaudación de fondos",
     "no": "No",
     "yes": "Sí",
     "currency": "Moneda",
-    "selectCurrency": "Seleccionar moneda"
+    "selectCurrency": "Seleccionar moneda",
+    "filter": "Filtrar",
+    "searchFullName": "Buscar por nombre"
   },
   "pledges": {
     "title": "Compromisos de Campaña de Financiamiento",
@@ -934,7 +948,9 @@
     "startDate": "Fecha de inicio",
     "endDate": "Fecha de finalización",
     "publicEvent": "Es público",
-    "registerable": "Es registrable"
+    "registerable": "Es registrable",
+    "monthlyCalendarView": "Calendario mensual",
+    "yearlyCalendarView": "Calendario anual"
   },
   "userEventCard": {
     "location": "Ubicación",
@@ -962,7 +978,8 @@
     "view": "Ver",
     "edit": "Editar",
     "editAdvertisement": "Editar Anuncio",
-    "saveChanges": "Guardar Cambios"
+    "saveChanges": "Guardar Cambios",
+    "endOfResults": "Fin de los resultados"
   },
   "userChat": {
     "chat": "Charlar",

public/locales/zh.json

@@ -138,11 +138,14 @@
     "noCampaigns": "未找到活动",
     "createCampaign": "创建筹款活动",
     "updateCampaign": "更新筹款活动",
+    "manageCampaign": "管理筹款活动",
     "deleteCampaign": "删除筹款活动",
     "no": "没有",
     "yes": "是",
     "currency": "货币",
-    "selectCurrency": "选择货币"
+    "selectCurrency": "选择货币",
+    "filter": "筛选",
+    "searchFullName": "按姓名搜索"
   },
   "pledges": {
     "title": "资金筹款承诺",
@@ -442,16 +445,18 @@
     "yes": "是"
   },
   "eventListCard": {
-    "location": "地點",
-    "on": "上",
-    "end": "結尾",
+    "location": "活動地點",
     "deleteEvent": "刪除事件",
     "deleteEventMsg": "您要刪除此活動嗎？",
     "no": "不",
     "yes": "是的",
     "editEvent": "編輯事件",
     "eventTitle": "標題",
     "description": "描述",
+    "startDate": "开始日期",
+    "endDate": "结束日期",
+    "registerEvent": "登記",
+    "alreadyRegistered": "已經註冊",
     "startTime": "開始時間",
     "endTime": "時間結束",
     "allDay": "一整天",
@@ -466,7 +471,16 @@
     "talawaApiUnavailable": "服務不可用。它在運行嗎？還要檢查您的網絡連接。",
     "thisInstance": "此实例",
     "thisAndFollowingInstances": "此及其后续实例",
-    "allInstances": "所有实例"
+    "allInstances": "所有实例",
+    "customRecurrence": "自定义重复",
+    "repeatsEvery": "重复每",
+    "repeatsOn": "重复于",
+    "ends": "结束",
+    "never": "永不",
+    "on": "于",
+    "after": "之后",
+    "occurences": "次数",
+    "done": "完成"
   },
   "orgPost": {
     "title": "塔拉瓦帖子",
@@ -935,7 +949,9 @@
     "startDate": "开始日期",
     "endDate": "结束日期",
     "publicEvent": "公开",
-    "registerable": "可注册"
+    "registerable": "可注册",
+    "monthlyCalendarView": "月历",
+    "yearlyCalendarView": "年度日历"
   },
   "userEventCard": {
     "location": "地點",
@@ -963,7 +979,8 @@
     "view": "查看",
     "edit": "编辑",
     "editAdvertisement": "编辑广告",
-    "saveChanges": "保存更改"
+    "saveChanges": "保存更改",
+    "endOfResults": "結果結束"
   },
   "userChat": {
     "chat": "聊天",