From a5912526d24885d47db146fe7e46375acf9ec4c1 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Mon, 2 Jun 2014 15:57:36 +0000 Subject: [PATCH] 2014-06-02 Miguel de Dios * godmode/alerts/configure_alert_template.php, godmode/reporting/reporting_builder.item_editor.php, godmode/agentes/planned_downtime.editor.php, godmode/setup/news.php, include/ajax/module.php, include/functions.php, include/functions_ui.php, extensions/insert_data.php, operation/netflow/nf_live_view.php, operation/reporting/reporting_viewer.php, operation/reporting/graph_viewer.php, operation/tree.php, operation/agentes/datos_agente.php, operation/agentes/estado_monitores.php: fixed the i18n of the timepicker. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10076 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 14 ++++++++++++++ pandora_console/extensions/insert_data.php | 4 +--- .../godmode/agentes/planned_downtime.editor.php | 4 +--- .../godmode/alerts/configure_alert_template.php | 4 +--- .../reporting/reporting_builder.item_editor.php | 6 +----- pandora_console/godmode/setup/news.php | 4 +--- pandora_console/include/ajax/module.php | 5 ++--- pandora_console/include/functions.php | 12 ++++++------ pandora_console/include/functions_ui.php | 7 +++++++ pandora_console/operation/agentes/datos_agente.php | 4 +--- .../operation/agentes/estado_monitores.php | 4 +--- pandora_console/operation/netflow/nf_live_view.php | 2 +- .../operation/reporting/graph_viewer.php | 4 +--- .../operation/reporting/reporting_viewer.php | 4 +--- pandora_console/operation/tree.php | 4 +--- 15 files changed, 40 insertions(+), 42 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d336ba361e..88489a752a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,17 @@ +2014-06-02 Miguel de Dios + + * godmode/alerts/configure_alert_template.php, + godmode/reporting/reporting_builder.item_editor.php, + godmode/agentes/planned_downtime.editor.php, godmode/setup/news.php, + include/ajax/module.php, include/functions.php, + include/functions_ui.php, extensions/insert_data.php, + operation/netflow/nf_live_view.php, + operation/reporting/reporting_viewer.php, + operation/reporting/graph_viewer.php, operation/tree.php, + operation/agentes/datos_agente.php, + operation/agentes/estado_monitores.php: fixed the i18n of the + timepicker. + 2014-06-02 Miguel de Dios * godmode/reporting/visual_console_builder.editor.js: fixed the diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php index 943497e28d..e9efac18d3 100644 --- a/pandora_console/extensions/insert_data.php +++ b/pandora_console/extensions/insert_data.php @@ -180,9 +180,7 @@ function mainInsertData() { echo ""; ui_require_css_file ('datepicker'); - ui_require_jquery_file ("ui-timepicker-addon"); - // This script is included manually to be included after jquery and avoid error - echo ''; + ui_include_time_picker(); ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/"); ?> '; +ui_include_time_picker(); ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/"); ?> diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php index fc25393b5a..9317cbdedf 100644 --- a/pandora_console/godmode/alerts/configure_alert_template.php +++ b/pandora_console/godmode/alerts/configure_alert_template.php @@ -740,9 +740,7 @@ echo ''; enterprise_hook('close_meta_frame'); ui_require_javascript_file ('pandora_alerts'); -ui_require_jquery_file ("ui-timepicker-addon"); -// This script is included manually to be included after jquery and avoid error -echo ''; +ui_include_time_picker(); ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/"); ?> diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index af457600af..5a3439ed92 100644 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -1087,12 +1087,8 @@ else { echo ''; echo ''; -ui_require_jquery_file ("ui-timepicker-addon"); +ui_include_time_picker(); ui_require_javascript_file('pandora'); -// This script is included manually to be included after jquery and avoid error -if(file_exists('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language() . '.js')) { - echo ''; -} if ($enterpriseEnable) { reporting_enterprise_text_box(); diff --git a/pandora_console/godmode/setup/news.php b/pandora_console/godmode/setup/news.php index 51cbda63e8..fd980b9505 100644 --- a/pandora_console/godmode/setup/news.php +++ b/pandora_console/godmode/setup/news.php @@ -280,10 +280,8 @@ else { * We must add javascript here. Otherwise, the date picker won't * work if the date is not correct because php is returning. */ +ui_include_time_picker(); -ui_require_jquery_file ("ui-timepicker-addon"); -// This script is included manually to be included after jquery and avoid error -echo ''; ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/"); // Include tiny for wysiwyg editor diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index b83d2e9388..7e1b98934a 100644 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -60,9 +60,8 @@ $get_module_detail = get_parameter ('get_module_detail', 0); if ($get_module_detail) { - ui_require_jquery_file ("ui-timepicker-addon"); - // This script is included manually to be included after jquery and avoid error - echo ''; + ui_include_time_picker(); + ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/"); ui_require_jquery_file ("ui-timepicker-addon"); diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 2d77cafa8c..5733ccf919 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -339,15 +339,15 @@ function get_user_language ($id_user = null) { $language = get_parameter('language', 0); if (defined('METACONSOLE')) { - + if ($id_user == null) $id_user = $config['id_user']; - + if ($language !== 0) update_user($id_user, array('language' => $language)); - + } - + if ($language === 'default') { return $config['language']; } @@ -363,7 +363,7 @@ function get_user_language ($id_user = null) { if ($id_user !== null) { $userinfo = get_user_info ($id_user); - if ($userinfo['language'] != 'default'){ + if ($userinfo['language'] != 'default') { return $userinfo['language']; } } @@ -381,7 +381,7 @@ function set_user_language() { $l10n = NULL; $user_language = get_user_language (); - if (file_exists ('./include/languages/'.$user_language.'.mo')) { + if (file_exists ('./include/languages/' . $user_language . '.mo')) { $l10n = new gettext_reader (new CachedFileReader ('./include/languages/'.$user_language.'.mo')); $l10n->load_tables(); } diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index c009a38039..21b3dd8a91 100644 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -3444,4 +3444,11 @@ function ui_get_error ($error_code) { return array('title' => $title, 'message' => $message); } +function ui_include_time_picker() { + ui_require_jquery_file ("ui-timepicker-addon"); + + if (file_exists('include/javascript/i18n/jquery-ui-timepicker-' . substr(get_user_language(), 0, 2) . '.js')) { + echo ''; + } +} ?> diff --git a/pandora_console/operation/agentes/datos_agente.php b/pandora_console/operation/agentes/datos_agente.php index 0213fa7022..49ab0585a5 100755 --- a/pandora_console/operation/agentes/datos_agente.php +++ b/pandora_console/operation/agentes/datos_agente.php @@ -293,9 +293,7 @@ else { unset ($table); } -ui_require_jquery_file ("ui-timepicker-addon"); -// This script is included manually to be included after jquery and avoid error -echo ''; +ui_include_time_picker(); ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/"); ?> diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 311a208ce2..7700e4324e 100644 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -707,10 +707,8 @@ ui_require_css_file ('cluetip'); ui_require_jquery_file ('cluetip'); echo "
"; -ui_require_jquery_file ("ui-timepicker-addon"); -// This script is included manually to be included after jquery and avoid error -echo ''; +ui_include_time_picker(); ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/"); ?> diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php index 750c7c144f..0385409654 100644 --- a/pandora_console/operation/netflow/nf_live_view.php +++ b/pandora_console/operation/netflow/nf_live_view.php @@ -392,7 +392,7 @@ if ($draw != '') { enterprise_hook('close_meta_frame'); -ui_require_jquery_file ("ui-timepicker-addon"); +ui_include_time_picker(); ?> '; + ui_include_time_picker(); ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/"); ?> '; +ui_include_time_picker(); ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/"); ?> diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index 4a3e87f8a3..ab030e5c49 100644 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -651,9 +651,7 @@ treeview_printTree($activeTab); enterprise_hook('close_meta_frame'); -ui_require_jquery_file ("ui-timepicker-addon"); -// This script is included manually to be included after jquery and avoid error -echo ''; +ui_include_time_picker(); ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/"); ?>