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

update changes #3

Merged
merged 1 commit into from
May 9, 2019
Merged

update changes #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions scripts/js_texts/extracted_strings_app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ module.exports = [
'Please check your email for further instructions.',
'Please check your email for the password reset link.',
'Please choose a currency',
'Please complete the [_1]Real Account form[_2] to verify your age as required by the [_3]UK Gambling[_4] Commission (UKGC).',
'Please complete the [_1]financial assessment form[_2] to lift your withdrawal and trading limits.',
'Please complete your [_1]personal details[_2] before you proceed.',
'Please confirm that all the information above is true and complete.',
Expand Down Expand Up @@ -493,6 +494,7 @@ module.exports = [
'Your account has no trading activity.',
'Your account is fully authenticated and your withdrawal limits have been lifted.',
'Your account is restricted. Kindly [_1]contact customer support[_2] for assistance.',
'Your age verification failed. Please contact customer service for assistance. [_1][_1] [_2]Telephone:[_3] [_1] United Kingdom [_1] +44 (0) 1666 800042 [_1] 0800 011 9847 (Toll Free)',
'Your application to be treated as a professional client is being processed.',
'Your cashier is locked as per your request - to unlock it, please click <a href="[_1]">here</a>.',
'Your cashier is locked as per your request - to unlock it, please enter the password.',
Expand Down Expand Up @@ -538,6 +540,7 @@ module.exports = [
'[_1]Authenticate your account[_2] now to take full advantage of all payment methods available.',
'[_1]Manage your accounts[_2]',
'[_1]No, change my fiat account\'s currency now[_2]',
'[_1]Telephone numbers in other locations[_2]',
'[_1]Your Proof of Identity or Proof of Address[_2] did not meet our requirements. Please check your email for further instructions.',
'day',
'days',
Expand Down
1 change: 0 additions & 1 deletion src/images/social/google.svg
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/javascript/_autogenerated/ach.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/javascript/_autogenerated/es.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/javascript/_autogenerated/id.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/javascript/_autogenerated/zh_cn.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/javascript/_autogenerated/zh_tw.js
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions src/sass/static/metatrader.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@
margin-right: 100%;
right: 10px;
}
ul {
list-style: none;
}
}
ol {
counter-reset: item2;
Expand Down
19 changes: 10 additions & 9 deletions src/templates/static/legal/complaints.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,26 @@ import React from 'react';

const Complaints = () => (
<div>
<h2 data-anchor='complaints-and-disputes'>{it.L('Complaints and Disputes')}</h2>
<p>{it.L('If you would like to file a complaint with regards to our service, kindly contact us on [_1], providing any relevant details relating to your complaint. We shall investigate your enquiry and a response will be given to your enquiry. We will usually provide a final response within [_2] working days from receipt of all relevant details.', '<a href=\'mailto:complaints@binary.com\'>complaints@binary.com</a>', '15')}</p>
<p data-show='eucountry'>{it.L('If your complaint relates to our data processing practices, you may formally submit a complaint to the Information and Data Protection Commissioner (Malta) on the entity\'s [_1]website[_2].',
<h2 data-anchor='complaints-and-disputes'>{it.L('Complaints and disputes')}</h2>
<p>{it.L('If the client would like to file a complaint with regards to the Company\'s service, the client can contact the Company at [_1], providing any relevant details relating to the client\'s complaint. The Company will investigate the client\'s enquiry and a response will be given. The Company usually provides a final response within [_2] working days from receipt of all relevant details.', '<a href=\'mailto:complaints@binary.com\'>complaints@binary.com</a>', '15')}</p>
<p data-show='eucountry'>{it.L('If the client\'s complaint relates to the Company\'s data processing practices, the client may formally submit a complaint to the Information and Data Protection Commissioner (Malta) on the entity\'s [_1]website[_2]. Alternatively, the client can make a complaint to any Supervisory Authority within the European Union.',
'<a href="https://idpc.org.mt/en/Pages/Home.aspx" target="_blank" rel="noopener noreferrer">', '</a>')}
</p>
<p data-show='eucountry'>{it.L('If your complaint relates to an outcome of a trade or a transaction and remains unresolved, it will turn into a dispute. Should you be unsatisfied with our response, you can choose to escalate your complaint to the regulator or to an alternative dispute resolution entity.')}</p>
<p data-show='eucountry'>{it.L('Clients registered with Binary (IOM) Ltd can raise their unresolved disputes with the alternative dispute resolution entity IBAS by filling the adjudication form on the ADR entity\'s [_1]website[_2].',
<p>{it.L('Clients registered with Binary (IOM) Ltd can formally submit a complaint to their local Supervisory Authority.')}</p>
<p data-show='eucountry'>{it.L('If the client\'s complaint relates to an outcome of a trade or a transaction and remains unresolved, it will turn into a dispute. Should clients be unsatisfied with the Company\'s response, they can choose to escalate their complaint to the regulator or to an alternative dispute resolution entity.')}</p>
<p>{it.L('Clients registered with Binary (IOM) Ltd can raise their unresolved disputes with the alternative dispute resolution entity IBAS by filling the adjudication form on the ADR entity\'s [_1]website[_2].',
'<a href=\'https://www.ibas-uk.com\' target=\'_blank\' rel=\'noopener noreferrer\'>', '</a>')}
</p>
<p data-show='eucountry'>{it.L('Clients registered with Binary (Europe) Ltd can raise their unresolved disputes with the Malta Gaming Authority [_1] by submitting an email to [_2]. UK clients registered with Binary (Europe) Ltd can submit their dispute with the alternative dispute resolution entity IBAS by filling the adjudication form on the ADR entity\'s [_3]website[_4].',
'<a href="http://www.mga.org.mt/" target="_blank" rel="noopener noreferrer">(www.mga.org.mt)</a>', 'support.mga@mga.org.mt', '<a href=\'https://www.ibas-uk.com\' target=\'_blank\' rel=\'noopener noreferrer\'>', '</a>')}
<p data-show='eucountry'>{it.L('Clients registered with Binary (Europe) Ltd can raise their unresolved disputes with the alternative dispute resolution entity IBAS by filling the adjudication form on the ADR entity\'s [_1]website[_2] or they can refer to the Malta Gaming Authority via the [_3]Player Support Unit[_4].',
'<a href="https://www.ibas-uk.com" target="_blank" rel="noopener noreferrer">', '</a>', '<a href="http://www.mga.org.mt/support/online-gaming-support/" target=\'_blank\' rel=\'noopener noreferrer\'>', '</a>')}
</p>
<p data-show='eucountry'>{it.L('Alternatively, clients who are registered with both Binary (IOM) Ltd and Binary (Europe) Ltd, instead of submitting their dispute to IBAS, they can make use of the European Commission\'s Online Dispute Resolution (ODR) platform available [_1]here[_2].',
<p data-show='eucountry'>{it.L('Alternatively, EU residents who are registered with both Binary (IOM) Ltd and Binary (Europe) Ltd, can make use of the European Commission\'s Online Dispute Resolution (ODR) platform available [_1]here[_2].',
'<a href="https://ec.europa.eu/odr" target="_blank" rel="noopener noreferrer">', '</a>')}
</p>
<p data-show='eucountry'>{it.L('Clients registered with Binary Investments (Europe) Ltd can raise their unresolved disputes with the Office of the Arbiter for Financial Services. Contact details and guidance on making a complaint with the Arbiter\'s Office can be found [_1]here[_2].',
'<a href="https://financialarbiter.org.mt" target="_blank" rel="noopener noreferrer">', '</a>')}
</p>
<p data-show='eucountry'>{it.L('It is important that you refer your disputes to the appropriate ADR for the claims to be valid.')}</p>
<p>{it.L('It is important that clients refer their disputes to the appropriate ADR for the claims to be valid.')}</p>
</div>
);

Expand Down
14 changes: 7 additions & 7 deletions src/templates/static/legal/conflicts_policy.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ import React from 'react';

const ConflictsPolicy = () => (
<div>
<h2 data-anchor='conflicts-policy'>{it.L('Summary of the Conflicts Policy')}</h2>
<p>{it.L('We provide here a summary of the policy we maintain in order to manage conflicts of interest in respect of the duties we owe to our clients.')}</p>
<h2 data-anchor='conflicts-policy'>{it.L('Summary of the Conflicts policy')}</h2>
<p>{it.L('The Company provides here a summary of the policy that the Company maintains in order to manage conflicts of interest in respect of the duties that the Company owes to clients.')}</p>

<h2 data-anchor='general'>{it.L('General')}</h2>
<p>{it.L('Due to the nature of our business as a trading counterparty, company profits are tied to net revenue generated by you through trading. However, we aim to establish and maintain and operate effective organisational and administrative arrangements with a view to taking all reasonable steps to prevent conflicts of interest from constituting or giving rise to a material risk of damage to the interests of our clients.')}</p>
<p>{it.L('We have in place adequate internal procedures to ensure that you are in all cases treated fairly and that the risk of damage to client interests will be mitigated.')}</p>
<p>{it.L('Due to the nature of the Company\'s business as a trading counterparty, the Company\'s profits are tied to the net revenue generated by clients through trading. However, the Company aims to establish, maintain, and operate effective organisational and administrative arrangements with a view to taking all reasonable steps to prevent conflicts of interest from constituting or giving rise to a material risk of damage to the interests of clients.')}</p>
<p>{it.L('Due to the high degree of risk involved, which could result in the loss of the entire investment, the Company has adequate internal procedures in place to ensure that the client is in all cases treated fairly and that the risk of damage to client interests will be mitigated.')}</p>

<h2 data-anchor='our-policy'>{it.L('Our Policy')}</h2>
<p>{it.L('We aim to keep a record of the kinds of activity we carry on in which a material conflict could arise or has arisen. We also maintain procedures to manage actual or potential conflicts. This includes procedures to maintain appropriate independence between members of our staff who are involved in potentially conflicting activities, for example, through the operation of information barriers, physical separation of staff, the segregation of duties and responsibilities and maintenance of a policy of independence which requires our staff, when providing services to a client, to act in the best interests of the client and to disregard any conflicts of interest; and, in some circumstances declining to act for a client or potential client.')}</p>
<h2 data-anchor='our-policy'>{it.L('The Company\'s policy')}</h2>
<p>{it.L('The Company aims to keep a record of the kinds of activity that the Company carries on in which a material conflict could arise or has arisen. The Company also maintains procedures to manage actual or potential conflicts. This includes procedures to maintain appropriate independence among members of the Company\'s staff who are involved in potentially conflicting activities. Such independence-upholding procedures can be followed, for example, through the operation of information barriers, physical separation of staff, the segregation of duties and responsibilities, and the maintenance of a policy of independence, which requires the Company\'s staff, when providing services to a client, to act in the best interests of the client and to disregard any conflicts of interest, or in some circumstances, to decline to act for a client or potential client in order to avoid conflicts of interest.')}</p>

<h2 data-anchor='disclosure-general'>{it.L('Disclosure: general')}</h2>
<p>{it.L('The organisational and administrative arrangements established by the Company to prevent or manage the conflict are not sufficient to ensure, with reasonable confidence, that the risk of damage to the interest of the Client will be prevented. However, we aim to disclose the general nature or sources of conflicts of interest.')}</p>
<p>{it.L('The organisational and administrative arrangements established by the Company to prevent or manage the conflict are not sufficient to ensure, with reasonable confidence, that the risk of damage to the interest of the client will be prevented. However, the Company aims to disclose the general nature or sources of conflicts of interest.')}</p>
<p data-show='eucountry'>{it.L('Clients have the opportunity to consider whether to ask for more information by sending an email to compliance@binary.com, in which case further details of the conflicts of interest policy will be made available.')}</p>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion src/templates/static/legal/copyright.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const Copyright = () => (
<div>
<h2 data-anchor='copyright'>{it.L('Copyright')}</h2>
<p>{it.L('The [_1] website is protected by certain copyrights.', it.website_name)}</p>
<p>{it.L('The materials comprising the [_1] website (including without limitation all articles, text, images, logos, compilation, systems, code and design) are Copyright 1999-<span class=\'currentYear\'></span> Binary Group of companies. All rights reserved.', it.website_name)}</p>
<p>{it.L('The materials comprising the [_1] website (including without limitation all articles, text, images, logos, compilation, systems, code, and design) are under Copyright 1999-[_2] Binary Group of companies with all rights reserved.', it.website_name, '<span class=\'currentYear\'></span>')}</p>
<p>{it.L('Such materials may be copied and distributed on a limited basis for noncommercial purposes only, provided that any material copied remains intact and that all copies include the following notice in a clearly visible position: &ldquo;Copyright 1999-<span class=\'currentYear\'></span> Binary Ltd. All rights reserved.&rdquo;')}</p>
<p>{it.L('These materials may not be copied or redistributed for commercial purposes or for compensation of any kind without prior written permission from a Binary Group company.')}</p>
<p>{it.L('[_1] and the bull/bear logo are registered trademarks.', it.website_name)}</p>
Expand Down
Loading