From 97dd608f079d216d454bc40808ba8b90b429da53 Mon Sep 17 00:00:00 2001 From: Kakabay <2kakabayashyrberdyew@gmail.com> Date: Wed, 10 Apr 2024 12:29:49 +0500 Subject: [PATCH] translations fixed --- .../ImmediateCreditsStages/BorrowerStage.js | 225 ++++++------ .../ImmediateCreditsStages/GuaranterStage.js | 182 +++++----- .../ImmediateCreditsStages/NotAUser.js | 47 +-- .../immediateCredits/ImmediateCreditModal.js | 337 ++++++++++-------- 4 files changed, 431 insertions(+), 360 deletions(-) diff --git a/src/components/ImmediateCreditsStages/BorrowerStage.js b/src/components/ImmediateCreditsStages/BorrowerStage.js index c754286..01f8c9d 100644 --- a/src/components/ImmediateCreditsStages/BorrowerStage.js +++ b/src/components/ImmediateCreditsStages/BorrowerStage.js @@ -1,14 +1,14 @@ // IMPORT MODULES -import React, { useState, useRef, useContext, useEffect } from 'react'; -import { LanguageContext } from '../../backend/LanguageContext'; -import { useForm } from 'react-hook-form'; -import { z } from 'zod'; -import { zodResolver } from '@hookform/resolvers/zod'; +import React, { useState, useRef, useContext, useEffect } from "react"; +import { LanguageContext } from "../../backend/LanguageContext"; +import { useForm } from "react-hook-form"; +import { z } from "zod"; +import { zodResolver } from "@hookform/resolvers/zod"; // IMPORT IMAGES -import next from '../../icons/next.svg'; -import next_reverse from '../../icons/next-reverse.svg'; +import next from "../../icons/next.svg"; +import next_reverse from "../../icons/next-reverse.svg"; -import Select from '../global/Select'; +import Select from "../global/Select"; // import arrow from "../../icons/arrow.svg"; // const schema = z.object({ @@ -21,18 +21,18 @@ import Select from '../global/Select'; // }); const IDSerias = [ - 'I-AS', - 'I-AH', - 'I-BN', - 'I-LB', - 'I-MR', - 'I-DZ', - 'II-AS', - 'II-AH', - 'II-BN', - 'II-LB', - 'II-MR', - 'II-DZ', + "I-AS", + "I-AH", + "I-BN", + "I-LB", + "I-MR", + "I-DZ", + "II-AS", + "II-AH", + "II-BN", + "II-LB", + "II-MR", + "II-DZ", ]; // 478992 // 23908934160170143144000 @@ -47,6 +47,8 @@ const BorrowerStage = ({ setRecepientAmount, setErrMessage, modalOpen, + setErrMessageEn, + setErrMessageTkm, }) => { const { locale } = useContext(LanguageContext); @@ -55,9 +57,9 @@ const BorrowerStage = ({ const [errCode, setErrCode] = useState(); const [isGuranterSelected, setIsGuranterSelected] = useState(false); - const [idSerial, setIdSerial] = useState('I-AS'); - const [passportNumber, setPassportNumber] = useState(''); - const [accNumber, setAccNumber] = useState(''); + const [idSerial, setIdSerial] = useState("I-AS"); + const [passportNumber, setPassportNumber] = useState(""); + const [accNumber, setAccNumber] = useState(""); const handlePassportNumber = (e) => { setPassportNumber(e.target.value); @@ -72,7 +74,7 @@ const BorrowerStage = ({ }; const checkboxHandleChange = (e) => { - e.target.value === 'guaranter' ? setIsGuranter(true) : setIsGuranter(false); + e.target.value === "guaranter" ? setIsGuranter(true) : setIsGuranter(false); }; const { @@ -89,17 +91,17 @@ const BorrowerStage = ({ const response = await fetch( `https://shahsyotag.halkbank.gov.tm/onlineloan-services/api/clientinfo`, { - method: 'POST', + method: "POST", headers: { - 'Content-Type': 'application/json', + "Content-Type": "application/json", }, body: JSON.stringify({ idSeria: idSeria, idNo: idNo, accountNo: accountNo, - clientType: 'recipient', + clientType: "recipient", }), - }, + } ); if (!response.ok) { @@ -120,6 +122,8 @@ const BorrowerStage = ({ setStage(2); } else if (responseJson.errCode !== 0) { setErrMessage(responseJson.messageRu); + setErrMessageEn(responseJson.messageEn); + setErrMessageTkm(responseJson.message); setStage(3); } } catch (error) { @@ -144,14 +148,14 @@ const BorrowerStage = ({ return (

