Merge branch 'juanfra-master'

camptix.php

@@ -4,6 +4,9 @@
  * Plugin URI:  http://wordcamp.org
  * Description: Simple and flexible event ticketing for WordPress.
  * Version:     1.5.1
+ * Text Domain: camptix
+ * Domain Path: /languages/
+ *
  * Author:      Automattic
  * Author URI:  http://wordcamp.org
  * License:     GPLv2
@@ -77,7 +80,7 @@ function __construct() {
 		add_action( 'shutdown', array( $this, 'shutdown' ) );
 
 		// Load a text domain
-		load_plugin_textdomain( 'camptix', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
+		add_action( 'plugins_loaded', array( $this, 'load_textdomain' ) );
 	}
 
 	/**
@@ -184,6 +187,13 @@ function schedule_events() {
 			wp_schedule_event( time(), 'daily', 'tix_scheduled_daily' );
 	}
 
+	/**
+	 * Load Textdomain
+	 */
+	function load_textdomain() {
+		load_plugin_textdomain( 'camptix', false, plugin_basename( dirname( __FILE__ ) ) . '/languages/' );
+	}
+
 	/**
 	 * Filters cron_schedules
 	 */