Merge pull request boonebgorges#4 from mahype/master

Changed path to CSS; switched to load_plugin_textdomain()
mahype · Jan 24, 2012 · b0c502c · b0c502c
2 parents 63047e8 + 52def4c
commit b0c502c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bp-groupblog-cssjs.php b/bp-groupblog-cssjs.php
@@ -7,7 +7,7 @@ function bp_groupblog_add_admin_js() {
 	wp_enqueue_script( 'bp-groupblog-admin-js', WP_PLUGIN_URL . '/bp-groupblog/inc/js/admin.js' );
 	wp_enqueue_script('jquery-ui-core');
 	wp_enqueue_script('jquery-ui-tabs');
-	wp_enqueue_script('effects.core', WP_PLUGIN_URL .'/inc/js/effects.core.js', array('jquery-ui-core'));
+	wp_enqueue_script('effects.core', WP_PLUGIN_URL . '/bp-groupblog/inc/js/effects.core.js', array('jquery-ui-core') );
 }
 add_action( 'admin_enqueue_scripts', 'bp_groupblog_add_admin_js', 1 );
 

diff --git a/bp-groupblog.php b/bp-groupblog.php
@@ -72,7 +72,7 @@ function bp_groupblog_includes() {
  * Add language support.
  */
 if ( file_exists( WP_PLUGIN_DIR . '/bp-groupblog/languages/groupblog-' . get_locale() . '.mo' ) )
-	load_textdomain( 'groupblog', WP_PLUGIN_DIR . '/bp-groupblog/languages/groupblog-' . get_locale() . '.mo' );
+	load_plugin_textdomain( 'groupblog', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
 
 /**
  * bp_groupblog_setup_globals()