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 #1379

Merged
merged 23 commits into from
Feb 9, 2021
Merged

Crowdin #1379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7b7d882
Fixed CFD risk value (#1343)
mahdiaryayi-fs Jan 18, 2021
22101ce
yashim/fix: update payment agents page (#1355)
yashim-deriv Jan 19, 2021
8965345
Abdalla/Add: new instruments to Markets->Forex->margin (#1309)
abdallamourad Jan 19, 2021
eefb83b
translate: new ru
cakasuma Jan 19, 2021
37276c2
update:story and partner numbers jan 2021 (#1345)
virtualpowwa Jan 20, 2021
4245a7d
fix:trading signal add dot (#1314)
virtualpowwa Jan 20, 2021
7822e73
feat:calc remove is before formula (#1341)
virtualpowwa Jan 20, 2021
d72e5c1
Kevin/update ib contents (#1199)
virtualpowwa Jan 20, 2021
e521f66
translate: download (#1370)
Jan 21, 2021
545a97d
Suthesh/multiplier page (#1323)
suthesank Jan 21, 2021
d15949d
Suthesh/margin trading page update (#1208)
suthesank Jan 21, 2021
d53cd8c
suthesh/fix-seo-description (#1216)
suthesank Jan 21, 2021
3911af5
translate: new crowdin texts
cakasuma Jan 21, 2021
6335305
translate: after rebase extract, upload, download
cakasuma Jan 25, 2021
5486a93
translate: download for regression
cakasuma Feb 2, 2021
3c9b97a
fix: footer texts
cakasuma Feb 2, 2021
c9dae0d
change inc to clean resource
cakasuma Feb 2, 2021
a1000a8
Kevin/ hotfix ib page fixes (#1403)
virtualpowwa Feb 3, 2021
9c65f8a
yashim/hotfix: removed extra language switcher & Resources link at pa…
yashim-deriv Feb 4, 2021
12660c1
fix: tab headers breaking for certain languages (#1406)
Feb 4, 2021
202f8c0
Reverted layout changes (#1412)
yashim-deriv Feb 4, 2021
4eee35d
Kevin/Hotfix: ib programme card content translation (#1418)
virtualpowwa Feb 8, 2021
3c7ccb4
fix: merge conflict
cakasuma Feb 9, 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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"license": "Apache License 2.0",
"scripts": {
"build": "gatsby clean && gatsby build",
"build:inc": "export GATSBY_EXPERIMENTAL_PAGE_BUILD_ON_DATA_CHANGES=true && gatsby build",
"build:inc": "gatsby clean && export GATSBY_EXPERIMENTAL_PAGE_BUILD_ON_DATA_CHANGES=true && gatsby build",
"develop": "gatsby develop -o",
"format": "prettier --write '**/*.js' '*.js'",
"stylelint": "stylelint 'src/**/*.js' --formatter verbose",
Expand Down
18 changes: 6 additions & 12 deletions src/components/containers/seo.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react'
import PropTypes from 'prop-types'
import { Helmet } from 'react-helmet'
import { useStaticQuery, graphql } from 'gatsby'
import { LocaleContext, localize } from '../localization'
import { LocaleContext } from '../localization'
import language_config from '../../../i18n-config'
import TradingImage from 'images/common/practice.png'

Expand Down Expand Up @@ -82,12 +82,6 @@ const SEO = ({ description, meta, title, no_index, has_organization_schema }) =>
name: 'description',
content: metaDescription,
},
{
name: 'keywords',
content: localize(
'digital options, forex, forex trading, online trading, financial trading, digitals trading, index trading, trading indices, forex trades, trading commodities, digital options strategy, binary broker, binary bet, digital options trading platform, binary strategy, finance, investment, trading',
),
},
{
name: 'google',
content: 'notranslate',
Expand Down Expand Up @@ -154,11 +148,11 @@ const SEO = ({ description, meta, title, no_index, has_organization_schema }) =>
},
...(no_index || no_index_staging || is_ach_page
? [
{
name: 'robots',
content: 'noindex',
},
]
{
name: 'robots',
content: 'noindex',
},
]
: []),
].concat(meta)}
>
Expand Down
56 changes: 44 additions & 12 deletions src/components/custom/_dnumbers.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,50 +2,82 @@ import React from 'react'
import styled from 'styled-components'
import PropTypes from 'prop-types'
import device from 'themes/device'
import { Container, SectionContainer } from 'components/containers'
import { Flex } from 'components/containers'
import { Header, Text } from 'components/elements'

const NumberWrapper = styled.div`
display: flex;
flex-direction: column;
justify-content: center;
width: 32.8rem;
width: 28.2rem;

${Text} {
padding-top: 0.8rem;
}

@media ${device.laptop} {
margin: 1.2rem 0;
width: 22rem;
}
@media ${device.tabletL} {
margin: 1.2rem 0;
width: unset;

${Header} {
font-size: 24px;
}
${Text} {
font-size: 16px;
}
}
`
const StyledContainer = styled(Container)`
display: flex;
width: 100%;

const DnumberContainer = styled(Flex)`
margin-top: 2.4rem;
margin-bottom: 2.4rem;
flex-direction: row;

@media ${device.tabletL} {
margin-bottom: 0;
flex-direction: column;
}
`

const DNumbers = ({ items, justify }) => {
const DnumberContent = styled(Flex)`
justify-content: space-between;
@media ${device.tabletL} {
justify-content: space-around;
}
`

const DNumbers = ({ items }) => {
return (
<SectionContainer padding="4rem">
<StyledContainer justify={justify || 'space-between'}>
{items.map((item, index) => (
<DnumberContainer padding="4rem">
<DnumberContent>
{items.slice(0, 2).map((item, index) => (
<NumberWrapper key={index}>
<Header as="h2" type="page-title" align="center">
{item.title}
</Header>
<Text align="center">{item.subtitle}</Text>
</NumberWrapper>
))}
</DnumberContent>
<DnumberContent>
{items.slice(2, 4).map((item, index) => (
<NumberWrapper key={index}>
<Header as="h2" type="page-title" align="center">
{item.title}
</Header>
<Text align="center">{item.subtitle}</Text>
</NumberWrapper>
))}
</StyledContainer>
</SectionContainer>
</DnumberContent>
</DnumberContainer>
)
}

DNumbers.propTypes = {
items: PropTypes.array,
justify: PropTypes.string,
}
export default DNumbers
17 changes: 6 additions & 11 deletions src/components/layout/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import PropTypes from 'prop-types'
import { Container, CssGrid, Flex, Show } from '../containers'
import { StyledLink, Text, QueryImage } from '../elements'
import { LocationContext } from './location-context'
import { deriv_status_page_url, mga_link_url } from 'common/utility'
import { mga_link_url, community_url, deriv_status_page_url } from 'common/utility'
// TODO: (discussion) make footer pure component, and move usage of footer to custom
import device from 'themes/device'
import { localize, Localize, LocalizedLink } from 'components/localization'
Expand Down Expand Up @@ -484,9 +484,8 @@ const Footer = ({ type, is_ppc, is_ppc_redirect }) => {
</LinkWrapper>
<LinkWrapper>
<Link
to=""
is_community_link
external="true"
to={community_url}
target="_blank"
rel="noopener noreferrer"
>
Expand Down Expand Up @@ -637,7 +636,7 @@ const Footer = ({ type, is_ppc, is_ppc_redirect }) => {
<Show.Desktop>
<Show.NonEU>
<DisclaimerParagraph no_margin>
<Localize translate_text="The financial products offered on this website include options and contracts for difference (CFDs) which are considered complex derivatives and may not be suitable for everyone. CFDs are complex instruments and come with a high risk of losing money rapidly due to leverage. You should consider whether you understand how CFDs work and whether you can afford to take the high risk of losing your money. The products mentioned here may be affected by changes in currency exchange rates. If you invest in these products, you may lose some or all of your investment, and the value of your investment may fluctuate. You should never invest money that you cannot afford to lose and never trade with borrowed money." />
<Localize translate_text="CFDs are considered complex derivatives and may not be suitable for retail clients. CFDs are complex instruments and come with a high risk of losing money rapidly due to leverage. You should consider whether you understand how CFDs work and whether you can afford to take the high risk of losing your money. The products mentioned here may be affected by changes in currency exchange rates. If you invest in these products, you may lose some or all of your investment, and the value of your investment may fluctuate. You should never invest money that you cannot afford to lose and never trade with borrowed money." />
</DisclaimerParagraph>
<DisclaimerParagraph>
<Localize
Expand All @@ -655,9 +654,7 @@ const Footer = ({ type, is_ppc, is_ppc_redirect }) => {
<Show.Eu>
<DisclaimerParagraph no_margin>
<Localize
translate_text="The financial products offered on this website include options and contracts for difference (CFDs) which are considered complex derivatives and may not be suitable for everyone.<0/><0/>
CFDs are complex instruments and come with a high risk of losing money rapidly due to leverage. 74% of retail investor accounts lose money when trading CFDs with this provider. You should consider whether you understand how CFDs work and whether you can afford to take the high risk of losing your money.<0/><0/>
The products mentioned here may be affected by changes in currency exchange rates. If you invest in these products, you may lose some or all of your investment and the value of your investment may fluctuate. You should never invest money that you cannot afford to lose and never trade with borrowed money."
translate_text="CFDs are considered complex derivatives and may not be suitable for retail clients.<0/><0/>CFDs are complex instruments and come with a high risk of losing money rapidly due to leverage. 71% of retail investor accounts lose money when trading CFDs with this provider. You should consider whether you understand how CFDs work and whether you can afford to take the high risk of losing your money.<0/><0/>The products mentioned here may be affected by changes in currency exchange rates. If you invest in these products, you may lose some or all of your investment and the value of your investment may fluctuate. You should never invest money that you cannot afford to lose and never trade with borrowed money."
components={[<br key={0} />]}
/>
</DisclaimerParagraph>
Expand Down Expand Up @@ -685,9 +682,7 @@ const Footer = ({ type, is_ppc, is_ppc_redirect }) => {
<Show.Eu>
<DisclaimerParagraph no_margin>
<Localize
translate_text="The financial products offered on this website include options and contracts for difference (CFDs) which are considered complex derivatives and may not be suitable for everyone.<0/><0/>
CFDs are complex instruments and come with a high risk of losing money rapidly due to leverage. 74% of retail investor accounts lose money when trading CFDs with this provider. You should consider whether you understand how CFDs work and whether you can afford to take the high risk of losing your money.<0/><0/>
The products mentioned here may be affected by changes in currency exchange rates. If you invest in these products, you may lose some or all of your investment and the value of your investment may fluctuate. You should never invest money that you cannot afford to lose and never trade with borrowed money."
translate_text="CFDs are considered complex derivatives and may not be suitable for retail clients.<0/><0/>CFDs are complex instruments and come with a high risk of losing money rapidly due to leverage. 71% of retail investor accounts lose money when trading CFDs with this provider. You should consider whether you understand how CFDs work and whether you can afford to take the high risk of losing your money.<0/><0/>The products mentioned here may be affected by changes in currency exchange rates. If you invest in these products, you may lose some or all of your investment and the value of your investment may fluctuate. You should never invest money that you cannot afford to lose and never trade with borrowed money."
components={[<br key={0} />]}
/>
</DisclaimerParagraph>
Expand All @@ -712,7 +707,7 @@ const Footer = ({ type, is_ppc, is_ppc_redirect }) => {
</Show.Eu>
<Show.NonEU>
<DisclaimerParagraph no_margin>
<Localize translate_text="The financial products offered on this website include options and contracts for difference (CFDs) which are considered complex derivatives and may not be suitable for everyone. CFDs are complex instruments and come with a high risk of losing money rapidly due to leverage. You should consider whether you understand how CFDs work and whether you can afford to take the high risk of losing your money. The products mentioned here may be affected by changes in currency exchange rates. If you invest in these products, you may lose some or all of your investment, and the value of your investment may fluctuate. You should never invest money that you cannot afford to lose and never trade with borrowed money." />
<Localize translate_text="CFDs are considered complex derivatives and may not be suitable for retail clients. CFDs are complex instruments and come with a high risk of losing money rapidly due to leverage. You should consider whether you understand how CFDs work and whether you can afford to take the high risk of losing your money. The products mentioned here may be affected by changes in currency exchange rates. If you invest in these products, you may lose some or all of your investment, and the value of your investment may fluctuate. You should never invest money that you cannot afford to lose and never trade with borrowed money." />
</DisclaimerParagraph>
<DisclaimerParagraph>
<Localize
Expand Down
2 changes: 1 addition & 1 deletion src/components/layout/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const CFDWarning = ({ is_ppc }) => {
<CFDContainer>
<CFDText>
<Localize
translate_text="CFDs are complex instruments and come with a high risk of losing money rapidly due to leverage. <0>74% of retail investor accounts lose money when trading CFDs with this provider.</0> You should consider whether you understand how CFDs work and whether you can afford to take the high risk of losing your money."
translate_text="CFDs are complex instruments and come with a high risk of losing money rapidly due to leverage. <0>71% of retail investor accounts lose money when trading CFDs with this provider.</0> You should consider whether you understand how CFDs work and whether you can afford to take the high risk of losing your money."
components={[<strong key={0} />]}
/>
</CFDText>
Expand Down
Loading