Merge branch 'master' into mohammad/webpack

Author: Mohammad Reza Hamedanchi

scripts/bin/GenerateStaticData.pm

@@ -754,8 +754,7 @@ sub _texts {
         push @texts, localize('Revoke access');
         push @texts, localize('Keep track of your authorised applications.');
         push @texts, localize('Are you sure that you want to permanently revoke access to application');
-        push @texts, localize('Transaction performed by');
-        push @texts, localize('App ID');
+        push @texts, localize('Transaction performed by [_1] (App ID: [_2])');
 
         # Strings for lostpasswordws
         push @texts, localize('Please check your email to retrieve the token needed to reset your password.');
@@ -786,18 +785,6 @@ sub _texts {
         push @texts, localize('details');
         push @texts, localize('Deposit [_1] [_2] virtual money into your account [_3]');
 
-        # strings for user/metatrader page
-        push @texts, localize('Login');
-        push @texts, localize('To create a real account for MetaTrader, switch to your [_1] real money account.');
-        push @texts, localize('To create a real account for MetaTrader, <a href="[_1]">upgrade to [_2] real money account</a>.');
-        push @texts, localize('Your new account has been created.');
-        push @texts, localize('Deposit is done. Transaction ID:');
-        push @texts, localize('Withdrawal is done. Transaction ID:');
-        push @texts, localize('Start trading with your Demo Account');
-        push @texts, localize('Start trading with your Real Account');
-        push @texts, localize('Download MetaTrader');
-        push @texts, localize('Congratulations! Your account has been created.');
-
         my %as_hash = @texts;
         $js .= "texts_json['" . $language . "'] = " . JSON::to_json(\%as_hash) . ";\n";
     }

scripts/config/pages.pl

@@ -74,7 +74,6 @@ sub all_pages {
         ['resources/market_timesws', 'resources/market_timesws',  'default', 'Trading Times'],
 
         ['user/security/api_tokenws',       'user/security/api_tokenws',                      'default', 'API Token',               'ja'],
-        ['user/metatrader',                 'user/metatrader',                                'default', 'MetaTrader'],
         ['user/security/change_passwordws', 'user/security/change_passwordws',                'default', 'Change Password'],
         ['user/portfoliows',                'user/portfoliows',                               'default', 'Portfolio'],
         ['user/profit_tablews',             'user/profit_tablews',                            'default', 'Profit Table'],
@@ -93,9 +92,6 @@ sub all_pages {
         ['user/reality_check_frequencyws',  'user/reality_check_frequencyws',                 'default', 'Reality Check'],
         ['user/reality_check_summaryws',    'user/reality_check_summaryws',                   'default', 'Reality Check'],
 
-        ['metatrader',          'metatrader/index',    'default', 'Trading with MetaTrader 5'],
-        ['metatrader/download', 'metatrader/download', 'default', 'Start Trading with MetaTrader 5'],
-
         ['logged_inws',           'global/logged_inws',  undef],
         ['trade/bet_explanation', 'bet/explanation',     undef],
     );

scripts/sitemap.pl

@@ -48,9 +48,6 @@
     ['get-started/otc-indices-stocks'          , 'monthly', '0.80'],
     ['get-started/beginners-faq'               , 'monthly', '0.80'],
     ['get-started/glossary'                    , 'monthly', '0.80'],
-
-    ['metatrader',          'monthly', '0.80'],
-    ['metatrader/download', 'monthly', '0.80'],
 );
 
 

src/images/pages/metatrader/mt5-imac.svg

@@ -17,7 +17,7 @@ var addTooltip = function(oauth_apps) {
 var add_app_id_name = function(app_id, app_name) {
     var ref_string;
     if (app_id) {
-        ref_string = text.localize('Transaction performed by') + ' ' + (app_name ? app_name : '') + ' (' + text.localize('App ID') + ': ' + app_id + ')';
+        ref_string = template(text.localize('Transaction performed by [_1] (App ID: [_2])'), [(app_name ? app_name : ''), app_id]);
     }
     return ref_string;
 };