Skip to content

Commit 69d0c2c

Browse files
working user leave org functionality
1 parent 315641f commit 69d0c2c

24 files changed

+395
-193
lines changed

public/locales/en/common.json

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,5 @@
8383
"removedSuccessfully": "{{item}} removed Successfully",
8484
"successfullyUpdated": "Successfully Updated",
8585
"sort": "Sort",
86-
"all": "All",
87-
"active": "Active",
88-
"disabled": "Disabled",
89-
"pending": "Pending",
90-
"completed": "Completed",
91-
"late": "Late",
92-
"createdLatest": "Created Latest",
93-
"createdEarliest": "Created Earliest",
94-
"searchBy": "Search by {{item}}"
95-
}
86+
"confirm": "Confirm"
87+
}

public/locales/en/errors.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
"notFoundMsg": "Oops! The Page you requested was not found!",
99
"errorOccurredCouldntCreate": "An error occurred. Couldn't create {{entity}}",
1010
"errorLoading": "Error occured while loading {{entity}} data"
11-
}
11+
}

public/locales/en/translation.json

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@
148148
"roleUpdated": "Role Updated.",
149149
"joinNow": "Join Now",
150150
"visit": "Visit",
151+
"leave": "Leave",
151152
"withdraw": "Widthdraw",
152153
"removeUserFrom": "Remove User from {{org}}",
153154
"removeConfirmation": "Are you sure you want to remove '{{name}}' from organization '{{org}}'?"
@@ -283,8 +284,9 @@
283284
"assignmentDate": "Assignment Date",
284285
"active": "Active",
285286
"clearFilters": "Clear Filters",
287+
"completed": "Completed",
286288
"completionDate": "Completion Date",
287-
"createActionItem": "Create Action Item",
289+
"createActionItem": "Create Action Items",
288290
"deleteActionItem": "Delete Action Item",
289291
"deleteActionItemMsg": "Do you want to remove this action item?",
290292
"details": "Details",
@@ -307,14 +309,7 @@
307309
"successfulCreation": "Action Item created successfully",
308310
"successfulUpdation": "Action Item updated successfully",
309311
"successfulDeletion": "Action Item deleted successfully",
310-
"title": "Action Items",
311-
"category": "Category",
312-
"allotedHours": "Alloted Hours",
313-
"latestDueDate": "Latest Due Date",
314-
"earliestDueDate": "Earliest Due Date",
315-
"updateActionItem": "Update Action Item",
316-
"noneUpdated": "None of the fields were updated",
317-
"updateStatusMsg": "Are you sure you want to mark this action item as pending?"
312+
"title": "Action Items"
318313
},
319314
"organizationAgendaCategory": {
320315
"agendaCategoryDetails": "Agenda Category Details",
@@ -607,8 +602,7 @@
607602
"noData": "No data",
608603
"otherSettings": "Other Settings",
609604
"changeLanguage": "Change Language",
610-
"manageCustomFields": "Manage Custom Fields",
611-
"agendaItemCategories": "Agenda Item Categories"
605+
"manageCustomFields": "Manage Custom Fields"
612606
},
613607
"deleteOrg": {
614608
"deleteOrganization": "Delete Organization",
@@ -765,7 +759,8 @@
765759
"communityProfile": "Community Profile",
766760
"logout": "Logout",
767761
"settings": "Settings",
768-
"chat": "Chat"
762+
"chat": "Chat",
763+
"leave": "Leave Organization"
769764
},
770765
"organizationSidebar": {
771766
"viewAll": "View all",
@@ -861,10 +856,7 @@
861856
"yourPreviousDonations": "Your Previous Donations",
862857
"donate": "Donate",
863858
"nothingToShow": "Nothing to show here.",
864-
"success": "Donation Successful",
865-
"invalidAmount": "Please enter a numerical value for the donation amount.",
866-
"donationAmountDescription": "Please enter the numerical value for the donation amount.",
867-
"donationOutOfRange": "Donation amount must be between {{min}} and {{max}}."
859+
"success": "Donation Successful"
868860
},
869861
"userEvents": {
870862
"title": "Events",
@@ -944,18 +936,13 @@
944936
"disableButton": "Disable",
945937
"updateActionItemCategory": "Update",
946938
"actionItemCategoryName": "Name",
947-
"categoryDetails": "Category Details",
939+
"actionItemCategoryDetails": "Action Item Category Details",
948940
"enterName": "Enter Name",
949941
"successfulCreation": "Action Item Category created successfully",
950942
"successfulUpdation": "Action Item Category updated successfully",
951943
"sameNameConflict": "Please change the name to make an update",
952944
"categoryEnabled": "Action Item Category Enabled",
953-
"categoryDisabled": "Action Item Category Disabled",
954-
"noActionItemCategories": "No Action Item Categories",
955-
"status": "Status",
956-
"categoryDeleted": "Action Item Category deleted successfully",
957-
"deleteCategory": "Delete Category",
958-
"deleteCategoryMsg": "Are you sure you want to delete this Action Item Category?"
945+
"categoryDisabled": "Action Item Category Disabled"
959946
},
960947
"organizationVenues": {
961948
"title": "Venues",
@@ -1051,5 +1038,12 @@
10511038
},
10521039
"userPledges": {
10531040
"title": "My Pledges"
1041+
},
1042+
"orgLeave": {
1043+
"confirmation": "Are you sure you want to leave the organization? ",
1044+
"heading": "Leaving organization ?",
1045+
"description": "Are you sure you want to leave the organization? This action cannot be undone. If the organization requires approval, you will not be able to rejoin without it. Any related data or permissions may also be lost.",
1046+
"errorOccured": "An error occurred. Please try again later.",
1047+
"orgLeft": "You have left the organization."
10541048
}
1055-
}
1049+
}

