Skip to content
This repository has been archived by the owner on Sep 26, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into translation-new-homepage
Browse files Browse the repository at this point in the history
  • Loading branch information
mitra-deriv committed Jan 31, 2024
2 parents 9df5dc6 + 1960f6b commit 0782497
Show file tree
Hide file tree
Showing 31 changed files with 4,832 additions and 4,879 deletions.
2 changes: 1 addition & 1 deletion crowdin/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1523,7 +1523,6 @@
"1413567719": "What is payout per point?",
"1413977299": "You can trade Digits contracts on the Deriv Trader, SmartTrader, and Deriv Bot trading platforms, on synthetics.",
"1414394793": "Country*",
"1415101574": "We have a diverse suite of 7 trading platforms: <0>Deriv MT5</0>, <1>Deriv X</1>, <2>Deriv Trader</2>, <3>Deriv Bot</3>, <4>Deriv GO</4>, <5>SmartTrader</5>, and <6>Binary Bot</6>. Each of these platforms is designed to fit any trading style, regardless of your trading experience.",
"1416184764": "How can I identify Deriv customer support impersonators on Telegram?",
"1416248668": "Choose the best rates",
"1417996846": "Can a premium payment agent provide their services to another premium payment agent?",
Expand Down Expand Up @@ -3092,6 +3091,7 @@
"-691446230": "Stock indices measure the value of a group of companies in the stock market. This allows investors to see how a particular set of assets is performing.",
"-1412546523": "Read <0>this article</0> to learn more about trading stocks on Deriv.",
"-1542650156": "CFDs let you predict the price movement of underlying assets without actually owning them. With CFDs, you open a position based on your prediction, and you'll earn a profit if you close your position when the price moves in your favour.",
"-919226422": "We have a diverse suite of 8 trading platforms: <0>Deriv MT5</0>, <1>Deriv X</1>, <2>Deriv cTrader</2>, <3>Deriv Trader</3>, <4>Deriv Bot</4>, <5>Deriv GO</5>, <6>SmartTrader</6>, and <7>Binary Bot</7>. Each of these platforms is designed to fit any trading style, regardless of your trading experience.",
"-59331209": "We offer 2 trading platforms in the EU: <0>Deriv MT5</0> (CFDs) and <2>Deriv Trader</2> (multipliers). They’re designed to fit any trading style and give you access to financial and derived markets.",
"-626094848": "Build your trading bot for free on <0>DBot</0> or <1>Binary Bot</1>; no coding is needed. You’ll also find free pre-built strategies on DBot that you can customise to your needs.",
"-578264817": "Trading limits are only applicable to your Deriv real account. You can see the limits on your account on the <0>Account limits</0> page (you must be <1>logged in</1>).",
Expand Down
28 changes: 16 additions & 12 deletions gatsby-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const BuildPage = (page, actions) => {
})
createRedirect({
fromPath: `/contact-us`,
toPath: `/contact_us`,
toPath: `/contact_us/`,
redirectInBrowser: true,
isPermanent: true,
})
Expand Down Expand Up @@ -451,19 +451,23 @@ exports.onCreateWebpackConfig = ({ stage, actions, loaders, getConfig }, { ...op
usedExports: true,
},
plugins: [
new StylelintPlugin({...style_lint_options, ...options}),
new webpack.optimize.LimitChunkCountPlugin({maxChunks: 1}),
new StylelintPlugin({ ...style_lint_options, ...options }),
new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 }),
],
resolve: {
modules: [path.resolve(__dirname, 'src'), 'node_modules'],
},
...((stage === 'build-html' || stage === 'develop-html') ? {
module: {
rules: [{
test: /analytics/,
use: loaders.null()
}]
}
} : {}),
...(stage === 'build-html' || stage === 'develop-html'
? {
module: {
rules: [
{
test: /analytics/,
use: loaders.null(),
},
],
},
}
: {}),
})
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ const SignupPublicForm = () => {
md={{
direction: 'row',
justify: 'between',
align: 'center',
gap: '4x',
}}
>
Expand Down
Binary file modified src/images/common/stock-indices/stocksMainHeaderImg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 13 additions & 9 deletions src/images/svg/stock-indices/stocks-high-leverage.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 11 additions & 10 deletions src/images/svg/stock-indices/stocks-minimum-capital.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 7 additions & 6 deletions src/pages/help-centre/data/_trading.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,21 +117,22 @@ const trading: TQuestionsData = {
answer: [
{
translation_text:
'_t_We have a diverse suite of 7 trading platforms: <0>Deriv MT5</0>, <1>Deriv X</1>, <2>Deriv Trader</2>, <3>Deriv Bot</3>, <4>Deriv GO</4>, <5>SmartTrader</5>, and <6>Binary Bot</6>. Each of these platforms is designed to fit any trading style, regardless of your trading experience._t_',
'_t_We have a diverse suite of 8 trading platforms: <0>Deriv MT5</0>, <1>Deriv X</1>, <2>Deriv cTrader</2>, <3>Deriv Trader</3>, <4>Deriv Bot</4>, <5>Deriv GO</5>, <6>SmartTrader</6>, and <7>Binary Bot</7>. Each of these platforms is designed to fit any trading style, regardless of your trading experience._t_',
eu_translation_text:
'_t_We offer 2 trading platforms in the EU: <0>Deriv MT5</0> (CFDs) and <2>Deriv Trader</2> (multipliers). They’re designed to fit any trading style and give you access to financial and derived markets._t_',
translation_components: [
{ key: 0, type: 'link', to: '/dmt5/' },
{ key: 1, type: 'link', to: '/derivx/' },
{ key: 2, type: 'link', to: '/dtrader/' },
{ key: 3, type: 'link', to: '/dbot/' },
{ key: 4, type: 'link', to: '/deriv-go/' },
{ key: 2, type: 'link', to: '/deriv-ctrader/' },
{ key: 3, type: 'link', to: '/dtrader/' },
{ key: 4, type: 'link', to: '/dbot/' },
{ key: 5, type: 'link', to: '/deriv-go/' },
{
key: 5,
key: 6,
type: 'link',
to: 'https://smarttrader.deriv.com/en/trading.html',
},
{ key: 6, type: 'link', to: binary_bot_url },
{ key: 7, type: 'link', to: binary_bot_url },
],
},
],
Expand Down
7 changes: 1 addition & 6 deletions src/pages/landing/stocks/_headerSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ const query = graphql`
mainHeaderImage: file(relativePath: { eq: "stock-indices/stocksMainHeaderImg.png" }) {
...fadeIn
}
mainHeaderImageMobile: file(
relativePath: { eq: "stock-indices/stocksMainHeaderImg-m.png" }
) {
...fadeIn
}
}
`

Expand Down Expand Up @@ -290,7 +285,7 @@ const HeaderSection = () => {
</DesktopImageWrapper>
<MobileImageWrapper>
<QueryImage
data={data['mainHeaderImageMobile']}
data={data['mainHeaderImage']}
alt={localize('_t_deriv platform mobile_t_')}
width="100%"
/>
Expand Down
1 change: 0 additions & 1 deletion src/pages/trading-specification/components/_elements.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ export const TableHeaderCell = ({ text, infoIcon, toolTip }: TTableHeaderCell) =
isOpen={isInfoVisible}
positions={['top', 'right', 'bottom', 'left']}
padding={10}
containerStyle={{ left: '-10px' }}
content={({ position, childRect, popoverRect }) => (
<ArrowContainer
style={{
Expand Down
Loading

0 comments on commit 0782497

Please sign in to comment.