- {' '} - {locale === 'TKM' - ? 'Garaşmagyňyzy haýyş edýäris ...' - : locale === 'РУС' - ? 'Пожалуйста, подождите...' - : locale === 'ENG' - ? 'Please wait...' - : 'Garaşmagyňyzy haýyş edýäris ...'} + {" "} + {locale === "TKM" + ? "Garaşmagyňyzy haýyş edýäris ..." + : locale === "РУС" + ? "Пожалуйста, подождите..." + : locale === "ENG" + ? "Please wait..." + : "Garaşmagyňyzy haýyş edýäris ..."}

); @@ -187,44 +191,44 @@ const BorrowerStage = ({

- {locale === 'TKM' - ? 'Maglumatlary dolduryň' - : locale === 'РУС' - ? 'Заполните данные' - : locale === 'ENG' - ? 'Fill in the details' - : 'Maglumatlary dolduryň'} + {locale === "TKM" + ? "Maglumatlary dolduryň" + : locale === "РУС" + ? "Заполните данные" + : locale === "ENG" + ? "Fill in the details" + : "Maglumatlary dolduryň"}

- {locale === 'TKM' - ? 'Zamunçylygyň görnüşini saýlan' - : locale === 'РУС' - ? 'Выберите вид поручителя' - : locale === 'ENG' - ? 'Select the type of guarantor' - : 'Zamunçylygyň görnüşini saýlan'} + {locale === "TKM" + ? "Zamunçylygyň görnüşini saýlan" + : locale === "РУС" + ? "Выберите вид поручителя" + : locale === "ENG" + ? "Select the type of guarantor" + : "Zamunçylygyň görnüşini saýlan"}

-
isGuranterHandler(false)}> +
isGuranterHandler(false)} + >
-
isGuranterHandler(true)}> +
isGuranterHandler(true)} + >
@@ -320,7 +334,9 @@ const BorrowerStage = ({
diff --git a/src/components/immediateCredits/ImmediateCreditModal.js b/src/components/immediateCredits/ImmediateCreditModal.js index 7c54a23..29f3d49 100644 --- a/src/components/immediateCredits/ImmediateCreditModal.js +++ b/src/components/immediateCredits/ImmediateCreditModal.js @@ -1,35 +1,35 @@ // IMPORT MODULES -import React, { useEffect, useRef, useState, useContext } from 'react'; -import { LanguageContext } from '../../backend/LanguageContext'; +import React, { useEffect, useRef, useState, useContext } from "react"; +import { LanguageContext } from "../../backend/LanguageContext"; -import axios from 'axios'; +import axios from "axios"; // IMPORT IMAGES -import exit from '../../icons/exit.svg'; -import { ReactComponent as Lines } from '../../icons/lines.svg'; -import { ReactComponent as Img1 } from '../../icons/credit1.svg'; -import { ReactComponent as Img2 } from '../../icons/credit2.svg'; -import { ReactComponent as Img3 } from '../../icons/credit3.svg'; -import { ReactComponent as Img4 } from '../../icons/credit4.svg'; -import { ReactComponent as Img5 } from '../../icons/credit5.svg'; -import { ReactComponent as Img6 } from '../../icons/credit6.svg'; +import exit from "../../icons/exit.svg"; +import { ReactComponent as Lines } from "../../icons/lines.svg"; +import { ReactComponent as Img1 } from "../../icons/credit1.svg"; +import { ReactComponent as Img2 } from "../../icons/credit2.svg"; +import { ReactComponent as Img3 } from "../../icons/credit3.svg"; +import { ReactComponent as Img4 } from "../../icons/credit4.svg"; +import { ReactComponent as Img5 } from "../../icons/credit5.svg"; +import { ReactComponent as Img6 } from "../../icons/credit6.svg"; // IMPORT COMPONENTS -import BorrowerStage from '../ImmediateCreditsStages/BorrowerStage'; -import BorrowerInfo from '../ImmediateCreditsStages/BorrowerInfo'; -import GuaranterStage from '../ImmediateCreditsStages/GuaranterStage'; -import GuaranterInfo from '../ImmediateCreditsStages/GuaranterInfo'; -import NotAUser from '../ImmediateCreditsStages/NotAUser'; -import CalculateStage from '../ImmediateCreditsStages/CalculateStage'; -import AcceptStage from '../ImmediateCreditsStages/AcceptStage'; -import PhoneAccept from '../ImmediateCreditsStages/PhoneAccept'; -import CardDetails from '../ImmediateCreditsStages/CardDetails'; -import LoanAccepted from '../ImmediateCreditsStages/LoanAccepted'; -import CardRegistration from '../ImmediateCreditsStages/CardRegistration'; -import PaymentDetails from '../ImmediateCreditsStages/PaymentDetails'; -import PaymentSuccess from '../ImmediateCreditsStages/PaymentSuccess'; -import FinalStage from '../ImmediateCreditsStages/FinalStage'; -import { UserContext } from '../../backend/UserContext'; +import BorrowerStage from "../ImmediateCreditsStages/BorrowerStage"; +import BorrowerInfo from "../ImmediateCreditsStages/BorrowerInfo"; +import GuaranterStage from "../ImmediateCreditsStages/GuaranterStage"; +import GuaranterInfo from "../ImmediateCreditsStages/GuaranterInfo"; +import NotAUser from "../ImmediateCreditsStages/NotAUser"; +import CalculateStage from "../ImmediateCreditsStages/CalculateStage"; +import AcceptStage from "../ImmediateCreditsStages/AcceptStage"; +import PhoneAccept from "../ImmediateCreditsStages/PhoneAccept"; +import CardDetails from "../ImmediateCreditsStages/CardDetails"; +import LoanAccepted from "../ImmediateCreditsStages/LoanAccepted"; +import CardRegistration from "../ImmediateCreditsStages/CardRegistration"; +import PaymentDetails from "../ImmediateCreditsStages/PaymentDetails"; +import PaymentSuccess from "../ImmediateCreditsStages/PaymentSuccess"; +import FinalStage from "../ImmediateCreditsStages/FinalStage"; +import { UserContext } from "../../backend/UserContext"; const ImmediateCreditModal = ({ modalOpen, @@ -50,8 +50,10 @@ const ImmediateCreditModal = ({ const [loading, setLoading] = useState(); const [error, setError] = useState(); - const [errMessage, setErrMessage] = useState(''); - const [acceptedMessage, setAcceptedMessage] = useState(''); + const [errMessage, setErrMessage] = useState(""); + const [errMessageEn, setErrMessageEn] = useState(""); + const [errMessageTkm, setErrMessageTkm] = useState(""); + const [acceptedMessage, setAcceptedMessage] = useState(""); const [borrowerData, setBorrowerData] = useState(); const [guaranterData, setGuaranterData] = useState(); @@ -61,39 +63,42 @@ const ImmediateCreditModal = ({ const [maxAmount, setMaxAmount] = useState(); const [recepientAmount, setRecepientAmount] = useState(0); const [creditDuration, setCreditDuration] = useState(0); - const [phoneNumber, setPhoneNumber] = useState(''); - const [cardDetails, setCardDetails] = useState(''); + const [phoneNumber, setPhoneNumber] = useState(""); + const [cardDetails, setCardDetails] = useState(""); const [userDataRes, setUserDataRes] = useState(); - const [paymentLink, setPaymentLink] = useState(''); + const [paymentLink, setPaymentLink] = useState(""); const [paymentDetails, setPaymentDetails] = useState(); const [submitCardDetails, setSumbitCardDetails] = useState(); - const [recipientWorkPlace, setRecipientWorkPlace] = useState(''); - const [recipientWorkPosition, setRecipientWorkPosition] = useState(''); + const [recipientWorkPlace, setRecipientWorkPlace] = useState(""); + const [recipientWorkPosition, setRecipientWorkPosition] = useState(""); - console.log('stage', stage); + console.log("stage", stage); return ( -
+

- {locale === 'TKM' - ? 'Sanly karz almak üçin onlaýn-ýüzlenme' - : locale === 'ENG' - ? 'Online aplication for digital loan' - : 'Онлайн-заявка для получения цифрового кредита'} + {locale === "TKM" + ? "Sanly karz almak üçin onlaýn-ýüzlenme" + : locale === "ENG" + ? "Online aplication for digital loan" + : "Онлайн-заявка для получения цифрового кредита"}