public/locales/fr/common.json

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,5 @@
8383
"updatedSuccessfully": "{{item}} mis à jour avec succès",
8484
"removedSuccessfully": "{{item}} supprimé avec succès",
8585
"successfullyUpdated": "Mis à jour avec succès",
86-
"all": "Tous",
87-
"active": "Actif",
88-
"disabled": "Désactivé",
89-
"pending": "En attente",
90-
"completed": "Complété",
91-
"late": "En retard",
92-
"createdLatest": "Créé le plus récemment",
93-
"createdEarliest": "Créé le plus tôt",
94-
"searchBy": "Rechercher par {{item}}"
95-
}
86+
"confirm": "Confirmer"
87+
}

public/locales/fr/errors.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
"notFoundMsg": "Oops! ",
99
"errorOccurredCouldntCreate": "Une erreur s'est produite. Impossible de créer {{entity}}",
1010
"errorLoading": "Une erreur s'est produite lors du chargement des données {{entity}}"
11-
}
11+
}

public/locales/fr/translation.json

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@
148148
"roleUpdated": "Rôle mis à jour.",
149149
"joinNow": "Adhérer maintenant",
150150
"visit": "Visite",
151+
"leave": "partir",
151152
"withdraw": "Largeur de tirage",
152153
"removeUserFrom": "Supprimer l'Utilisateur de {{org}}",
153154
"removeConfirmation": "Êtes-vous sûr de vouloir supprimer '{{name}}' de l'organisation '{{org}}' ?"
@@ -286,6 +287,7 @@
286287
"assignmentDate": "Date d'affectation",
287288
"active": "Actif",
288289
"clearFilters": "Effacer les filtres",
290+
"completed": "Complété",
289291
"completionDate": "Date d'achèvement",
290292
"createActionItem": "Créer un élément d'action",
291293
"deleteActionItem": "Supprimer l'élément d'action",
@@ -310,14 +312,7 @@
310312
"successfulCreation": "Élément d'action créé avec succès",
311313
"successfulUpdation": "Élément d'action mis à jour avec succès",
312314
"successfulDeletion": "Élément d'action supprimé avec succès",
313-
"title": "Éléments d'action",
314-
"category": "Catégorie",
315-
"allotedHours": "Heures allouées",
316-
"latestDueDate": "Date d'échéance la plus récente",
317-
"earliestDueDate": "Date d'échéance la plus ancienne",
318-
"updateActionItem": "Mettre à jour l'élément d'action",
319-
"noneUpdated": "Aucun des champs n'a été mis à jour",
320-
"updateStatusMsg": "Êtes-vous sûr de vouloir marquer cet élément d'action comme en attente?"
315+
"title": "Éléments d'action"
321316
},
322317
"organizationAgendaCategory": {
323318
"agendaCategoryDetails": "Détails de la catégorie d'ordre du jour",
@@ -610,11 +605,10 @@
610605
"actionItemCategories": "Catégories d'éléments d'action",
611606
"updateOrganization": "Mettre à jour l'organisation",
612607
"seeRequest": "Voir la demande",
613-
"noData": "Aucune donnée",
614-
"otherSettings": "Autres paramètres",
608+
"noData": "Pas de données",
609+
"otherSettings": "Autres réglages",
615610
"changeLanguage": "Changer de langue",
616-
"manageCustomFields": "Gérer les champs personnalisés",
617-
"agendaItemCategories": "Catégories d'éléments d'agenda"
611+
"manageCustomFields": "Gérer les champs personnalisés"
618612
},
619613
"deleteOrg": {
620614
"deleteOrganization": "Supprimer l'organisation",
@@ -765,7 +759,8 @@
765759
"viewAll": "Voir tout",
766760
"talawaUserPortal": "Portail utilisateur Talawa",
767761
"my organizations": "Mes organisations",
768-
"communityProfile": "Profil de la communauté"
762+
"communityProfile": "Profil de la communauté",
763+
"leave": "Quitter l'organisation"
769764
},
770765
"organizationSidebar": {
771766
"viewAll": "Voir tout",
@@ -861,10 +856,7 @@
861856
"yourPreviousDonations": "Vos dons précédents",
862857
"donate": "Faire un don",
863858
"nothingToShow": "Rien à montrer ici.",
864-
"success": "Don réussi",
865-
"invalidAmount": "Veuillez saisir une valeur numérique pour le montant du don.",
866-
"donationAmountDescription": "Veuillez saisir la valeur numérique du montant du don.",
867-
"donationOutOfRange": "Le montant du don doit être compris entre {{min}} et {{max}}."
859+
"success": "Don réussi"
868860
},
869861
"userEvents": {
870862
"title": "Événements",
@@ -945,18 +937,13 @@
945937
"disableButton": "Désactiver",
946938
"updateActionItemCategory": "Mise à jour",
947939
"actionItemCategoryName": "Nom",
948-
"categoryDetails": "Détails de la catégorie",
940+
"actionItemCategoryDetails": "Détails de la catégorie d'élément d'action",
949941
"enterName": "Entrez le nom",
950942
"successfulCreation": "Catégorie d'élément d'action créée avec succès",
951943
"successfulUpdation": "Catégorie d'élément d'action mise à jour avec succès",
952944
"sameNameConflict": "Veuillez changer le nom pour effectuer une mise à jour",
953945
"categoryEnabled": "Catégorie d'élément d'action activée",
954-
"categoryDisabled": "Catégorie d'élément d'action désactivée",
955-
"noActionItemCategories": "Aucune catégorie d'élément d'action",
956-
"status": "Statut",
957-
"categoryDeleted": "Catégorie d'élément d'action supprimée avec succès",
958-
"deleteCategory": "Supprimer la catégorie",
959-
"deleteCategoryMsg": "Êtes-vous sûr de vouloir supprimer cette catégorie d'élément d'action ?"
946+
"categoryDisabled": "Catégorie d'élément d'action désactivée"
960947
},
961948
"organizationVenues": {
962949
"title": "Lieux",
@@ -1052,5 +1039,12 @@
10521039
},
10531040
"userPledges": {
10541041
"title": "Mes Promesses"
1042+
},
1043+
"orgLeave": {
1044+
"confirmation": "Etes-vous sûr de vouloir quitter l'organisation ? ",
1045+
"heading": "Quitter l'organisation ?",
1046+
"description": "Etes-vous sûr de vouloir quitter l'organisation ? Cette action ne peut pas être annulée. Si l'organisation nécessite une approbation, vous ne pourrez pas la rejoindre sans cette approbation. Toutes les données ou autorisations associées peuvent également être perdues.",
1047+
"errorOccured": "Une erreur s'est produite. Veuillez réessayer plus tard.",
1048+
"orgLeft": "Vous avez quitté l'organisation."
10551049
}
1056-
}
1050+
}

