Merge branch 'master' of github.com:binary-com/binary-static into fix_mlt_and_uk_market

Author: mahdiyeh-deriv

.circleci/config.yml

@@ -85,44 +85,48 @@ commands:
           command: gh-pages -d dist --branch << parameters.target_branch >> --message '[skip ci]'
   docker_build_push:
     description: "Build Docker image"
+    parameters:
+      docker_latest_image_tag:
+        type: string
+        default: "latest-staging"
+      docker_image_tag:
+        type: string
+        default: ${CIRCLE_SHA1}
     steps:
       - setup_remote_docker
       - run: 
           name: Building docker image
           command: |
-            docker build -t ${DOCKHUB_ORGANISATION}/binary-static:${CIRCLE_TAG} -t ${DOCKHUB_ORGANISATION}/binary-static:production-latest .
+            docker build -t ${DOCKHUB_ORGANISATION}/binary-static:<< parameters.docker_image_tag >> -t ${DOCKHUB_ORGANISATION}/binary-static:<< parameters.docker_latest_image_tag >> .
       - run: 
           name: Pushing Image to docker hub
           command: |
             echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USERNAME --password-stdin
-            docker push ${DOCKHUB_ORGANISATION}/binary-static:${CIRCLE_TAG}
-            docker push ${DOCKHUB_ORGANISATION}/binary-static:production-latest
+            docker push ${DOCKHUB_ORGANISATION}/binary-static:<< parameters.docker_image_tag >>
+            docker push ${DOCKHUB_ORGANISATION}/binary-static:<< parameters.docker_latest_image_tag >>
   k8s_deploy:
     description: "Deploy to k8s cluster"
     parameters:
       k8s_svc_name:
         type: string
         default: "staging-binary-com"
+      k8s_namespace:
+        type: string
+        default: "www-binary-com-staging"
+      k8s_version:
+        type: string
+        default: ${CIRCLE_SHA1}
     steps:
       - k8s/install-kubectl
       - run: 
           name: Deploying to k8s cluster for service << parameters.k8s_svc_name >>
           command: |
-            for SERVER_ID in {1..5}
-            do
-              KUBE_SERVER_REF="KUBE_SERVER_$SERVER_ID"
-              SERVICEACCOUNT_TOKEN_REF="SERVICEACCOUNT_TOKEN_$SERVER_ID"
-              CA_CRT_REF="CA_CRT_$SERVER_ID"
-              if [ ! -z "${!KUBE_SERVER_REF}" ]
-              then
-                echo "Deploying to cluster $SERVER_ID"
-                CA_CRT="${!CA_CRT_REF}"
-                KUBE_SERVER="${!KUBE_SERVER_REF}"
-                SERVICEACCOUNT_TOKEN="${!SERVICEACCOUNT_TOKEN_REF}"
-                echo $CA_CRT | base64 --decode > ca.crt
-                kubectl --server=${KUBE_SERVER} --certificate-authority=ca.crt --token=$SERVICEACCOUNT_TOKEN set image deployment/<< parameters.k8s_svc_name >> << parameters.k8s_svc_name >>=${DOCKHUB_ORGANISATION}/binary-static:${CIRCLE_TAG}
-              fi
-            done
+            TAG=${CIRCLE_TAG:-$CIRCLE_SHA1}
+            export NAMESPACE=<< parameters.k8s_namespace >>
+            git clone https://github.com/binary-com/devops-ci-scripts
+            cd devops-ci-scripts/k8s-build_tools
+            echo $CA_CRT | base64 --decode > ca.crt
+            ./release.sh binary-static << parameters.k8s_version >>
   notify_slack:
     description: "Notify slack"
     steps:
@@ -139,7 +143,7 @@ jobs:
       - git_checkout_from_cache
       - npm_install
       - test
-  release_beta:
+  release_staging:
     docker:
       - image: circleci/node:9.8.0-stretch
     steps:
@@ -152,6 +156,8 @@ jobs:
           target: 'translations'
       - deploy:
           target_branch: "staging"
+      - docker_build_push
+      - k8s_deploy
       - notify_slack
   release_production:
     docker:
@@ -174,10 +180,14 @@ jobs:
       - test
       - build:
           target: 'production'
-      - docker_build_push
+      - docker_build_push:
+          docker_latest_image_tag: latest
+          docker_image_tag: ${CIRCLE_TAG}
       - k8s_deploy:
           k8s_svc_name: "production-binary-com"
