Better message for btns and coloring

PalisadoesFoundation · Oct 27, 2023 · 72a65f3 · 72a65f3
1 parent 78b3d33
commit 72a65f3
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/public/locales/en.json b/public/locales/en.json
@@ -394,8 +394,8 @@
   "deleteOrg": {
     "deleteOrganization": "Delete Organization",
     "deleteMsg": "Do you want to delete this organization?",
-    "no": "No",
-    "yes": "Yes",
+    "cancel": "Cancel",
+    "confirmDelete": "Confirm Delete",
     "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": {

diff --git a/public/locales/fr.json b/public/locales/fr.json
@@ -390,8 +390,8 @@
   "deleteOrg": {
     "deleteOrganization": "Supprimer l'organisation",
     "deleteMsg": "Voulez-vous supprimer cette organisation ?",
-    "no": "Non",
-    "yes": "Oui",
+    "cancel": "Annuler",
+    "confirmDelete": "Confirmer la suppression",
     "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": {
@@ -632,4 +632,4 @@
     "selectContact": "Sélectionnez un contact pour démarrer la conversation",
     "sendMessage": "Envoyer le message"
   }
-}
+}
diff --git a/public/locales/hi.json b/public/locales/hi.json
@@ -390,8 +390,8 @@
   "deleteOrg": {
     "deleteOrganization": "संगठन हटाएं",
     "deleteMsg": "क्या आप इस संगठन को हटाना चाहते हैं?",
-    "no": "नहीं",
-    "yes": "हां",
+    "cancel": "रद्द करना",
+    "confirmDelete": "हटाने की पुष्टि करें",
     "longDelOrgMsg": "संगठन हटाने के बटन पर क्लिक करके, संगठन को स्थायित रूप से हटा दिया जाएगा, साथ ही उसके आयोजन, टैग और सभी संबंधित डेटा भी हटा दिया जाएगा।"
   },
   "userUpdate": {
@@ -633,4 +633,4 @@
     "selectContact": "बातचीत शुरू करने के लिए एक संपर्क चुनें",
     "sendMessage": "मेसेज भेजें"
   }
-}
+}
diff --git a/public/locales/sp.json b/public/locales/sp.json
@@ -390,8 +390,8 @@
   "deleteOrg": {
     "deleteOrganization": "Eliminar organización",
     "deleteMsg": "¿Desea eliminar esta organización?",
-    "no": "No",
-    "yes": "Sí",
+    "cancel": "Cancelar",
+    "confirmDelete": "Confirmar eliminación",
     "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": {
@@ -633,4 +633,4 @@
     "selectContact": "Seleccione un contacto para iniciar una conversación",
     "sendMessage": "Enviar mensaje"
   }
-}
+}
diff --git a/public/locales/zh.json b/public/locales/zh.json
@@ -390,8 +390,8 @@
   "deleteOrg": {
     "deleteOrganization": "删除组织",
     "deleteMsg": "您是否要删除此组织？",
-    "no": "否",
-    "yes": "是",
+    "cancel": "取消",
+    "confirmDelete": "确认删除",
     "longDelOrgMsg": "点击删除组织按钮后，将永久删除该组织以及其活动、标签和所有相关数据。"
   },
   "userUpdate": {
@@ -633,4 +633,4 @@
     "selectContact": "選擇聯絡人開始對話",
     "sendMessage": "傳訊息"
   }
-}
+}
diff --git a/src/components/DeleteOrg/DeleteOrg.tsx b/src/components/DeleteOrg/DeleteOrg.tsx
@@ -66,18 +66,18 @@ function deleteOrg(): JSX.Element {
           <Modal.Body>{t('deleteMsg')}</Modal.Body>
           <Modal.Footer>
             <Button
-              variant="danger"
+              variant="secondary"
               onClick={toggleDeleteModal}
               data-testid="closeDelOrgModalBtn"
             >
-              {t('no')}
+              {t('cancel')}
             </Button>
             <Button
-              variant="success"
+              variant="danger"
               onClick={deleteOrg}
               data-testid="deleteOrganizationBtn"
             >
-              {t('yes')}
+              {t('confirmDelete')}
             </Button>
           </Modal.Footer>
         </Modal>

diff --git a/src/screens/OrgSettings/OrgSettings.tsx b/src/screens/OrgSettings/OrgSettings.tsx
@@ -15,7 +15,7 @@ function orgSettings(): JSX.Element {
   });
 
   document.title = t('title');
-  const currentUrl = window.location.href.split('=')[1];
+  const orgId = window.location.href.split('=')[1];
 
   return (
     <>
@@ -29,7 +29,7 @@ function orgSettings(): JSX.Element {
                 </div>
               </div>
               <Card.Body className={styles.cardBody}>
-                {currentUrl && <OrgUpdate orgId={currentUrl} />}
+                {orgId && <OrgUpdate orgId={orgId} />}
               </Card.Body>
             </Card>
           </Col>