public/locales/hi/common.json

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,5 @@
8383
"updatedSuccessfully": "{{item}} सफलतापूर्वक अपडेट किया गया",
8484
"removedSuccessfully": "{{item}} सफलतापूर्वक हटाया गया",
8585
"successfullyUpdated": "सफलतापूर्वक अपडेट किया गया",
86-
"all": "सभी",
87-
"active": "सक्रिय",
88-
"disabled": "अक्षम",
89-
"pending": "लंबित",
90-
"completed": "पूरा हुआ",
91-
"late": "देर से",
92-
"createdLatest": "नवीनतम बनाया गया",
93-
"createdEarliest": "सबसे पहले बनाया गया",
94-
"searchBy": "के द्वारा खोजें {{item}}"
95-
}
86+
"confirm": "पुष्टि करें"
87+
}

public/locales/hi/errors.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
"notFoundMsg": "उफ़! ",
99
"errorOccurredCouldntCreate": "एक त्रुटि हुई। {{entity}} नहीं बना सके",
1010
"errorLoading": "{{entity}} डेटा लोड करते समय त्रुटि हुई"
11-
}
11+
}

public/locales/hi/translation.json

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@
150150
"visit": "मिलने जाना",
151151
"withdraw": "चौड़ाई निकालना",
152152
"removeUserFrom": "{{org}} से उपयोगकर्ता हटाएं",
153-
"removeConfirmation": "क्या आप वाकई '{{org}}' संगठन से '{{name}}' को हटाना चाहते हैं?"
153+
"removeConfirmation": "क्या आप वाकई '{{org}}' संगठन से '{{name}}' को हटाना चाहते हैं?",
154+
"leave": "छोड़ो"
154155
},
155156
"communityProfile": {
156157
"title": "सामुदायिक प्रोफ़ाइल",
@@ -286,6 +287,7 @@
286287
"assignmentDate": "असाइनमेंट दिनांक",
287288
"active": "सक्रिय",
288289
"clearFilters": "फ़िल्टर साफ़ करें",
290+
"completed": "पुरा होना।",
289291
"completionDate": "पूरा करने की तिथि",
290292
"createActionItem": "कार्रवाई आइटम बनाएं",
291293
"deleteActionItem": "क्रिया आइटम हटाएँ",
@@ -310,14 +312,7 @@
310312
"successfulCreation": "कार्रवाई आइटम सफलतापूर्वक बनाया गया",
311313
"successfulUpdation": "कार्रवाई आइटम सफलतापूर्वक अपडेट किया गया",
312314
"successfulDeletion": "कार्रवाई आइटम सफलतापूर्वक हटा दिया गया",
313-
"title": "एक्शन आइटम्स",
314-
"category": "श्रेणी",
315-
"allotedHours": "आवंटित घंटे",
316-
"latestDueDate": "सबसे अधिक नियत तिथि",
317-
"earliestDueDate": "सबसे पहले की नियत तिथि",
318-
"updateActionItem": "कार्य आइटम अपडेट करें",
319-
"noneUpdated": "कोई फ़ील्ड अपडेट नहीं किया गया",
320-
"updateStatusMsg": "क्या आप वाकई इस कार्य आइटम को लंबित के रूप में चिह्नित करना चाहते हैं?"
315+
"title": "एक्शन आइटम्स"
321316
},
322317
"organizationAgendaCategory": {
323318
"agendaCategoryDetails": "एजेंडा श्रेणी विवरण",
@@ -605,16 +600,15 @@
605600
"amount": "मात्रा"
606601
},
607602
"orgSettings": {
608-
"title": "सेटिंग्स",
603+
"title": "समायोजन",
609604
"general": "सामान्य",
610-
"actionItemCategories": "कार्य आइटम श्रेणियाँ",
611-
"updateOrganization": "संगठन अपडेट करें",
605+
"actionItemCategories": "कार्रवाई आइटम श्रेणियाँ",
606+
"updateOrganization": "संगठन अद्यतन करें",
612607
"seeRequest": "अनुरोध देखें",
613608
"noData": "कोई डेटा नहीं",
614-
"otherSettings": "अन्य सेटिंग्स",
609+
"otherSettings": "अन्य सेटिंग",
615610
"changeLanguage": "भाषा बदलें",
616-
"manageCustomFields": "कस्टम फ़ील्ड प्रबंधित करें",
617-
"agendaItemCategories": "एजेंडा आइटम श्रेणियाँ"
611+
"manageCustomFields": "कस्टम फ़ील्ड प्रबंधित करें"
618612
},
619613
"deleteOrg": {
620614
"deleteOrganization": "संगठन हटाएँ",
@@ -765,7 +759,8 @@
765759
"viewAll": "सभी को देखें",
766760
"talawaUserPortal": "तलावा उपयोगकर्ता पोर्टल",
767761
"my organizations": "मेरे संगठन",
768-
"communityProfile": "सामुदायिक प्रोफ़ाइल"
762+
"communityProfile": "सामुदायिक प्रोफ़ाइल",
763+
"leave": "संगठन छोड़ें"
769764
},
770765
"organizationSidebar": {
771766
"viewAll": "सभी को देखें",
@@ -861,10 +856,7 @@
861856
"yourPreviousDonations": "आपका पिछला दान",
862857
"donate": "दान करें",
863858
"nothingToShow": "यहां दिखाने के लिए कुछ भी नहीं है.",
864-
"success": "दान सफल",
865-
"invalidAmount": "कृपया दान राशि के लिए संख्यात्मक मान दर्ज करें.",
866-
"donationAmountDescription": "कृपया दान राशि के लिए संख्यात्मक मान दर्ज करें.",
867-
"donationOutOfRange": "दान राशि {{min}} और {{max}} के बीच होनी चाहिए."
859+
"success": "दान सफल"
868860
},
869861
"userEvents": {
870862
"title": "ईवेंट",
@@ -945,18 +937,13 @@
945937
"disableButton": "अक्षम करना",
946938
"updateActionItemCategory": "अद्यतन",
947939
"actionItemCategoryName": "नाम",
948-
"categoryDetails": "श्रेणी विवरण",
940+
"actionItemCategoryDetails": "कार्य आइटम श्रेणी विवरण",
949941
"enterName": "नाम दर्ज करें",
950942
"successfulCreation": "कार्रवाई आइटम श्रेणी सफलतापूर्वक बनाई गई",
951943
"successfulUpdation": "कार्रवाई आइटम श्रेणी सफलतापूर्वक अपडेट की गई",
952944
"sameNameConflict": "अपडेट करने के लिए कृपया नाम बदलें",
953945
"categoryEnabled": "कार्य आइटम श्रेणी सक्षम",
954-
"categoryDisabled": "कार्रवाई आइटम श्रेणी अक्षम",
955-
"noActionItemCategories": "कोई कार्रवाई आइटम श्रेणी नहीं",
956-
"status": "स्थिति",
957-
"categoryDeleted": "कार्रवाई आइटम श्रेणी सफलतापूर्वक हटा दी गई",
958-
"deleteCategory": "श्रेणी हटाएं",
959-
"deleteCategoryMsg": "क्या आप वाकई इस कार्रवाई आइटम श्रेणी को हटाना चाहते हैं?"
946+
"categoryDisabled": "कार्रवाई आइटम श्रेणी अक्षम"
960947
},
961948
"organizationVenues": {
962949
"title": "स्थानों",
@@ -1052,5 +1039,12 @@
10521039
},
10531040
"userPledges": {
10541041
"title": "मेरी प्रतिज्ञाएँ"
1042+
},
1043+
"orgLeave": {
1044+
"confirmation": "क्या आप वाकई संगठन छोड़ना चाहते हैं?",
1045+
"heading": "संगठन छोड़ रहे हैं?",
1046+
"description": "क्या आप वाकई संगठन छोड़ना चाहते हैं? इस एक्शन को वापस नहीं किया जा सकता। यदि संगठन को अनुमोदन की आवश्यकता है, तो आप इसके बिना पुनः शामिल नहीं हो पाएंगे। कोई भी संबंधित डेटा या अनुमतियाँ भी खो सकती हैं।",
1047+
"errorOccured": "एक त्रुटि पाई गई। कृपया बाद में पुन: प्रयास करें।",
1048+
"orgLeft": "आपने संगठन छोड़ दिया है."
10551049
}
1056-
}
1050+
}

0 commit comments

Comments
 (0)