-      
+          k8s_namespace: "www-binary-com-production"
+          k8s_version: ${CIRCLE_TAG}
+
 workflows:
   test:
     jobs:
@@ -187,7 +197,7 @@ workflows:
               ignore: /^master$/
   release:
     jobs:
-      - release_beta:
+      - release_staging:
           filters:
             branches:
               only: /^master$/

scripts/js_texts/extracted_strings_app.js

@@ -707,7 +707,7 @@ module.exports = [
     'Yes, I\'m sure',
     'You are categorised as a professional client.',
     'You are categorised as a retail client. Apply to be treated as a professional trader.',
-    'You are limited to one fiat account. You can change the currency of your fiat account anytime before you make a first-time [_1]',
+    'You are limited to one fiat account. You can change the currency of your fiat account anytime before you make a first-time [_1].',
     'You can [_1]set a new currency[_2] before you deposit for the first [_3].',
     'You can close this window without interrupting your trade.',
     'You can no longer change the currency because you\'ve created an MT5 account.',
@@ -793,6 +793,8 @@ module.exports = [
     'close',
     'day',
     'days',
+    'deposit',
+    'deposit or create an MT5 account',
     'details',
     'e.g. United States',
     'for account [_1]',
@@ -810,6 +812,8 @@ module.exports = [
     'space',
     'tick',
     'ticks',
+    'time',
+    'time or create an MT5 account',
     '{SPAIN ONLY}However, Binary Investments (Europe) Ltd has assessed your knowledge and experience and deems the product appropriate for you.',
     '{SPAIN ONLY}This is a product with leverage. You should be aware that losses may be higher than the amount initially paid to purchase the product.',
     '{SPAIN ONLY}You are about to purchase a product that is not simple and may be difficult to understand: Contracts for difference and forex. As a general rule, the CNMV considers that such products are not appropriate for retail clients, due to their complexity.',

src/javascript/_autogenerated/ach.js

@@ -94,7 +94,7 @@ const Cashier = (() => {
                                     || can_change;
         const account_action_text = has_upgrade ? `<br />${localize('[_1]Manage your accounts[_2]', [`<a href=${Url.urlFor('user/accounts')}>`, '</a>'])}` : '';
         const is_iom_client       = Client.get('residence') === 'im' || State.getResponse('website_status.clients_country') === 'im';
-        const change_text_for_iom = is_iom_client ? 'time' : 'time or create an MT5 account';
+        const change_text_for_iom = is_iom_client ? localize('time') : localize('time or create an MT5 account');
         const url_user_account    = `<a href=${Url.urlFor('user/accounts')}>`;
 
         const missingCriteria = (has_mt5, has_transaction) => {

src/javascript/_autogenerated/es.js

@@ -158,17 +158,18 @@ const SetCurrency = (() => {
             $clicked_currency.addClass('selected');
 
             if (should_show_confirmation) {
-                const currency         = $clicked_currency.attr('id');
-                const is_iom_client    = Client.get('residence') === 'im' || State.getResponse('website_status.clients_country') === 'im';
-                let localized_message  = '';
-                let localized_footnote = '';
+                const currency            = $clicked_currency.attr('id');
+                const is_iom_client       = Client.get('residence') === 'im' || State.getResponse('website_status.clients_country') === 'im';
+                const change_text_for_iom = is_iom_client ? localize('deposit') : localize('deposit or create an MT5 account');
+                let localized_message     = '';
+                let localized_footnote    = '';
 
                 if (Currency.isCryptocurrency(currency)) {
                     localized_message = localize('Are you sure you want to create your [_1] account now?', `<strong>${Currency.getCurrencyName(currency)} (${Currency.getCurrencyDisplayCode(currency)})</strong>`);
                     localized_footnote = `${localize('Note:')} ${localize('You may open one account for each supported cryptocurrency.')}`;
                 } else {
                     localized_message = localize('Are you sure you want to create a fiat account in [_1]?', `${currency}`);
-                    localized_footnote = `${localize('Note:')} ${localize('You are limited to one fiat account. You can change the currency of your fiat account anytime before you make a first-time [_1]', `${is_iom_client ? 'deposit.' : 'deposit or create an MT5 account.'}`)}`;
+                    localized_footnote = `${localize('Note:')} ${localize('You are limited to one fiat account. You can change the currency of your fiat account anytime before you make a first-time [_1].', change_text_for_iom)}`;
                 }
 
                 Dialog.confirm({

src/javascript/_autogenerated/id.js

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: binary-static\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2021-06-13 02:45\n"
+"PO-Revision-Date: 2021-06-15 06:35\n"
 "Last-Translator: \n"
 "Language-Team: Acholi\n"
 "MIME-Version: 1.0\n"
@@ -14464,8 +14464,8 @@ msgstr "crwdns42534:0crwdne42534:0"
 msgid "You are expecting the base currency to rise in value so you can sell it back for a profit."
 msgstr "crwdns42535:0crwdne42535:0"
 
-msgid "You are limited to one fiat account. You can change the currency of your fiat account anytime before you make a first-time %1"
-msgstr "crwdns163502:0%1crwdne163502:0"
+msgid "You are limited to one fiat account. You can change the currency of your fiat account anytime before you make a first-time %1."
+msgstr "crwdns163588:0%1crwdne163588:0"
 
 msgid "You are responsible for mitigating the risks and abuse that we face from fraud and money laundering. To accomplish this, you must monitor, analyse, and conduct various anti-fraud and AML checks on client accounts and deposits. You will join us in Malta and report to our Head of Payments."
 msgstr "crwdns52478:0crwdne52478:0"
@@ -15019,6 +15019,12 @@ msgstr "crwdns40789:0crwdne40789:0"
 msgid "days"
 msgstr "crwdns40790:0crwdne40790:0"
 
+msgid "deposit"
+msgstr "crwdns163590:0crwdne163590:0"
+
+msgid "deposit or create an MT5 account"
+msgstr "crwdns163592:0crwdne163592:0"
+
 msgid "details"
 msgstr "crwdns40791:0crwdne40791:0"
 
@@ -15130,6 +15136,12 @@ msgstr "crwdns40830:0crwdne40830:0"
 msgid "ticks"
 msgstr "crwdns40831:0crwdne40831:0"
 
+msgid "time"
+msgstr "crwdns163594:0crwdne163594:0"
+
+msgid "time or create an MT5 account"
+msgstr "crwdns163596:0crwdne163596:0"
+
 msgid "today"
 msgstr "crwdns40832:0crwdne40832:0"
 

src/javascript/_autogenerated/pt.js

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: binary-static\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2021-06-13 02:45\n"
+"PO-Revision-Date: 2021-06-15 06:35\n"
 "Last-Translator: \n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
@@ -6057,7 +6057,7 @@ msgid "If you have a payment reference (for example 122), you can enter it here.
 msgstr "Si tiene una referencia de pago (por ejemplo 122), puede ingresarla aquí."
 
 msgid "If you have an account with us, we'll send you a link to your email in a few minutes to reset your password."
-msgstr ""
+msgstr "Si tiene una cuenta con nosotros, le enviaremos un enlace a su correo electrónico en unos minutos para restablecer su contraseña."
 
 msgid "If you keep any positions open overnight, an interest adjustment will be made to your trading account as indication of the cost required to keep your position open."
 msgstr "Si mantiene cualquier posición abierta durante la noche, se realizará un ajuste de interés a su cuenta de operaciones como indicación del costo necesario para ello."
@@ -6916,7 +6916,7 @@ msgid "Less than $25,000"
 msgstr "Menos de $25.000"
 
 msgid "Let us introduce you to trading on Binary."
-msgstr ""
+msgstr "Permítanos presentarle el comercio en Binary."
 
 msgid "Let's calculate the spread for EUR/USD:"
 msgstr "Calculemos el spread del par EUR/USD:"
@@ -14212,7 +14212,7 @@ msgid "Where the negative balance is connected to or a result of functional limi
 msgstr "Cuando el saldo negativo está conectado a o es el resultado de limitaciones funcionales y / o mal funcionamiento de la plataforma de trading MT5"
 
 msgid "Where would you like to start?"
-msgstr ""
+msgstr "¿Por dónde le gustaría empezar?"
 
 msgid "Where you can go"
 msgstr "Donde puede viajar"
@@ -14466,7 +14466,7 @@ msgstr "Usted está esperando que el valor de la moneda base caiga para poder vo
 msgid "You are expecting the base currency to rise in value so you can sell it back for a profit."
 msgstr "Ustes está esperando que aumente el valor de la moneda base para poder venderla y obtener una ganancia."
 
-msgid "You are limited to one fiat account. You can change the currency of your fiat account anytime before you make a first-time %1"
+msgid "You are limited to one fiat account. You can change the currency of your fiat account anytime before you make a first-time %1."
 msgstr ""
 
 msgid "You are responsible for mitigating the risks and abuse that we face from fraud and money laundering. To accomplish this, you must monitor, analyse, and conduct various anti-fraud and AML checks on client accounts and deposits. You will join us in Malta and report to our Head of Payments."
@@ -15021,6 +15021,12 @@ msgstr "día"
 msgid "days"
 msgstr "días"
 
+msgid "deposit"
+msgstr ""
+
+msgid "deposit or create an MT5 account"
+msgstr ""
+
 msgid "details"
 msgstr "detalles"
 
@@ -15132,6 +15138,12 @@ msgstr "intervalo"
 msgid "ticks"
 msgstr "intervalos"
 
+msgid "time"
+msgstr ""
+
+msgid "time or create an MT5 account"
+msgstr ""
+
 msgid "today"
 msgstr "hoy"
 

src/javascript/_autogenerated/ru.js

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: binary-static\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2021-06-13 02:45\n"
+"PO-Revision-Date: 2021-06-15 06:35\n"
 "Last-Translator: \n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
@@ -437,7 +437,7 @@ msgid "%124/7 customer support%2 to enhance your trading experience"
 msgstr "%124/7 support client%2 pour améliorer votre expérience de trading"
 
 msgid "%1CFD%2"
-msgstr ""
+msgstr "%1CFD%2"
 
 msgid "%1Contact us%2 to arrange a date and time for the video call."
 msgstr "%1Contactez nous%2 pour arranger une date et une heure pour l’appel vidéo."
@@ -449,7 +449,7 @@ msgid "%1Deriv-Server%2 or %1Deriv-Server-02%2 if your signals is for real accou
 msgstr "%1Deriv-Server%2 ou %1Deriv-Server-02%2 si vos signaux sont pour des comptes réels uniquement."
 
 msgid "%1Digital Options%1"
-msgstr ""
+msgstr "%1Options Digitales%1"
 
 msgid "%1Founded%2 October 1999"
 msgstr "%1Fondé%2 en Octobre 1999"
@@ -14212,7 +14212,7 @@ msgid "Where the negative balance is connected to or a result of functional limi
 msgstr "Lorsque le solde négatif est lié à ou un résultat de limitations fonctionnelles et/ou un mauvais fonctionnement de la plateforme de trading MT5"
 
 msgid "Where would you like to start?"
-msgstr ""
+msgstr "Par où souhaitez-vous commencer?"
 
 msgid "Where you can go"
 msgstr "Les destinations qui s'offrent à vous"
@@ -14466,7 +14466,7 @@ msgstr "Vous vous attendez que la devise de base va baisser en valeur, ainsi vou
 msgid "You are expecting the base currency to rise in value so you can sell it back for a profit."
 msgstr "Vous vous attendez à ce que la devise de base augmente en valeur, afin que vous puissiez la revendre pour faire un profit."
 
-msgid "You are limited to one fiat account. You can change the currency of your fiat account anytime before you make a first-time %1"
+msgid "You are limited to one fiat account. You can change the currency of your fiat account anytime before you make a first-time %1."
 msgstr ""
 
 msgid "You are responsible for mitigating the risks and abuse that we face from fraud and money laundering. To accomplish this, you must monitor, analyse, and conduct various anti-fraud and AML checks on client accounts and deposits. You will join us in Malta and report to our Head of Payments."
@@ -15021,6 +15021,12 @@ msgstr "jour"
 msgid "days"
 msgstr "jours"
 
+msgid "deposit"
+msgstr ""
+
+msgid "deposit or create an MT5 account"
+msgstr ""
+
 msgid "details"
 msgstr "informations"
 
@@ -15132,6 +15138,12 @@ msgstr "tick"
 msgid "ticks"
 msgstr "ticks"
 
+msgid "time"
+msgstr ""
+
+msgid "time or create an MT5 account"
+msgstr ""
+
 msgid "today"
 msgstr "aujourd'hui"