Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Crowdin #1899

Merged
merged 14 commits into from
Jul 8, 2021
Merged

Crowdin #1899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0b78eca
Nuri/update: Updated payment list based on design.Waiting for missing…
njazuli-deriv Jun 16, 2021
a416fff
Kevin/update cryptocurrency text on market and regulatory key informa…
virtualpowwa Jun 16, 2021
81bb092
download new translation (#1821)
virtualpowwa Jun 16, 2021
f73e932
uploaded/downloaded translations (#1842)
suthesank Jun 18, 2021
a6404e1
added ebook strings (#1873)
suthesank Jul 5, 2021
4b39b2f
update translation to code (#1877)
suthesank Jul 5, 2021
1970c42
fix ebook translations rendering (#1880)
suthesank Jul 5, 2021
74343c1
localized 'email address' in ebook (#1881)
suthesank Jul 6, 2021
24d5fc9
suthesh/payment-method-trans-hotfix (#1884)
suthesank Jul 6, 2021
c586c70
downloaded latest translation (#1885)
suthesank Jul 6, 2021
87c5441
suthesh/hotfix-trans (#1889)
suthesank Jul 8, 2021
468018f
updated currencies of crypto payment methods (#1897)
suthesank Jul 8, 2021
db01779
resolved conflict
suthesank Jul 8, 2021
03e7a55
Merge branch 'master' of github.com:binary-com/deriv-com into crowdin
suthesank Jul 8, 2021
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
2 changes: 1 addition & 1 deletion crowdin/messages.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/images/svg/payment-methods/payment-trustly.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/images/svg/payment-methods/payment-visa-electron.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
188 changes: 94 additions & 94 deletions src/pages/landing/ebooks/components/_get-ebook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,101 +296,101 @@ const GetEbook = ({ onSubmit, ebook_utm_code }) => {
</Text>
</ResponseWrapper>
) : (
<SignupFormWrapper>
<div>
<InputGroupForm onSubmit={handleEmailSignup} noValidate>
<InputWrapper>
<Input
id="email"
name="email"
type="text"
error={email_error_msg}
value={email}
background="white"
tabletBackground="green-1"
inputBackground="grey-8"
labelFocusColor="grey-7"
labelColor="black-3"
labelSize="16px"
labelTop="1.2rem"
placeholder={'email address'}
handleError={clearEmail}
onChange={handleInputChange}
onBlur={handleValidation}
autoFocus={true}
autoComplete="off"
required
border="unset"
height="40px"
focusBorder="var(--color-grey-7)"
<SignupFormWrapper>
<div>
<InputGroupForm onSubmit={handleEmailSignup} noValidate>
<InputWrapper>
<Input
id="email"
name="email"
type="text"
error={email_error_msg}
value={email}
background="white"
tabletBackground="green-1"
inputBackground="grey-8"
labelFocusColor="grey-7"
labelColor="black-3"
labelSize="16px"
labelTop="1.2rem"
placeholder={localize('email address')}
handleError={clearEmail}
onChange={handleInputChange}
onBlur={handleValidation}
autoFocus={true}
autoComplete="off"
required
border="unset"
height="40px"
focusBorder="var(--color-grey-7)"
/>
</InputWrapper>
<AgreementLabel
isChecked={is_checked}
handleChangeCheckbox={handleChange}
color="white"
/>
</InputWrapper>
<AgreementLabel
isChecked={is_checked}
handleChangeCheckbox={handleChange}
color="white"
/>
<EmailButton
isChecked={is_checked}
id="gtm-signup-email"
type="submit"
secondary="true"
disabled={is_submitting || !is_checked || email_error_msg || !email}
>
{localize('Get your free ebook now!')}
</EmailButton>
</InputGroupForm>
<SignupWithContainer>
<Line />
<StyledText color="grey-5" align="center" tabletFontSize="12px">
{localize('Or sign up with')}
</StyledText>
<Line />
</SignupWithContainer>
<SocialWrapper jc="unset" ai="center">
<SocialButton
onClick={handleSocialSignup}
provider="google"
data-provider="google"
id="gtm-signup-google"
type="button"
social
>
<SocialButtonText>
<img src={Google} alt="google" width="24" height="24" />
<span>Google</span>
</SocialButtonText>
</SocialButton>
<SocialButton
onClick={handleSocialSignup}
provider="facebook"
data-provider="facebook"
id="gtm-signup-facebook"
type="button"
social
>
<SocialButtonText>
<img src={Facebook} alt="facebook" width="24" height="24" />
<span>Facebook</span>
</SocialButtonText>
</SocialButton>
<SocialButton
onClick={handleSocialSignup}
provider="apple"
data-provider="apple"
id="gtm-signup-apple"
type="button"
social
>
<SocialButtonText>
<img src={Apple} alt="apple" width="24" height="24" />
<span>Apple</span>
</SocialButtonText>
</SocialButton>
</SocialWrapper>
</div>
</SignupFormWrapper>
)
<EmailButton
isChecked={is_checked}
id="gtm-signup-email"
type="submit"
secondary="true"
disabled={is_submitting || !is_checked || email_error_msg || !email}
>
{localize('Get your free ebook now!')}
</EmailButton>
</InputGroupForm>
<SignupWithContainer>
<Line />
<StyledText color="grey-5" align="center" tabletFontSize="12px">
{localize('Or sign up with')}
</StyledText>
<Line />
</SignupWithContainer>
<SocialWrapper jc="unset" ai="center">
<SocialButton
onClick={handleSocialSignup}
provider="google"
data-provider="google"
id="gtm-signup-google"
type="button"
social
>
<SocialButtonText>
<img src={Google} alt="google" width="24" height="24" />
<span>Google</span>
</SocialButtonText>
</SocialButton>
<SocialButton
onClick={handleSocialSignup}
provider="facebook"
data-provider="facebook"
id="gtm-signup-facebook"
type="button"
social
>
<SocialButtonText>
<img src={Facebook} alt="facebook" width="24" height="24" />
<span>Facebook</span>
</SocialButtonText>
</SocialButton>
<SocialButton
onClick={handleSocialSignup}
provider="apple"
data-provider="apple"
id="gtm-signup-apple"
type="button"
social
>
<SocialButtonText>
<img src={Apple} alt="apple" width="24" height="24" />
<span>Apple</span>
</SocialButtonText>
</SocialButton>
</SocialWrapper>
</div>
</SignupFormWrapper>
)
}

GetEbook.propTypes = {
Expand Down
8 changes: 4 additions & 4 deletions src/pages/landing/ebooks/components/_introduction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import React from 'react'
import styled from 'styled-components'
import PropTypes from 'prop-types'
import { Header, Text, Li } from 'components/elements'
import { localize } from 'components/localization'
import checkIcon from 'images/common/ebooks/check-icon.png'
import BackgroundPattern from 'images/svg/ebook-intro-bg.svg'
import device from 'themes/device'
import { localize, Localize } from 'components/localization'

const BacgroundWrapper = styled.div`
width: 100%;
Expand Down Expand Up @@ -96,7 +96,7 @@ const Introduction = ({ introImage, imageWidth, introPara, subPara, introList })
/>
<MediaBody>
<Header as="h3" className="mt-0 intro-text">
{localize('Introduction')}
{localize("Introduction")}
</Header>
<Text className="intro-desc" mb="20px">
{introPara}
Expand All @@ -113,14 +113,14 @@ const Introduction = ({ introImage, imageWidth, introPara, subPara, introList })
mb="20px"
mt="30px"
>
{localize('In this book you’ll learn:')}
{localize("In this book you’ll learn:")}
</Header>
<MediaItemList>
{introList?.map((point, index) => {
return (
<Li key={index}>
<img src={checkIcon} alt="Check Icon" />
{point}
<Localize translate_text={point} />
</Li>
)
})}
Expand Down
8 changes: 4 additions & 4 deletions src/pages/landing/ebooks/components/_topics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import React from 'react'
import styled from 'styled-components'
import PropTypes from 'prop-types'
import { Header, Li, QueryImage } from 'components/elements'
import { localize } from 'components/localization'
import checkIcon from 'images/common/ebooks/check-icon.png'
import device from 'themes/device'
import { localize, Localize } from 'components/localization'

const FullWidth = styled.div`
background-image: linear-gradient(to bottom, #eaf4f5 1%, rgba(242, 245, 248, 0) 99%);
Expand Down Expand Up @@ -90,13 +90,13 @@ const Topics = ({ topicsImage, topicsList }) => {
color="var(--color-black-3)"
mb="20px"
>
{localize('Topics covered')}
{localize("Topics covered")}
</Header>
{topicsList?.map((topic, index) => {
return (
<Li key={index} className="topic-item">
<img src={checkIcon} alt="Check Icon" />
{topic}
<Localize translate_text={topic} />
</Li>
)
})}
Expand All @@ -105,7 +105,7 @@ const Topics = ({ topicsImage, topicsList }) => {
<QueryImage data={topicsImage} alt="Forex Topics" />
</TopicImgWrapper>
</Wrapper>
</FullWidth>
</FullWidth >
)
}

Expand Down
2 changes: 1 addition & 1 deletion src/pages/markets/components/markets/_cryptocurrencies.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const Cryptocurrencies = ({ simple_step_content }) => {
return (
<>
<WhyTrade
header={<Localize translate_text="Why trade cryptocurrency on Deriv" />}
header={<Localize translate_text="Why trade cryptocurrencies on Deriv" />}
text={
<Localize translate_text="Take advantage of a highly liquid market with round-the-clock trading. Profit from correctly predicting the movement of world's most popular cryptocurrencies." />
}
Expand Down
15 changes: 8 additions & 7 deletions src/pages/payment-methods/_expanded-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import styled, { css } from 'styled-components'
import { Button } from 'components/form/'
import { Text } from 'components/elements'
import { localize } from 'components/localization'
import { getCryptoDecimals } from 'common/utility'
// import { getCryptoDecimals } from 'common/utility'
// SVG
import Chevron from 'images/svg/chevron-thick.svg'
import PDF from 'images/svg/pdf-icon-black.svg'
Expand Down Expand Up @@ -103,14 +103,14 @@ const Withdrawal = styled(Td)`
}
`

const ExpandList = ({ data, config, is_crypto, is_fiat_onramp, locale }) => {
const ExpandList = ({ data, /*config,*/ is_crypto, is_fiat_onramp, locale }) => {
const [is_expanded, setIsExpanded] = React.useState(false)
const toggleExpand = () => {
setIsExpanded(!is_expanded)
}
const getCryptoConfig = (name) => {
return config == undefined ? null : getCryptoDecimals(config[name].minimum_withdrawal)
}
// const getCryptoConfig = (name) => {
// return config == undefined ? null : getCryptoDecimals(config[name].minimum_withdrawal)
// }
return (
<>
<Tr is_expanded={is_expanded}>
Expand All @@ -133,7 +133,8 @@ const ExpandList = ({ data, config, is_crypto, is_fiat_onramp, locale }) => {
<Text key={idx}>{md}</Text>
))
) : is_crypto ? (
<Text>{getCryptoConfig(data.name)}</Text>
// <Text>{getCryptoConfig(data.name)}</Text>
<Text>{data.min_max_withdrawal}</Text>
) : (
<Text>{data.min_max_withdrawal}</Text>
)}
Expand Down Expand Up @@ -188,7 +189,7 @@ const ExpandList = ({ data, config, is_crypto, is_fiat_onramp, locale }) => {
}

ExpandList.propTypes = {
config: PropTypes.oneOfType([PropTypes.bool, PropTypes.object]),
// config: PropTypes.oneOfType([PropTypes.bool, PropTypes.object]),
data: PropTypes.object,
is_crypto: PropTypes.bool,
is_fiat_onramp: PropTypes.bool,
Expand Down
Loading