diff --git a/public/locales/en.json b/public/locales/en.json index 7fe5ca985e..8fa95e6d7e 100644 --- a/public/locales/en.json +++ b/public/locales/en.json @@ -116,7 +116,9 @@ "filterByEvent": "Filter by Event", "members": "Members", "admins": "Admins", - "users": "Users" + "users": "Users", + "searchName": "Enter Name", + "searchevent": "Enter Event" }, "userListCard": { "joined": "Joined", @@ -157,7 +159,11 @@ "recurringEvent": "Recurring Event", "isPublic": "Is Public", "isRegistrable": "Is Registrable", - "createEvent": "Create Event" + "createEvent": "Create Event", + "enterFilter": "Enter Filter", + "enterTitle": "Enter Title", + "enterDescrip": "Enter Description", + "eventLocation": "Enter Location" }, "eventListCard": { "location": "Location", @@ -190,7 +196,11 @@ "information": "Information", "image": "Image", "video": "Video", - "addPost": "Add Post" + "addPost": "Add Post", + "searchTitle": "Search By Title", + "searchText": "Search By Text", + "ptitle": "Post Title", + "postDes": "What do you to talk about?" }, "orgPostCard": { "author": "Author", @@ -216,7 +226,8 @@ "email": "Email", "block_unblock": "Block/Unblock", "unblock": "UnBlock", - "block": "Block" + "block": "Block", + "orgName": "Enter Name" }, "forgotPassword": { "title": "Talawa Forgot Password", @@ -227,7 +238,9 @@ "enterNewPassword": "Enter New Password", "cofirmNewPassword": "Confirm New Password", "changePassword": "Change Password", - "backToHome": "Back to Home" + "backToHome": "Back to Home", + "userOtp": "e.g. 12345", + "password": "Password" }, "pageNotFound": { "title": "404 Not Found", @@ -241,7 +254,9 @@ "filterByName": "Filter by Name", "filterByTransId": "Filter by Trans. ID", "recentStats": "Recent Stats", - "contribution": "Contribution" + "contribution": "Contribution", + "orgname": "Enter Name", + "searchtransaction": "Enter Transaction ID" }, "contriStats": { "recentContribution": "Recent Contribution", @@ -292,6 +307,7 @@ "isPublic": "Is Public", "isRegistrable": "Is Registrable", "saveChanges": "Save Changes", - "cancel": "Cancel" + "cancel": "Cancel", + "enterNameOrganization": "Enter Organization Name" } } diff --git a/public/locales/fr.json b/public/locales/fr.json index 0ee7ac452c..a5cc2a5ef7 100644 --- a/public/locales/fr.json +++ b/public/locales/fr.json @@ -116,7 +116,9 @@ "filterByEvent": "Filtrer par événement", "members": "Membres", "admins": "Administrateurs", - "users": "Utilisateurs" + "users": "Utilisateurs", + "searchName": "Entrez le nom", + "searchevent": "Entrez l'événement" }, "userListCard": { "joined": "Inscrit", @@ -141,6 +143,7 @@ "organizationEvents": { "title": "Événements Talawa", "filterByTitle": "Filtrer par titre", + "filterByLocation": "Filtrer par l'emplacement", "filterByDescription": "Filtrer par Description", "events": "Événements", "addEvent": "Ajouter un évènement", @@ -156,7 +159,11 @@ "recurringEvent": "Événement récurrent", "isPublic": "Est publique", "isRegistrable": "Est enregistrable", - "createEvent": "Créer un évènement" + "createEvent": "Créer un évènement", + "enterFilter": "Entrez le filtre", + "enterTitle": "Entrez le titre", + "enterDescrip": "Entrez la description", + "eventLocation": "Entrez l'emplacement" }, "eventListCard": { "location": "Emplacement", @@ -189,7 +196,11 @@ "information": "Informations", "image": "Image", "video": "Vidéo", - "addPost": "Ajouter un article" + "addPost": "Ajouter un article", + "searchTitle": "Rechercher par titre", + "searchText": "Rechercher par texte", + "ptitle": "Titre de l'article", + "postDes": "De quoi parlez-vous ?" }, "orgPostCard": { "author": "Auteur", @@ -215,7 +226,8 @@ "email": "E-mail", "block_unblock": "Bloquer/Débloquer", "unblock": "Débloquer", - "block": "Bloquer" + "block": "Bloquer", + "orgName": "Entrez le nom" }, "forgotPassword": { "title": "Mot de passe oublié Talawa", @@ -226,7 +238,9 @@ "enterNewPassword": "Entrez un nouveau mot de passe", "cofirmNewPassword": "Confirmer le nouveau mot de passe", "changePassword": "Changer le mot de passe", - "backToHome": "De retour à la maison" + "backToHome": "De retour à la maison", + "userOtp": "par exemple. 12345", + "password": "Mot de passe" }, "pageNotFound": { "title": "404 introuvable", @@ -240,7 +254,9 @@ "filterByName": "Filtrer par nom", "filterByTransId": "Filtrer par Trans. ID", "recentStats": "Statistiques récentes", - "contribution": "Contribution" + "contribution": "Contribution", + "orgname": "Entrez le nom", + "searchtransaction": "Saisir l'identifiant de la transaction" }, "contriStats": { "recentContribution": "Contribution récente", @@ -291,6 +307,7 @@ "isPublic": "Est publique", "isRegistrable": "Est enregistrable", "saveChanges": "Sauvegarder les modifications", - "cancel": "Annuler" + "cancel": "Annuler", + "enterNameOrganization": "Entrez le nom de l'organisation" } } diff --git a/public/locales/hi.json b/public/locales/hi.json index f04cfd4ffa..f195fb27d0 100644 --- a/public/locales/hi.json +++ b/public/locales/hi.json @@ -116,7 +116,9 @@ "filterByEvent": "इवेंट द्वारा फ़िल्टर करें", "members": "सदस्य", "admins": "व्यवस्थापक", - "users": "उपयोगकर्ता" + "users": "उपयोगकर्ता", + "searchName": "नाम दर्ज करें", + "searchevent": "घटना दर्ज करें" }, "userListCard": { "joined": "में शामिल हो गए", @@ -141,6 +143,7 @@ "organizationEvents": { "title": "तलावा इवेंट्स", "filterByTitle": "शीर्षक द्वारा फ़िल्टर करें", + "filterByLocation": "स्थान के अनुसार फ़िल्टर करें", "filterByDescription": "विवरण द्वारा फ़िल्टर करें", "events": "आयोजन", "addEvent": "कार्यक्रम जोड़ें", @@ -156,7 +159,11 @@ "recurringEvent": "पुनरावर्ती ईवेंट", "isPublic": "सार्वजनिक है", "isRegistrable": "पंजीकरण योग्य है", - "createEvent": "कार्यक्रम बनाएँ" + "createEvent": "कार्यक्रम बनाएँ", + "enterFilter": "फ़िल्टर दर्ज करें", + "enterTitle": "शीर्षक दर्ज करें", + "enterDescrip": "विवरण दर्ज करें", + "eventLocation": "स्थान दर्ज करें" }, "eventListCard": { "location": "स्थान", @@ -189,7 +196,11 @@ "information": "जानकारी", "image": "छवि", "video": "वीडियो", - "addPost": "पोस्ट जोड़ें" + "addPost": "पोस्ट जोड़ें", + "searchTitle": "शीर्षक से खोजें", + "searchText": "पाठ द्वारा खोजें", + "ptitle": "शीर्षक पोस्ट करें", + "postDes": "आपको किस बारे में बात करनी है?" }, "orgPostCard": { "author": "लेखक", @@ -215,7 +226,8 @@ "email": "ईमेल", "block_unblock": "ब्लॉक/अनब्लॉक करें", "unblock": "अनब्लॉक करें", - "block": "अवरोध पैदा करना" + "block": "अवरोध पैदा करना", + "orgName": "नाम दर्ज करें" }, "forgotPassword": { "title": "तलवा पासवर्ड भूल गए", @@ -226,7 +238,9 @@ "enterNewPassword": "नया पासवर्ड दर्ज करें", "cofirmNewPassword": "नए पासवर्ड की पुष्टि करें", "changePassword": "पासवर्ड बदलें", - "backToHome": "घर वापिस जा रहा हूँ" + "backToHome": "घर वापिस जा रहा हूँ", + "userOtp": "उदाहरण के लिए 12345", + "password": "पासवर्ड" }, "pageNotFound": { "title": "404 नहीं मिला", @@ -240,7 +254,9 @@ "filterByName": "नाम से फ़िल्टर करें", "filterByTransId": "ट्रांस आईडी द्वारा फ़िल्टर करें", "recentStats": "हाल के आँकड़े", - "contribution": "योगदान" + "contribution": "योगदान", + "orgname": "नाम दर्ज करें", + "searchtransaction": "लेन-देन आईडी दर्ज करें" }, "contriStats": { "recentContribution": "हाल ही में योगदान", @@ -291,6 +307,7 @@ "isPublic": "सार्वजनिक है", "isRegistrable": "पंजीकरण योग्य है", "saveChanges": "परिवर्तनों को सुरक्षित करें", - "cancel": "रद्द करना" + "cancel": "रद्द करना", + "enterNameOrganization": "संगठन का नाम दर्ज करें" } } diff --git a/public/locales/sp.json b/public/locales/sp.json index dd363d6dba..b8293cd37c 100644 --- a/public/locales/sp.json +++ b/public/locales/sp.json @@ -116,7 +116,9 @@ "filterByEvent": "Filtrar por Evento", "members": "Miembros", "admins": "Administradores", - "users": "Usuarios" + "users": "Usuarios", + "searchName": "Ingrese su nombre", + "searchevent": "Ingresar evento" }, "userListCard": { "joined": "Unido", @@ -141,6 +143,7 @@ "organizationEvents": { "title": "Eventos Talawa", "filterByTitle": "Filtrar por Título", + "filterByLocation": "Filtrar por Ubicación", "filterByDescription": "Filtrar por descripción", "events": "Eventos", "addEvent": "Añadir evento", @@ -156,7 +159,11 @@ "recurringEvent": "Evento recurrente", "isPublic": "Es público", "isRegistrable": "Es registrable", - "createEvent": "Crear evento" + "createEvent": "Crear evento", + "enterFilter": "Introducir filtro", + "enterTitle": "Ingrese el título", + "enterDescrip": "Introduce la descripción", + "eventLocation": "Introducir ubicación" }, "eventListCard": { "location": "Ubicación", @@ -189,7 +196,11 @@ "information": "Información", "image": "Imagen", "video": "Video", - "addPost": "Añadir publicación" + "addPost": "Añadir publicación", + "searchTitle": "Buscar por título", + "searchText": "Buscar por texto", + "ptitle": "Título de la entrada", + "postDes": "¿De qué hablar?" }, "orgPostCard": { "author": "Autor", @@ -215,7 +226,8 @@ "email": "Correo electrónico", "block_unblock": "Bloquear/Desbloquear", "unblock": "Desatascar", - "block": "Bloquear" + "block": "Bloquear", + "orgName": "Ingrese su nombre" }, "forgotPassword": { "title": "Talawa olvidó su contraseña", @@ -226,7 +238,9 @@ "enterNewPassword": "Ingrese nueva clave", "cofirmNewPassword": "Confirmar nueva contraseña", "changePassword": "Cambia la contraseña", - "backToHome": "De vuelta a casa" + "backToHome": "De vuelta a casa", + "userOtp": "por ejemplo 12345", + "password": "Contraseña" }, "pageNotFound": { "title": "404 No encontrado", @@ -240,7 +254,9 @@ "filterByName": "Filtrar por nombre", "filterByTransId": "Filtrar por ID de transacción", "recentStats": "Estadísticas recientes", - "contribution": "Contribución" + "contribution": "Contribución", + "orgname": "Ingrese su nombre", + "searchtransaction": "Ingrese la identificación de la transacción" }, "contriStats": { "recentContribution": "Contribución reciente", @@ -291,6 +307,7 @@ "isPublic": "Es público", "isRegistrable": "Es registrable", "saveChanges": "Guardar cambios", - "cancel": "Cancelar" + "cancel": "Cancelar", + "enterNameOrganization": "Ingrese el nombre de la organización" } } diff --git a/public/locales/zh.json b/public/locales/zh.json index c03e37b5c7..ad6cb18bbf 100644 --- a/public/locales/zh.json +++ b/public/locales/zh.json @@ -116,7 +116,9 @@ "filterByEvent": "按事件過濾", "members": "成員", "admins": "管理員", - "users": "用戶" + "users": "用戶", + "searchName": "輸入名字", + "searchevent": "輸入事件" }, "userListCard": { "joined": "加入", @@ -141,6 +143,7 @@ "organizationEvents": { "title": "塔拉瓦事件", "filterByTitle": "按標題過濾", + "filterByLocation": "按位置過濾", "filterByDescription": "按描述過濾", "events": "事件", "addEvent": "添加事件", @@ -156,7 +159,11 @@ "recurringEvent": "重複事件", "isPublic": "是公開的", "isRegistrable": "可註冊", - "createEvent": "創建事件" + "createEvent": "創建事件", + "enterFilter": "輸入過濾器", + "enterTitle": "輸入標題", + "enterDescrip": "輸入說明", + "eventLocation": "輸入位置" }, "eventListCard": { "location": "地點", @@ -189,7 +196,11 @@ "information": "信息", "image": "圖片", "video": "視頻", - "addPost": "添加帖子" + "addPost": "添加帖子", + "searchTitle": "按標題搜索", + "searchText": "按文本搜索", + "ptitle": "帖子標題", + "postDes": "你要談什麼?" }, "orgPostCard": { "author": "作者", @@ -215,7 +226,8 @@ "email": "電子郵件", "block_unblock": "阻止/解除阻止", "unblock": "解除封鎖", - "block": "堵塞" + "block": "堵塞", + "orgName": "輸入名字" }, "forgotPassword": { "title": "塔拉瓦忘記密碼", @@ -226,7 +238,9 @@ "enterNewPassword": "輸入新密碼", "cofirmNewPassword": "確認新密碼", "changePassword": "更改密碼", - "backToHome": "回到家" + "backToHome": "回到家", + "userOtp": "舉個例子。 12345", + "password": "密碼" }, "pageNotFound": { "title": "404 未找到", @@ -240,7 +254,9 @@ "filterByName": "按名稱過濾", "filterByTransId": "按 Trans.ID 過濾", "recentStats": "最近的統計", - "contribution": "貢獻" + "contribution": "貢獻", + "orgname": "輸入名字", + "searchtransaction": "輸入交易編號" }, "contriStats": { "recentContribution": "最近的貢獻", @@ -291,6 +307,7 @@ "isPublic": "是公開的", "isRegistrable": "可註冊", "saveChanges": "保存更改", - "cancel": "取消" + "cancel": "取消", + "enterNameOrganization": "輸入組織名稱" } } diff --git a/src/components/OrgPostCard/OrgPostCard.tsx b/src/components/OrgPostCard/OrgPostCard.tsx index 31e49e1e0f..79ffc14bb7 100644 --- a/src/components/OrgPostCard/OrgPostCard.tsx +++ b/src/components/OrgPostCard/OrgPostCard.tsx @@ -246,7 +246,7 @@ function OrgPostCard(props: OrgPostCardProps): JSX.Element { id="postImageUrl" name="photo" type="file" - placeholder="Upload New Image" + placeholder={t('image')} multiple={false} //onChange="" /> @@ -260,7 +260,7 @@ function OrgPostCard(props: OrgPostCardProps): JSX.Element { id="postVideoUrl" name="video" type="file" - placeholder="Upload New Video" + placeholder={t('video')} multiple={false} //onChange="" /> diff --git a/src/components/OrgUpdate/OrgUpdate.test.tsx b/src/components/OrgUpdate/OrgUpdate.test.tsx index 629ba78c66..e341475066 100644 --- a/src/components/OrgUpdate/OrgUpdate.test.tsx +++ b/src/components/OrgUpdate/OrgUpdate.test.tsx @@ -72,17 +72,11 @@ describe('Testing Organization Update', () => { formData.name ); userEvent.type( - screen.getByPlaceholderText(/Enter Description/i), + screen.getByPlaceholderText(/Description/i), formData.description ); - userEvent.type( - screen.getByPlaceholderText(/Enter Creator/i), - formData.creator - ); - userEvent.type( - screen.getByPlaceholderText(/Enter Api Url/i), - formData.apiUrl - ); + userEvent.type(screen.getByPlaceholderText(/Creator/i), formData.creator); + userEvent.type(screen.getByPlaceholderText(/Api Url/i), formData.apiUrl); userEvent.upload( screen.getByLabelText(/display image:/i), formData.displayImage @@ -94,16 +88,16 @@ describe('Testing Organization Update', () => { userEvent.click(screen.getByText(/Save Changes/i)); - expect(screen.getByPlaceholderText(/Enter Organization Name/i)).toHaveValue( + expect(screen.getByPlaceholderText(/Organization Name/i)).toHaveValue( formData.name ); - expect(screen.getByPlaceholderText(/Enter Description/i)).toHaveValue( + expect(screen.getByPlaceholderText(/Description/i)).toHaveValue( formData.description ); - expect(screen.getByPlaceholderText(/Enter Creator/i)).toHaveValue( + expect(screen.getByPlaceholderText(/Creator/i)).toHaveValue( formData.creator ); - expect(screen.getByPlaceholderText(/Enter Api Url/i)).toHaveValue( + expect(screen.getByPlaceholderText(/Api Url/i)).toHaveValue( formData.apiUrl ); expect(screen.getByLabelText(/display image:/i)).toBeTruthy(); diff --git a/src/components/OrgUpdate/OrgUpdate.tsx b/src/components/OrgUpdate/OrgUpdate.tsx index 31f378ff90..cf23bd88cf 100644 --- a/src/components/OrgUpdate/OrgUpdate.tsx +++ b/src/components/OrgUpdate/OrgUpdate.tsx @@ -66,7 +66,7 @@ function OrgUpdate(props: OrgUpdateProps): JSX.Element { { diff --git a/src/components/UserUpdate/UserUpdate.test.tsx b/src/components/UserUpdate/UserUpdate.test.tsx index f855ca4cbe..9f1b5572cf 100644 --- a/src/components/UserUpdate/UserUpdate.test.tsx +++ b/src/components/UserUpdate/UserUpdate.test.tsx @@ -66,20 +66,17 @@ describe('Testing User Update', () => { ); userEvent.type( - screen.getByPlaceholderText(/Enter First Name/i), + screen.getByPlaceholderText(/First Name/i), formData.firstName ); userEvent.type( - screen.getByPlaceholderText(/Enter Last Name/i), + screen.getByPlaceholderText(/Last Name/i), formData.lastName ); - userEvent.type(screen.getByPlaceholderText(/Enter Email/i), formData.email); + userEvent.type(screen.getByPlaceholderText(/Email/i), formData.email); + userEvent.type(screen.getByPlaceholderText(/Password/i), formData.password); userEvent.type( - screen.getByPlaceholderText(/Enter Password/i), - formData.password - ); - userEvent.type( - screen.getByPlaceholderText(/Enter App Language Code/i), + screen.getByPlaceholderText(/App Language Code/i), formData.applangcode ); userEvent.click(screen.getByLabelText('Admin')); @@ -93,19 +90,17 @@ describe('Testing User Update', () => { userEvent.click(screen.getByText(/Save Changes/i)); - expect(screen.getByPlaceholderText(/Enter First Name/i)).toHaveValue( + expect(screen.getByPlaceholderText(/First Name/i)).toHaveValue( formData.firstName ); - expect(screen.getByPlaceholderText(/Enter Last Name/i)).toHaveValue( + expect(screen.getByPlaceholderText(/Last Name/i)).toHaveValue( formData.lastName ); - expect(screen.getByPlaceholderText(/Enter Email/i)).toHaveValue( - formData.email - ); - expect(screen.getByPlaceholderText(/Enter Password/i)).toHaveValue( + expect(screen.getByPlaceholderText(/Email/i)).toHaveValue(formData.email); + expect(screen.getByPlaceholderText(/Password/i)).toHaveValue( formData.password ); - expect(screen.getByPlaceholderText(/Enter App Language Code/i)).toHaveValue( + expect(screen.getByPlaceholderText(/App Language Code/i)).toHaveValue( formData.applangcode ); expect(screen.getByLabelText('Admin')).not.toBeChecked(); @@ -113,11 +108,13 @@ describe('Testing User Update', () => { expect(screen.getByLabelText(/display image:/i)).toBeTruthy(); expect(screen.getByText(/Cancel/i)).toBeTruthy(); - expect(screen.getByText('First Name')).toBeInTheDocument(); - expect(screen.getByText('Last Name')).toBeInTheDocument(); - expect(screen.getByText('Email')).toBeInTheDocument(); - expect(screen.getByText('Password')).toBeInTheDocument(); - expect(screen.getByText('App Language Code')).toBeInTheDocument(); + expect(screen.getByPlaceholderText(/First Name/i)).toBeInTheDocument(); + expect(screen.getByPlaceholderText(/Last Name/i)).toBeInTheDocument(); + expect(screen.getByPlaceholderText(/Email/i)).toBeInTheDocument(); + expect(screen.getByPlaceholderText(/Password/i)).toBeInTheDocument(); + expect( + screen.getByPlaceholderText(/App Language Code/i) + ).toBeInTheDocument(); expect(screen.getByText('User Type')).toBeInTheDocument(); expect(screen.getByText('Admin')).toBeInTheDocument(); expect(screen.getByText('Superadmin')).toBeInTheDocument(); diff --git a/src/components/UserUpdate/UserUpdate.tsx b/src/components/UserUpdate/UserUpdate.tsx index 2122e86fe2..7c70d5cc6f 100644 --- a/src/components/UserUpdate/UserUpdate.tsx +++ b/src/components/UserUpdate/UserUpdate.tsx @@ -62,7 +62,7 @@ function UserUpdate(props: UserUpdateProps): JSX.Element { { @@ -133,7 +133,7 @@ function UserUpdate(props: UserUpdateProps): JSX.Element { { diff --git a/src/screens/BlockUser/BlockUser.tsx b/src/screens/BlockUser/BlockUser.tsx index b7351653b7..ecad189207 100644 --- a/src/screens/BlockUser/BlockUser.tsx +++ b/src/screens/BlockUser/BlockUser.tsx @@ -130,7 +130,7 @@ const Requests = () => { { await wait(); userEvent.type( - screen.getByPlaceholderText('Registered email'), + screen.getByPlaceholderText(/Registered email/i), formData.email ); diff --git a/src/screens/ForgotPassword/ForgotPassword.tsx b/src/screens/ForgotPassword/ForgotPassword.tsx index 90f60c2bc4..d84e9f4d87 100644 --- a/src/screens/ForgotPassword/ForgotPassword.tsx +++ b/src/screens/ForgotPassword/ForgotPassword.tsx @@ -130,7 +130,7 @@ const ForgotPassword = () => { type="email" className="form-control" id="registeredEmail" - placeholder="Registered email" + placeholder={t('registeredEmail')} value={registeredEmail} name="registeredEmail" required @@ -160,7 +160,7 @@ const ForgotPassword = () => { type="number" className="form-control" id="userOtp" - placeholder="e.g. 12345" + placeholder={t('userOtp')} name="userOtp" value={forgotPassFormData.userOtp} required @@ -185,7 +185,7 @@ const ForgotPassword = () => { type="password" className="form-control" id="newPassword" - placeholder="Password" + placeholder={t('password')} data-testid="newPassword" name="newPassword" value={forgotPassFormData.newPassword} @@ -211,7 +211,7 @@ const ForgotPassword = () => { type="password" className="form-control" id="confirmNewPassword" - placeholder="Confirm Password" + placeholder={t('cofirmNewPassword')} data-testid="confirmNewPassword" name="confirmNewPassword" value={forgotPassFormData.confirmNewPassword} diff --git a/src/screens/OrgContribution/OrgContribution.tsx b/src/screens/OrgContribution/OrgContribution.tsx index 65532a5c6b..d8d66577d5 100644 --- a/src/screens/OrgContribution/OrgContribution.tsx +++ b/src/screens/OrgContribution/OrgContribution.tsx @@ -31,7 +31,7 @@ function OrgContribution(): JSX.Element { @@ -40,7 +40,7 @@ function OrgContribution(): JSX.Element { diff --git a/src/screens/OrgList/OrgList.test.tsx b/src/screens/OrgList/OrgList.test.tsx index 05f87cc062..f1ec0141c6 100644 --- a/src/screens/OrgList/OrgList.test.tsx +++ b/src/screens/OrgList/OrgList.test.tsx @@ -219,14 +219,11 @@ describe('Organisation List Page', () => { userEvent.type(screen.getByTestId(/modalOrganizationName/i), formData.name); userEvent.type( - screen.getByPlaceholderText(/Enter Description/i), + screen.getByPlaceholderText(/Description/i), formData.description ); - userEvent.type( - screen.getByPlaceholderText(/Enter Location/i), - formData.location - ); - userEvent.type(screen.getByPlaceholderText(/Enter Tags/i), formData.tags); + userEvent.type(screen.getByPlaceholderText(/Location/i), formData.location); + userEvent.type(screen.getByPlaceholderText(/Tags/i), formData.tags); userEvent.click(screen.getByLabelText(/Is Public:/i)); userEvent.click(screen.getByLabelText(/Visible In Search:/i)); userEvent.upload(screen.getByLabelText(/Display Image:/i), formData.image); @@ -234,15 +231,13 @@ describe('Organisation List Page', () => { expect(screen.getByTestId(/modalOrganizationName/i)).toHaveValue( formData.name ); - expect(screen.getByPlaceholderText(/Enter Description/i)).toHaveValue( + expect(screen.getByPlaceholderText(/Description/i)).toHaveValue( formData.description ); - expect(screen.getByPlaceholderText(/Enter Location/i)).toHaveValue( + expect(screen.getByPlaceholderText(/Location/i)).toHaveValue( formData.location ); - expect(screen.getByPlaceholderText(/Enter Tags/i)).toHaveValue( - formData.tags - ); + expect(screen.getByPlaceholderText(/Tags/i)).toHaveValue(formData.tags); expect(screen.getByLabelText(/Is Public/i)).not.toBeChecked(); expect(screen.getByLabelText(/Visible In Search:/i)).toBeChecked(); expect(screen.getByLabelText(/Display Image:/i)).toBeTruthy(); diff --git a/src/screens/OrgList/OrgList.tsx b/src/screens/OrgList/OrgList.tsx index 123cdbd88c..aa063f1586 100644 --- a/src/screens/OrgList/OrgList.tsx +++ b/src/screens/OrgList/OrgList.tsx @@ -291,7 +291,7 @@ function OrgList(): JSX.Element { { userEvent.click(screen.getByTestId('createPostModalBtn')); userEvent.type( - screen.getByPlaceholderText('Post Title'), + screen.getByPlaceholderText(/Post Title/i), formData.posttitle ); userEvent.type( - screen.getByPlaceholderText('What do you want to talk about?'), + screen.getByPlaceholderText(/What do you to talk about?/i), formData.postinfo ); @@ -181,11 +181,11 @@ describe('Organisation Post Page', () => { await wait(); userEvent.type( - screen.getByPlaceholderText('Search by Title'), + screen.getByPlaceholderText(/Search by Title/i), formData.posttitle ); userEvent.type( - screen.getByPlaceholderText('Search by Text'), + screen.getByPlaceholderText(/Search by Text/i), formData.postinfo ); }); diff --git a/src/screens/OrgPost/OrgPost.tsx b/src/screens/OrgPost/OrgPost.tsx index c98e4564d0..860dbe8c06 100644 --- a/src/screens/OrgPost/OrgPost.tsx +++ b/src/screens/OrgPost/OrgPost.tsx @@ -137,7 +137,7 @@ function OrgPost(): JSX.Element { @@ -145,7 +145,7 @@ function OrgPost(): JSX.Element { @@ -261,7 +261,7 @@ function OrgPost(): JSX.Element { @@ -305,7 +305,7 @@ function OrgPost(): JSX.Element { id="postvideo" name="video" type="file" - placeholder="Upload Video" + placeholder={t('video')} multiple={false} //onChange="" /> diff --git a/src/screens/OrganizationEvents/OrganizationEvents.tsx b/src/screens/OrganizationEvents/OrganizationEvents.tsx index 7830f20b30..982224c4c6 100644 --- a/src/screens/OrganizationEvents/OrganizationEvents.tsx +++ b/src/screens/OrganizationEvents/OrganizationEvents.tsx @@ -181,7 +181,7 @@ function OrganizationEvents(): JSX.Element { setStartDate(date)} - placeholderText="Start Date" + placeholderText={t('startDate')} />