Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat : User can leave the org by clicking on button #2298

Closed
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,5 @@
"removedSuccessfully": "{{item}} removed Successfully",
"successfullyUpdated": "Successfully Updated",
"sort": "Sort",
"all": "All",
"active": "Active",
"disabled": "Disabled",
"pending": "Pending",
"completed": "Completed",
"late": "Late",
"createdLatest": "Created Latest",
"createdEarliest": "Created Earliest",
"searchBy": "Search by {{item}}"
"confirm": "Confirm"
AnshulKahar2729 marked this conversation as resolved.
Show resolved Hide resolved
}
20 changes: 15 additions & 5 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@
"roleUpdated": "Role Updated.",
"joinNow": "Join Now",
"visit": "Visit",
"leave": "Leave",
"withdraw": "Widthdraw",
AnshulKahar2729 marked this conversation as resolved.
Show resolved Hide resolved
"removeUserFrom": "Remove User from {{org}}",
"removeConfirmation": "Are you sure you want to remove '{{name}}' from organization '{{org}}'?",
Expand Down Expand Up @@ -407,8 +408,9 @@
"assignmentDate": "Assignment Date",
"active": "Active",
"clearFilters": "Clear Filters",
"completed": "Completed",
"completionDate": "Completion Date",
"createActionItem": "Create Action Item",
"createActionItem": "Create Action Items",
AnshulKahar2729 marked this conversation as resolved.
Show resolved Hide resolved
"deleteActionItem": "Delete Action Item",
"deleteActionItemMsg": "Do you want to remove this action item?",
"details": "Details",
Expand Down Expand Up @@ -765,8 +767,7 @@
"noData": "No data",
"otherSettings": "Other Settings",
"changeLanguage": "Change Language",
"manageCustomFields": "Manage Custom Fields",
"agendaItemCategories": "Agenda Item Categories"
"manageCustomFields": "Manage Custom Fields"
},
"deleteOrg": {
"deleteOrganization": "Delete Organization",
Expand Down Expand Up @@ -977,6 +978,7 @@
"logout": "Logout",
"settings": "Settings",
"chat": "Chat",
"leave": "Leave Organization",
"menu": "menu"
},
"organizationSidebar": {
Expand Down Expand Up @@ -1187,7 +1189,7 @@
"disableButton": "Disable",
"updateActionItemCategory": "Update",
"actionItemCategoryName": "Name",
"categoryDetails": "Category Details",
"actionItemCategoryDetails": "Action Item Category Details",
AnshulKahar2729 marked this conversation as resolved.
Show resolved Hide resolved
"enterName": "Enter Name",
"successfulCreation": "Action Item Category created successfully",
"successfulUpdation": "Action Item Category updated successfully",
Expand All @@ -1200,7 +1202,8 @@
"deleteCategory": "Delete Category",
"deleteCategoryMsg": "Are you sure you want to delete this Action Item Category?",
"createButton": "createButton",
"editButton": "editButton"
"editButton": "editButton",
"categoryDetails": "categoryDetails"
Comment on lines +1210 to +1211
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Update placeholder values for new keys.

The addition of "editButton" and "categoryDetails" is appropriate. However, they have placeholder values that need to be replaced with proper translations.

Please update the following keys with appropriate translations:

-    "editButton": "editButton",
+    "editButton": "Edit",
-    "categoryDetails": "categoryDetails"
+    "categoryDetails": "Category Details"
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
"editButton": "editButton",
"categoryDetails": "categoryDetails"
"editButton": "Edit",
"categoryDetails": "Category Details"

},
"organizationVenues": {
"title": "Venues",
Expand Down Expand Up @@ -1314,5 +1317,12 @@
},
"userPledges": {
"title": "My Pledges"
},
"orgLeave": {
"confirmation": "Are you sure you want to leave the organization? ",
"heading": "Leaving organization ?",
"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.",
"errorOccured": "An error occurred. Please try again later.",
"orgLeft": "You have left the organization."
}
}
10 changes: 1 addition & 9 deletions public/locales/fr/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,5 @@
"updatedSuccessfully": "{{item}} mis à jour avec succès",
"removedSuccessfully": "{{item}} supprimé avec succès",
"successfullyUpdated": "Mis à jour avec succès",
"all": "Tous",
"active": "Actif",
"disabled": "Désactivé",
"pending": "En attente",
"completed": "Complété",
"late": "En retard",
"createdLatest": "Créé le plus récemment",
"createdEarliest": "Créé le plus tôt",
"searchBy": "Rechercher par {{item}}"
"confirm": "Confirmer"
}
22 changes: 16 additions & 6 deletions public/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@
"roleUpdated": "Rôle mis à jour.",
"joinNow": "Adhérer maintenant",
"visit": "Visite",
"leave": "partir",
"withdraw": "Largeur de tirage",
"removeUserFrom": "Supprimer l'Utilisateur de {{org}}",
"removeConfirmation": "Êtes-vous sûr de vouloir supprimer '{{name}}' de l'organisation '{{org}}' ?",
Expand Down Expand Up @@ -407,6 +408,7 @@
"assignmentDate": "Date d'affectation",
"active": "Actif",
"clearFilters": "Effacer les filtres",
"completed": "Complété",
"completionDate": "Date d'achèvement",
"createActionItem": "Créer un élément d'action",
"deleteActionItem": "Supprimer l'élément d'action",
Expand Down Expand Up @@ -762,11 +764,10 @@
"actionItemCategories": "Catégories d'éléments d'action",
"updateOrganization": "Mettre à jour l'organisation",
"seeRequest": "Voir la demande",
"noData": "Aucune donnée",
"otherSettings": "Autres paramètres",
"noData": "Pas de données",
"otherSettings": "Autres réglages",
"changeLanguage": "Changer de langue",
"manageCustomFields": "Gérer les champs personnalisés",
"agendaItemCategories": "Catégories d'éléments d'agenda"
"manageCustomFields": "Gérer les champs personnalisés"
},
"deleteOrg": {
"deleteOrganization": "Supprimer l'organisation",
Expand Down Expand Up @@ -972,6 +973,7 @@
"talawaUserPortal": "Portail utilisateur Talawa",
"my organizations": "Mes organisations",
"communityProfile": "Profil de la communauté",
"leave": "Quitter l'organisation",
"users": "utilisateurs",
"requests": "demandes",
"logout": "se déconnecter",
Expand Down Expand Up @@ -1187,7 +1189,7 @@
"disableButton": "Désactiver",
"updateActionItemCategory": "Mise à jour",
"actionItemCategoryName": "Nom",
"categoryDetails": "Détails de la catégorie",
"actionItemCategoryDetails": "Détails de la catégorie d'élément d'action",
"enterName": "Entrez le nom",
"successfulCreation": "Catégorie d'élément d'action créée avec succès",
"successfulUpdation": "Catégorie d'élément d'action mise à jour avec succès",
Expand All @@ -1200,7 +1202,8 @@
"deleteCategory": "Supprimer la catégorie",
"deleteCategoryMsg": "Êtes-vous sûr de vouloir supprimer cette catégorie d'élément d'action ?",
"createButton": "Créer",
"editButton": "Modifier"
"editButton": "Modifier",
"categoryDetails": "Détails de la catégorie"
},
"organizationVenues": {
"title": "Lieux",
Expand Down Expand Up @@ -1314,5 +1317,12 @@
},
"userPledges": {
"title": "Mes Promesses"
},
"orgLeave": {
"confirmation": "Etes-vous sûr de vouloir quitter l'organisation ? ",
"heading": "Quitter l'organisation ?",
"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.",
"errorOccured": "Une erreur s'est produite. Veuillez réessayer plus tard.",
"orgLeft": "Vous avez quitté l'organisation."
}
}
10 changes: 1 addition & 9 deletions public/locales/hi/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,5 @@
"updatedSuccessfully": "{{item}} सफलतापूर्वक अपडेट किया गया",
"removedSuccessfully": "{{item}} सफलतापूर्वक हटाया गया",
"successfullyUpdated": "सफलतापूर्वक अपडेट किया गया",
"all": "सभी",
"active": "सक्रिय",
"disabled": "अक्षम",
"pending": "लंबित",
"completed": "पूरा हुआ",
"late": "देर से",
"createdLatest": "नवीनतम बनाया गया",
"createdEarliest": "सबसे पहले बनाया गया",
"searchBy": "के द्वारा खोजें {{item}}"
"confirm": "पुष्टि करें"
}
26 changes: 18 additions & 8 deletions public/locales/hi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@
"withdraw": "वापस लें",
"removeUserFrom": "{{org}} से उपयोगकर्ता को हटाएं",
"removeConfirmation": "क्या आप वाकई '{{name}}' को संगठन '{{org}}' से हटाना चाहते हैं?",
"leave": "छोड़ो",
"searchByName": "नाम से खोजें",
"users": "उपयोगकर्ता",
"name": "नाम",
Expand Down Expand Up @@ -407,6 +408,7 @@
"assignmentDate": "असाइनमेंट दिनांक",
"active": "सक्रिय",
"clearFilters": "फ़िल्टर साफ़ करें",
"completed": "पुरा होना।",
"completionDate": "पूरा करने की तिथि",
"createActionItem": "कार्रवाई आइटम बनाएं",
"deleteActionItem": "क्रिया आइटम हटाएँ",
Expand Down Expand Up @@ -757,16 +759,15 @@
"amount": "मात्रा"
},
"orgSettings": {
"title": "सेटिंग्स",
"title": "समायोजन",
"general": "सामान्य",
"actionItemCategories": "कार्य आइटम श्रेणियाँ",
"updateOrganization": "संगठन अपडेट करें",
"actionItemCategories": "कार्रवाई आइटम श्रेणियाँ",
"updateOrganization": "संगठन अद्यतन करें",
"seeRequest": "अनुरोध देखें",
"noData": "कोई डेटा नहीं",
"otherSettings": "अन्य सेटिंग्स",
"otherSettings": "अन्य सेटिंग",
"changeLanguage": "भाषा बदलें",
"manageCustomFields": "कस्टम फ़ील्ड प्रबंधित करें",
"agendaItemCategories": "एजेंडा आइटम श्रेणियाँ"
"manageCustomFields": "कस्टम फ़ील्ड प्रबंधित करें"
},
"deleteOrg": {
"deleteOrganization": "संगठन हटाएँ",
Expand Down Expand Up @@ -972,6 +973,7 @@
"talawaUserPortal": "तलावा उपयोगकर्ता पोर्टल",
"my organizations": "मेरे संगठन",
"communityProfile": "सामुदायिक प्रोफ़ाइल",
"leave": "संगठन छोड़ें",
"users": "उपयोगकर्ता",
"requests": "अनुरोध",
"logout": "लॉग आउट",
Expand Down Expand Up @@ -1187,7 +1189,7 @@
"disableButton": "अक्षम करना",
"updateActionItemCategory": "अद्यतन",
"actionItemCategoryName": "नाम",
"categoryDetails": "श्रेणी विवरण",
"actionItemCategoryDetails": "कार्य आइटम श्रेणी विवरण",
"enterName": "नाम दर्ज करें",
"successfulCreation": "कार्रवाई आइटम श्रेणी सफलतापूर्वक बनाई गई",
"successfulUpdation": "कार्रवाई आइटम श्रेणी सफलतापूर्वक अपडेट की गई",
Expand All @@ -1200,7 +1202,8 @@
"deleteCategory": "श्रेणी हटाएं",
"deleteCategoryMsg": "क्या आप वाकई इस कार्रवाई आइटम श्रेणी को हटाना चाहते हैं?",
"createButton": "बटन बनाएं",
"editButton": "संपादित बटन"
"editButton": "संपादित बटन",
"categoryDetails": "श्रेणी विवरण"
},
"organizationVenues": {
"title": "स्थानों",
Expand Down Expand Up @@ -1314,5 +1317,12 @@
},
"userPledges": {
"title": "मेरी प्रतिज्ञाएँ"
},
"orgLeave": {
"confirmation": "क्या आप वाकई संगठन छोड़ना चाहते हैं?",
"heading": "संगठन छोड़ रहे हैं?",
"description": "क्या आप वाकई संगठन छोड़ना चाहते हैं? इस एक्शन को वापस नहीं किया जा सकता। यदि संगठन को अनुमोदन की आवश्यकता है, तो आप इसके बिना पुनः शामिल नहीं हो पाएंगे। कोई भी संबंधित डेटा या अनुमतियाँ भी खो सकती हैं।",
"errorOccured": "एक त्रुटि पाई गई। कृपया बाद में पुन: प्रयास करें।",
"orgLeft": "आपने संगठन छोड़ दिया है."
}
}
10 changes: 1 addition & 9 deletions public/locales/sp/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,5 @@
"updatedSuccessfully": "{{item}} actualizado con éxito",
"removedSuccessfully": "{{item}} eliminado con éxito",
"successfullyUpdated": "Actualizado con éxito",
"all": "Todos",
"active": "Activo",
"disabled": "Deshabilitado",
"pending": "Pendiente",
"completed": "Completado",
"late": "Tarde",
"createdLatest": "Creado más reciente",
"createdEarliest": "Creado más temprano",
"searchBy": "Buscar por {{item}}"
"confirm": "Confirmar"
}
48 changes: 29 additions & 19 deletions public/locales/sp/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@
"errorOccured": "Se produjo un error. Por favor, inténtalo de nuevo más tarde.",
"removeUserFrom": "Eliminar Usuario de {{org}}",
"removeConfirmation": "¿Está seguro de que desea eliminar a '{{name}}' de la organización '{{org}}'?",
"leave": "Dejar",
"noOrgError": "Error sin organización"
},
"communityProfile": {
Expand Down Expand Up @@ -410,6 +411,7 @@
"active": "Activo",
"clearFilters": "Borrar filtros",
"close": "Cerrar",
"completed": "Completado",
"completionDate": "Fecha de finalización",
"createActionItem": "Crear ítem de acción",
"deleteActionItem": "Eliminar ítem de acción",
Expand All @@ -436,13 +438,13 @@
"successfulDeletion": "Ítem de acción eliminado con éxito",
"title": "Ítems de acción",
"yes": "Sí",
"category": "Categoría",
"allotedHours": "Horas asignadas",
"latestDueDate": "Fecha de vencimiento más reciente",
"earliestDueDate": "Fecha de vencimiento más antigua",
"updateActionItem": "Actualizar elemento de acción",
"noneUpdated": "Ninguno de los campos se actualizó",
"updateStatusMsg": "¿Está seguro de que desea marcar este elemento de acción como pendiente?"
"earliestDueDate": "Fecha de vencimiento más temprana",
"updateActionItem": "Actualizar ítem de acción",
"noneUpdated": "Ninguno de los campos fue actualizado",
"updateStatusMsg": "¿Está seguro de que quiere marcar este ítem de acción como pendiente?",
"category": ""
},
"organizationAgendaCategory": {
"agendaCategoryDetails": "Detalles de la categoría de la agenda",
Expand Down Expand Up @@ -758,16 +760,15 @@
"amount": "Monto"
},
"orgSettings": {
"title": "Configuración",
"title": "Configuración Talawa",
"general": "General",
"actionItemCategories": "Categorías de elementos de acción",
"updateOrganization": "Actualizar organización",
"seeRequest": "Ver solicitud",
"updateOrganization": "Actualizar Organización",
"seeRequest": "Ver Solicitud",
"noData": "Sin datos",
"otherSettings": "Otras configuraciones",
"changeLanguage": "Cambiar idioma",
"manageCustomFields": "Administrar campos personalizados",
"agendaItemCategories": "Categorías de elementos de agenda"
"otherSettings": "Otras Configuraciones",
"changeLanguage": "Cambiar Idioma",
"manageCustomFields": "Gestionar Campos Personalizados"
},
"deleteOrg": {
"deleteOrganization": "Eliminar organización",
Expand Down Expand Up @@ -978,6 +979,7 @@
"communityProfile": "Perfil de la comunidad",
"logout": "Cerrar sesión",
"settings": "Ajustes",
"leave": "Dejar la organización",
"chat": "Chat"
},
"organizationSidebar": {
Expand Down Expand Up @@ -1085,8 +1087,8 @@
"donate": "Donar",
"nothingToShow": "Nada que mostrar aquí.",
"success": "Donación exitosa",
"invalidAmount": "Ingrese un valor numérico para el monto de la donación.",
"donationAmountDescription": "Ingrese el valor numérico del monto de la donación.",
"invalidAmount": "Por favor, ingrese un valor numérico para el monto de la donación.",
"donationAmountDescription": "Por favor, ingrese el valor numérico para el monto de la donación.",
"donationOutOfRange": "El monto de la donación debe estar entre {{min}} y {{max}}."
},
"userEvents": {
Expand Down Expand Up @@ -1190,18 +1192,19 @@
"disableButton": "Inhabilitar",
"updateActionItemCategory": "Actualizar",
"actionItemCategoryName": "Nombre",
"categoryDetails": "Detalles de la categoría",
"actionItemCategoryDetails": "Detalles de la categoría de elemento de acción",
"enterName": "Introduzca el nombre",
"successfulCreation": "Categoría de elemento de acción creada correctamente",
"successfulUpdation": "Categoría de elemento de acción actualizada correctamente",
"sameNameConflict": "Cambie el nombre para realizar una actualización",
"categoryEnabled": "Categoría de elemento de acción habilitada",
"categoryDisabled": "Categoría de elemento de acción deshabilitada",
"noActionItemCategories": "No hay categorías de elementos de acción",
"noActionItemCategories": "No hay Categorías del Ítem de Acción",
"status": "Estado",
"categoryDeleted": "Categoría de elemento de acción eliminada con éxito",
"deleteCategory": "Eliminar categoría",
"deleteCategoryMsg": "¿Está seguro de que desea eliminar esta categoría de elemento de acción?"
"categoryDeleted": "Categoría del Ítem de Acción eliminada con éxito",
"deleteCategory": "Eliminar Categoría",
"deleteCategoryMsg": "¿Está seguro de que desea eliminar esta Categoría del Ítem de Acción?",
"categoryDetails": "Detalles de la categoría"
},
"organizationVenues": {
"title": "Lugares",
Expand Down Expand Up @@ -1315,5 +1318,12 @@
},
"userPledges": {
"title": "Mis Promesas"
},
"orgLeave": {
"confirmation": "¿Estás segura de que quieres dejar la organización?",
"heading": "¿Dejar la organización?",
"description": "¿Estás seguro de que quieres dejar la organización? Esta acción no se puede deshacer. Si la organización requiere aprobación, no podrás volver a unirte sin ella. También se pueden perder todos los datos o permisos relacionados.",
"errorOccured": "Se produjo un error. Inténtelo de nuevo más tarde.",
"orgLeft": "Has abandonado la organización."
Comment on lines +1328 to +1332
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Address typo and formality inconsistency in "orgLeave" section

The translations in the new "orgLeave" section are generally correct, but there are two issues to address:

  1. There's a typo in the key "errorOccured" (should be "errorOccurred").
  2. There's an inconsistency in the level of formality used across the translations.

Please make the following corrections:

  1. Fix the typo in the key name:
-    "errorOccured": "Se produjo un error. Inténtelo de nuevo más tarde.",
+    "errorOccurred": "Se produjo un error. Inténtelo de nuevo más tarde.",
  1. Maintain consistent formality (using informal "tú" form throughout):
-    "confirmation": "¿Estás segura de que quieres dejar la organización?",
+    "confirmation": "¿Estás seguro de que quieres dejar la organización?",
     "heading": "¿Dejar la organización?",
     "description": "¿Estás seguro de que quieres dejar la organización? Esta acción no se puede deshacer. Si la organización requiere aprobación, no podrás volver a unirte sin ella. También se pueden perder todos los datos o permisos relacionados.",
-    "errorOccurred": "Se produjo un error. Inténtelo de nuevo más tarde.",
+    "errorOccurred": "Se produjo un error. Inténtalo de nuevo más tarde.",
     "orgLeft": "Has abandonado la organización."

Note: If formal language is preferred, you should update all translations to use the formal "usted" form consistently.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
"confirmation": "¿Estás segura de que quieres dejar la organización?",
"heading": "¿Dejar la organización?",
"description": "¿Estás seguro de que quieres dejar la organización? Esta acción no se puede deshacer. Si la organización requiere aprobación, no podrás volver a unirte sin ella. También se pueden perder todos los datos o permisos relacionados.",
"errorOccured": "Se produjo un error. Inténtelo de nuevo más tarde.",
"orgLeft": "Has abandonado la organización."
"confirmation": "¿Estás seguro de que quieres dejar la organización?",
"heading": "¿Dejar la organización?",
"description": "¿Estás seguro de que quieres dejar la organización? Esta acción no se puede deshacer. Si la organización requiere aprobación, no podrás volver a unirte sin ella. También se pueden perder todos los datos o permisos relacionados.",
"errorOccurred": "Se produjo un error. Inténtalo de nuevo más tarde.",
"orgLeft": "Has abandonado la organización."

}
}
Loading
Loading