From e035fe069a319338d73912d6aa3e6fe1545cdae7 Mon Sep 17 00:00:00 2001
From: Kevin <kevin@regentmarkets.com>
Date: Mon, 21 Dec 2020 13:42:35 +0800
Subject: [PATCH 1/2] fix:translate text

---
 src/pages/trader-tools/_validation.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/trader-tools/_validation.js b/src/pages/trader-tools/_validation.js
index 3279916a484..4f45775e40c 100644
--- a/src/pages/trader-tools/_validation.js
+++ b/src/pages/trader-tools/_validation.js
@@ -1,4 +1,4 @@
-import { localize } from 'components/localization'
+import { localize, Localize } from 'components/localization'
 
 const validation_regex = {
     number: /^\d*\.?\d+$/,
@@ -25,7 +25,8 @@ const validation_is_not_zero = (input) => {
 
 const numberValidation = (input, fieldName, maxDigit) => {
     if (!input) {
-        return localize(`${fieldName} is required`)
+        // eslint-disable-next-line react/react-in-jsx-scope
+        return <Localize translate_text="{{fieldName}} is required" values={{ fieldName }} />
     } else if (!validation_regex.number.test(input)) {
         return localize('Should be a valid number')
     } else if (!validation_is_exceed_number(input, maxDigit)) {
@@ -39,7 +40,8 @@ const numberValidation = (input, fieldName, maxDigit) => {
 
 const numberWithNegativeValidation = (input, fieldName, maxDigit) => {
     if (!input) {
-        return localize(`${fieldName} is required`)
+        // eslint-disable-next-line react/react-in-jsx-scope
+        return <Localize translate_text="{{fieldName}} is required" values={{ fieldName }} />
     } else if (!validation_regex.numberWithNegative.test(input)) {
         return localize('Should be a valid number')
     } else if (!validation_is_exceed_number(input, maxDigit)) {

From 7f4241b5f8a7b3f202c6408b7266f9a6341ebb08 Mon Sep 17 00:00:00 2001
From: Kevin <kevin@regentmarkets.com>
Date: Mon, 21 Dec 2020 13:54:58 +0800
Subject: [PATCH 2/2] fix:calculator-translation-validation-crowdin

---
 src/pages/trader-tools/_validation.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/trader-tools/_validation.js b/src/pages/trader-tools/_validation.js
index 4f45775e40c..265de4a7156 100644
--- a/src/pages/trader-tools/_validation.js
+++ b/src/pages/trader-tools/_validation.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { localize, Localize } from 'components/localization'
 
 const validation_regex = {
@@ -25,7 +26,6 @@ const validation_is_not_zero = (input) => {
 
 const numberValidation = (input, fieldName, maxDigit) => {
     if (!input) {
-        // eslint-disable-next-line react/react-in-jsx-scope
         return <Localize translate_text="{{fieldName}} is required" values={{ fieldName }} />
     } else if (!validation_regex.number.test(input)) {
         return localize('Should be a valid number')
@@ -40,7 +40,6 @@ const numberValidation = (input, fieldName, maxDigit) => {
 
 const numberWithNegativeValidation = (input, fieldName, maxDigit) => {
     if (!input) {
-        // eslint-disable-next-line react/react-in-jsx-scope
         return <Localize translate_text="{{fieldName}} is required" values={{ fieldName }} />
     } else if (!validation_regex.numberWithNegative.test(input)) {
         return localize('Should be a valid number')