Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mahdiyeh/fix: localize #7720

Merged
merged 6 commits into from
Feb 27, 2023
Merged

Mahdiyeh/fix: localize #7720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87148d2
fix: localize
mahdiyeh-deriv Feb 23, 2023
c3b7050
Merge branch 'master' into 89390/fix_localization_appstore
mahdiyeh-deriv Feb 23, 2023
2df62fc
Merge branch 'master' into 89390/fix_localization_appstore
jim-deriv Feb 27, 2023
aca669c
Merge branch 'master' into 89390/fix_localization_appstore
jim-deriv Feb 27, 2023
89fa86a
Merge branch 'master' into 89390/fix_localization_appstore
jim-deriv Feb 27, 2023
1f79da7
Merge branch 'master' into 89390/fix_localization_appstore
jim-deriv Feb 27, 2023
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
32 changes: 21 additions & 11 deletions packages/appstore/src/components/onboarding-new/static-dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,9 @@ const StaticDashboard = ({
type='all'
platform='options'
appname={is_eu_account_title}
description='Get a real Deriv account, start trading and manage your funds.'
description={localize(
'Get a real Deriv account, start trading and manage your funds.'
)}
currency={currency}
has_account={has_account}
is_blurry={is_blurry}
Expand All @@ -261,7 +263,7 @@ const StaticDashboard = ({
<StaticTradingAppCard
icon='DTrader'
name='DTrader'
description='Multipliers trading platform.'
description={localize('Multipliers trading platform.')}
availability='All'
has_applauncher_account={has_applauncher_account}
is_item_blurry={is_blurry.platformlauncher}
Expand All @@ -272,7 +274,7 @@ const StaticDashboard = ({
<StaticTradingAppCard
icon='DTrader'
name='DTrader'
description='Options and multipliers trading platform.'
description={localize('Options and multipliers trading platform.')}
availability='All'
has_applauncher_account={has_applauncher_account}
is_item_blurry={is_blurry.platformlauncher}
Expand All @@ -287,7 +289,7 @@ const StaticDashboard = ({
<StaticTradingAppCard
icon='DBot'
name='DBot'
description='Automate your trading, no coding needed.'
description={localize('Automate your trading, no coding needed.')}
availability='Non-EU'
has_applauncher_account={has_applauncher_account}
is_item_blurry={is_blurry.platformlauncher}
Expand All @@ -298,7 +300,7 @@ const StaticDashboard = ({
<StaticTradingAppCard
icon='SmartTrader'
name='SmartTrader'
description='Automate your trading, no coding needed.'
description={localize('Automate your trading, no coding needed.')}
availability='Non-EU'
has_applauncher_account={has_applauncher_account}
is_item_blurry={is_blurry.platformlauncher}
Expand All @@ -309,7 +311,7 @@ const StaticDashboard = ({
<StaticTradingAppCard
icon='BinaryBot'
name='BinaryBot'
description='Our legacy automated trading platform.'
description={localize('Our legacy automated trading platform.')}
availability='Non-EU'
has_applauncher_account={has_applauncher_account}
is_item_blurry={is_blurry.platformlauncher}
Expand All @@ -319,7 +321,7 @@ const StaticDashboard = ({
<StaticTradingAppCard
icon='DerivGo'
name='DerivGo'
description='Trade on the go with our mobile app.'
description={localize('Trade on the go with our mobile app.')}
availability='Non-EU'
has_applauncher_account={has_applauncher_account}
is_item_blurry={is_blurry.platformlauncher}
Expand Down Expand Up @@ -437,7 +439,9 @@ const StaticDashboard = ({
type='synthetic'
platform='mt5'
appname='Derived'
description='Trade CFDs on MT5 with synthetics, baskets, and derived FX.'
description={localize(
'Trade CFDs on MT5 with synthetics, baskets, and derived FX.'
)}
loginid={loginid}
currency={currency}
has_account={has_account}
Expand All @@ -454,7 +458,9 @@ const StaticDashboard = ({
type='financial'
platform='mt5'
appname='CFDs'
description='Trade CFDs on MT5 with forex, stocks, stock indices, synthetics, cryptocurrencies, and commodities.'
description={localize(
'Trade CFDs on MT5 with forex, stocks, stock indices, synthetics, cryptocurrencies, and commodities.'
)}
loginid={loginid}
currency={is_eu_user ? mf_currency : currency}
has_account={has_account}
Expand All @@ -470,7 +476,9 @@ const StaticDashboard = ({
type='financial'
platform='mt5'
appname='Financial'
description='Trade CFDs on MT5 with forex, stocks, stock indices, commodities, and cryptocurrencies.'
description={localize(
'Trade CFDs on MT5 with forex, stocks, stock indices, commodities, and cryptocurrencies.'
)}
financial_amount={financial_amount}
derived_amount={derived_amount}
loginid={loginid}
Expand Down Expand Up @@ -517,7 +525,9 @@ const StaticDashboard = ({
type='all'
platform='dxtrade'
appname='Deriv X'
description='Trade CFDs on Deriv X with financial markets and our Derived indices.'
description={localize(
'Trade CFDs on Deriv X with financial markets and our Derived indices.'
)}
loginid={loginid}
currency={currency}
has_account={has_account}
Expand Down
8 changes: 5 additions & 3 deletions packages/appstore/src/components/options/options-accounts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ const OptionsAccounts = (props: TOptionsAccountsProps & RouteComponentProps) =>
<AddOptions
number_of_accounts={sortedAccountList.length}
title={is_mf ? 'Manage account' : 'More Options accounts'}
description={'Including cryptocurrencies'}
description={localize('Including cryptocurrencies')}
is_mf={is_mf}
/>
</div>
Expand All @@ -268,7 +268,9 @@ const OptionsAccounts = (props: TOptionsAccountsProps & RouteComponentProps) =>
appname={is_eu_account_title}
disabled={false}
onClickGet={() => ui.openRealAccountSignup()}
description={`Get a real ${is_eu_title} account, start trading and manage your funds.`}
description={localize(
`Get a real ${is_eu_title} account, start trading and manage your funds.`
)}
/>
</div>
)}
Expand All @@ -290,7 +292,7 @@ const OptionsAccounts = (props: TOptionsAccountsProps & RouteComponentProps) =>
footer={
<Modal.Footer has_separator style={{ position: 'fixed', bottom: '0px', width: '100%' }}>
<Button style={{ width: '100%' }} secondary onClick={() => setIsModalOpen(false)}>
{'Back to trading hub'}
{localize('Back to trading hub')}
</Button>
</Modal.Footer>
}
Expand Down