diff --git a/readme.txt b/readme.txt index 146cd6a..50aa669 100644 --- a/readme.txt +++ b/readme.txt @@ -5,7 +5,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i Tags: maps, gpx, gps, graph, chart, google maps, track, garmin, image, nextgen-gallery, nextgen, exif, OpenStreetMap, OpenCycleMap, Hike&Bike, heart rate, heartrate, cadence Requires at least: 2.0.0 Tested up to: 3.5 -Stable tag: 1.1.41 +Stable tag: 1.1.42 Draws a gpx track with altitude graph. You can also display your nextgen gallery images in the map. @@ -180,6 +180,8 @@ Yes! 1. Altitude & Speed & Hearth rate == Changelog == += 1.1.42 = +* qTranslate compatible = 1.1.41 = * Added Polish translation, thanks to Sebastian * Fix: Spanish translation diff --git a/wp-gpx-maps.php b/wp-gpx-maps.php index 7aaf4af..76c92ef 100644 --- a/wp-gpx-maps.php +++ b/wp-gpx-maps.php @@ -3,24 +3,29 @@ Plugin Name: WP-GPX-Maps Plugin URI: http://www.darwinner.it/ Description: Draws a gpx track with altitude graph -Version: 1.1.41 +Version: 1.1.42 Author: Bastianon Massimo Author URI: http://www.pedemontanadelgrappa.it/ */ //error_reporting (E_ALL); -load_plugin_textdomain('wp-gpx-maps', "/wp-content/plugins/wp-gpx-maps/languages/"); - include 'wp-gpx-maps_utils.php'; include 'wp-gpx-maps_admin.php'; -add_action( 'wp_print_scripts', 'print_WP_GPX_Maps_scripts' ); add_shortcode('sgpx','handle_WP_GPX_Maps_Shortcodes'); register_activation_hook(__FILE__,'WP_GPX_Maps_install'); -register_deactivation_hook( __FILE__, 'WP_GPX_Maps_remove'); +register_deactivation_hook( __FILE__, 'WP_GPX_Maps_remove'); add_filter('plugin_action_links', 'WP_GPX_Maps_action_links', 10, 2); +add_action( 'wp_print_scripts', 'print_WP_GPX_Maps_scripts' ); add_action('wp_enqueue_scripts', 'enqueue_WP_GPX_Maps_scripts'); +add_action('plugins_loaded' ,'WP_GPX_Maps_lang_init'); + +function WP_GPX_Maps_lang_init() { + if (function_exists('load_plugin_textdomain')) { + load_plugin_textdomain('wp-gpx-maps', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' ); + } +} function WP_GPX_Maps_action_links($links, $file) { static $this_plugin; @@ -44,19 +49,19 @@ function enqueue_WP_GPX_Maps_scripts() { wp_enqueue_script( 'jquery' ); - + wp_deregister_script( 'googlemaps' ); wp_register_script( 'googlemaps', 'https://maps.googleapis.com/maps/api/js?sensor=false&v=3.9', null, null); wp_enqueue_script( 'googlemaps' ); wp_deregister_script( 'highcharts' ); wp_register_script( 'highcharts', "http://code.highcharts.com/highcharts.js", array('jquery'), "2.3.3", true); - wp_enqueue_script( 'highcharts' ); - + wp_enqueue_script( 'highcharts' ); + wp_deregister_script( 'WP-GPX-Maps' ); wp_register_script( 'WP-GPX-Maps', plugins_url('/WP-GPX-Maps.js', __FILE__), array('jquery','googlemaps','highcharts'), "1.1.41"); wp_enqueue_script( 'WP-GPX-Maps' ); - + } function print_WP_GPX_Maps_scripts()