Skip to content

Commit 2c53b7c

Browse files
committed
Merge remote-tracking branch 'refs/remotes/meenu/meenu-bottom-tab-draft' into meenu-bottom-tab-draft
2 parents e7525d8 + 2a02f70 commit 2c53b7c

File tree

15 files changed

+19
-19
lines changed

15 files changed

+19
-19
lines changed

scripts/js_texts/extracted_strings_app.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// This is an auto-generated list of strings used in js code for debugging purpose only
22
module.exports = [
3-
' • The contract doesn\'t end within 5 minutes (for tick duration contracts',
4-
' • There are less than 2 ticks between the start and end times <br />',
53
'A whole new trading experience on a powerful yet easy to use platform.',
64
'A word by itself is easy to guess',
75
'AM',
@@ -316,7 +314,7 @@ module.exports = [
316314
'Reversed words aren\'t much harder to guess',
317315
'Rise',
318316
'Rise or equal',
319-
'Rise/Fall contracts will be refunded if: <br />',
317+
'Rise/Fall contracts will be refunded if:',
320318
'STASIS Euro',
321319
'Sa',
322320
'Saturday',
@@ -384,10 +382,12 @@ module.exports = [
384382
'The <strong>start time</strong> is when the contract is processed by our servers.',
385383
'The Average',
386384
'The average is the average of the ticks, including the entry spot and the last tick.',
385+
'The contract doesn\'t end within 5 minutes (for tick duration contracts)',
387386
'The entry spot is the first tick after the contract is processed by our servers.',
388387
'The reset time is [_1]',
389388
'The server <a href="[_1]">endpoint</a> is: [_2]',
390389
'The two passwords that you entered do not match.',
390+
'There are less than 2 ticks between the start and end times',
391391
'There was an error',
392392
'There was some invalid character in an input field.',
393393
'This contract is only available on DTrader.[_1][_2]Go to Dtrader[_3] to close or cancel this contract.',

src/javascript/_autogenerated/ach.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/javascript/_autogenerated/de.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/javascript/_autogenerated/es.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/javascript/_autogenerated/fr.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/javascript/_autogenerated/id.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/javascript/_autogenerated/it.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/javascript/_autogenerated/pl.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/javascript/_autogenerated/pt.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/javascript/_autogenerated/ru.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/javascript/_autogenerated/th.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/javascript/_autogenerated/vi.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/javascript/_autogenerated/zh_cn.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/javascript/_autogenerated/zh_tw.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/javascript/app/pages/bottom/explanation_data.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -328,9 +328,9 @@ export const contractExplanationData = {
328328
},
329329
risefall: {
330330
content: [
331-
localize('Rise/Fall contracts will be refunded if: <br />'),
332-
localize(' • There are less than 2 ticks between the start and end times <br />'),
333-
localize(' • The contract doesn\'t end within 5 minutes (for tick duration contracts'),
331+
`${localize('Rise/Fall contracts will be refunded if:')} <br />`,
332+
`${localize('There are less than 2 ticks between the start and end times')}<br />`,
333+
`${localize('The contract doesn\'t end within 5 minutes (for tick duration contracts)')}`,
334334

335335
],
336336
},

0 commit comments

Comments
 (0)