fix errors in translations pandora_enterprise#13668

pandora_console/godmode/reporting/reporting_builder.item_editor.php

@@ -3823,7 +3823,7 @@ if (is_metaconsole() === true) {
             <td>
                 <span id="row_event_graph_by_agent">
                 <?php
-                echo __('By agent ');
+                echo __('By agent').' ';
                 html_print_checkbox_switch(
                     'event_graph_by_agent',
                     true,
@@ -3833,7 +3833,7 @@ if (is_metaconsole() === true) {
                 </span>
                 <span id="row_event_graph_by_user">
                 <?php
-                echo __('By user validator ');
+                echo __('By user validator').' ';
                 html_print_checkbox_switch(
                     'event_graph_by_user_validator',
                     true,
@@ -3843,7 +3843,7 @@ if (is_metaconsole() === true) {
                 </span>
                 <span id="row_event_graph_by_criticity">
                 <?php
-                echo __('By criticity ');
+                echo __('By criticity').' ';
                 html_print_checkbox_switch(
                     'event_graph_by_criticity',
                     true,
@@ -3853,7 +3853,7 @@ if (is_metaconsole() === true) {
                 </span>
                 <span id="row_event_graph_by_validated">
                 <?php
-                echo __('Validated vs unvalidated ');
+                echo __('Validated vs unvalidated').' ';
                 html_print_checkbox_switch(
                     'event_graph_validated_vs_unvalidated',
                     true,

pandora_console/godmode/reporting/reporting_builder.php

@@ -190,7 +190,7 @@ if ($schedule_report != '') {
 
     ui_print_result_message(
         $result,
-        __('Your report has been planned, and the system will email you a '.$report_type.' file with the report as soon as its finished'),
+        __('Your report has been planned, and the system will email you a %s file with the report as soon as its finished', $report_type),
         __('An error has ocurred')
     );
     echo '<br>';

pandora_console/godmode/setup/setup_general.php

@@ -50,7 +50,7 @@ if (is_ajax()) {
 }
 
 echo "<div id='dialog' title='".__('Enforce https Information')."' class='invisible'>";
-echo "<p class='center'>".__('If SSL is not properly configured you will lose access to ').get_product_name().__(' Console').'</p>';
+echo "<p class='center'>".__('If SSL is not properly configured you will lose access to').' '.get_product_name().' '.__('Console').'</p>';
 echo '</div>';
 
 $performance_variables_control = (array) json_decode(io_safe_output($config['performance_variables_control']));
@@ -112,7 +112,7 @@ html_print_div(
     [
         'id'      => 'force_public_url_dialog',
         'class'   => 'invisible',
-        'content' => __('If public URL is not properly configured you will lose access to ').get_product_name().__(' Console'),
+        'content' => __('If public URL is not properly configured you will lose access to').' '.get_product_name().' '.__('Console'),
     ]
 );
 

pandora_console/godmode/setup/setup_visuals.php

@@ -2202,7 +2202,7 @@ html_print_table($table_vc);
 echo '</fieldset>';
 
 echo '<fieldset class="margin-bottom-10">';
-echo '<legend>'.__('Reports configuration ').ui_print_help_icon('reports_configuration_tab', true).'</legend>';
+echo '<legend>'.__('Reports configuration').' '.ui_print_help_icon('reports_configuration_tab', true).'</legend>';
 html_print_table($table_report);
 echo '</fieldset>';
 

pandora_console/include/class/ConsoleSupervisor.php

@@ -3078,7 +3078,7 @@ class ConsoleSupervisor
                 $this->notify(
                     [
                         'type'              => 'NOTIF.HAMASTER.MESSAGE',
-                        'title'             => __('Desynchronized operation on the node '.$node['host']),
+                        'title'             => __('Desynchronized operation on the node %s', $node['host']),
                         'message'           => __($message),
                         'url'               => '__url__/index.php?sec=gservers&sec2=enterprise/godmode/servers/new_HA_cluster',
                         'icon_notification' => self::ICON_ERROR,

pandora_console/include/class/OrderInterpreter.class.php

@@ -398,7 +398,7 @@ class OrderInterpreter extends Wizard
             foreach ($this->pages_menu as $key => $value) {
                 if (preg_match(
                     '/.*'.io_safe_output($text).'.*/i',
-                    __('GO TO '.$value['name'])
+                    __('GO TO %s', $value['name'])
                 ) && $value['acl']
                 ) {
                     if ($iterator <= 9 && $this->canShowItem($enterprise, $this->pages_menu[$key]['url'])) {

pandora_console/include/functions_api.php

@@ -10337,7 +10337,7 @@ function api_set_module_data($id, $thrash2, $other, $trash1)
             if (false === @file_put_contents($config['remote_config'].'/'.io_safe_output($agent['nombre']).'.'.$idAgentModule.'.'.$time.'.data', $xml)) {
                 returnError(sprintf('XML file could not be generated in path: %s', $config['remote_config']));
             } else {
-                echo __('XML file was generated successfully in path: ').$config['remote_config'];
+                echo __('XML file was generated successfully in path: %s', $config['remote_config']);
                 returnData('string', ['type' => 'string', 'data' => $xml]);
                 return;
             }

pandora_console/include/functions_reporting.php

@@ -2283,7 +2283,7 @@ function reporting_event_report_group(
     }
 
     if (!empty($content['style']['event_filter_exclude'])) {
-        $return['subtitle'] .= ' ('.__('Exclude ').$content['style']['event_filter_exclude'].')';
+        $return['subtitle'] .= ' ('.__('Exclude %s', $content['style']['event_filter_exclude']).')';
     }
 
     $return['description'] = $content['description'];

pandora_console/include/lib/Dashboard/Widgets/groups_status_map.php

@@ -396,7 +396,7 @@ class GroupsStatusMapWidget extends Widget
                 'name'            => $row['estado'],
                 'value'           => $row['total_modules'],
                 'color'           => $color,
-                'tooltip_content' => $row['total_modules'].__(' Modules(%s)', $name_status),
+                'tooltip_content' => __('%s Modules(%s)', $row['total_modules'], $name_status),
                 'link'            => 'index.php?sec=view&sec2=operation/agentes/status_monitor&refr=0&ag_group='.$row['id_grupo'].'&ag_freestring=&module_option=1&ag_modulename=&moduletype=&datatype=&status='.$row['estado'].'&sort_field=&sort=none&pure=',
             ];
             $names[$row['id_grupo']] = $row['nombre'];

pandora_console/operation/reporting/reporting_viewer.php

@@ -90,7 +90,7 @@ if (empty($schedule_report) === false) {
 
     ui_print_result_message(
         $result,
-        __('Your report has been planned, and the system will email you a '.$report_type.' file with the report as soon as its finished'),
+        __('Your report has been planned, and the system will email you a %s file with the report as soon as its finished', $report_type),
         __('An error has ocurred')
     );
     echo '<br>';

pandora_console/operation/users/user_edit.php

@@ -238,7 +238,7 @@ if (isset($_GET['modified']) && !$view_mode) {
         $user_info = $upd_info;
     } else {
         if (!$error_msg) {
-            $error_msg = __('Error updating passwords: ').($config['auth_error'] ?? '');
+            $error_msg = __('Error updating passwords').': '.($config['auth_error'] ?? '');
         }
 
         $user_auth_error = $config['auth_error'];

pandora_console/update_manager_client/lib/UpdateManager/Client.php

@@ -2243,7 +2243,7 @@ class Client
             $pct = (90 / $total_updates);
             do {
                 $this->listUpdates();
-                $this->globalTask = __('Updating to '.$this->nextUpdate);
+                $this->globalTask = __('Updating to %s', $this->nextUpdate);
                 $rc = $this->updateNextVersion();
                 if ($rc === false) {
                     // Failed to upgrade to next version.

pandora_console/update_manager_client/views/online.php

@@ -150,7 +150,6 @@ global $config;
                             blast.setAttribute('disable', true);
                             result.innerHTML = '';
                             umConfirm({
-                                /*message: "<?php echo __('This action will upgrade this console to version '); ?> "+nextUpdateVersion+". <?php echo __('Are you sure?'); ?>",*/
                                 message: "<?php echo '<p>'.$text_for_next_version.'</p>'; ?> ",
                                 title: "<?php echo __('Update to'); ?> "+nextUpdateVersion,
                                 onAccept: function() {
@@ -174,11 +173,11 @@ global $config;
                                             if(e != '504') {
                                                 if (typeof r != "undefined" ) {
                                                     result.innerHTML = umErrorMsg(
-                                                        '<?php echo __('Failed to update to '); ?>' + nextUpdateVersion+' '+r
+                                                        '<?php echo __('Failed to update to'); ?>' + ' ' + nextUpdateVersion+' '+r
                                                     );
                                                 } else {
                                                     result.innerHTML = umErrorMsg(
-                                                        '<?php echo __('Failed to update to '); ?>' + nextUpdateVersion+' RC'+e
+                                                        '<?php echo __('Failed to update to'); ?>' + ' ' + nextUpdateVersion+' RC'+e
                                                     );
                                                 }
                                             } else {
@@ -197,7 +196,6 @@ global $config;
                             blast.setAttribute('disable', true);
                             result.innerHTML = '';
                             umConfirm({
-                                /*message: "<?php echo __('This action will upgrade this console to version '); ?> "+lastUpdateVersion+". <?php echo __('Are you sure?'); ?>",*/
                                 message: "<?php echo '<p>'.$text_for_last_version.'</p>'; ?> ",
                                 title: "<?php echo __('Update to'); ?> "+lastUpdateVersion,
                                 onAccept: function() {