diff --git a/README.md b/README.md index 4049c50..5ca1087 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,9 @@ This plugin allows beer creators from home brewers to professional breweries to ## Latest Release ## -### [Version 3.2.1 - Quick Bug Fix](https://github.com/ErinMorelli/em-beer-manager/releases/download/v3.2.1/em-beer-manager.3.2.1.zip) ### -* [FIXED] Issue introduced in version 3.2.0 that broke plugin localization +### [Version 3.2.2 - Bug Fixes](https://github.com/ErinMorelli/em-beer-manager/releases/download/v3.2.2/em-beer-manager.3.2.2.zip) ### +* [FIXED] Updated plugin to work with new WordPress.org translation system +* [FIXED] Issue with Untappd import hanging, or showing incorrect error ### Installation ### diff --git a/README.txt b/README.txt index 939db80..4d1bf1b 100644 --- a/README.txt +++ b/README.txt @@ -1,10 +1,10 @@ === EM Beer Manager === Contributors: ErinMorelli Donate link: http://www.erinmorelli.com/projects/em-beer-manager/ -Tags: beer, beers, brewery, untappd, untappd for business +Tags: beer, beers, brew, homebrew, brewery, untappd, untappd for business Requires at least: 3.0.1 Tested up to: 4.8.2 -Stable tag: 3.2.1 +Stable tag: 3.2.2 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -339,6 +339,10 @@ Try refreshing your permalinks by going to "Settings" -> "Permalinks" and clicki == Changelog == += 3.2.2 = +* [FIXED] Updated plugin to work with new WordPress.org translation system +* [FIXED] Issue with Untappd import hanging, or showing incorrect error + = 3.2.1 = * [FIXED] Issue introduced in version 3.2.0 that broke plugin localization @@ -495,6 +499,9 @@ Try refreshing your permalinks by going to "Settings" -> "Permalinks" and clicki == Upgrade Notice == += 3.2.2 = +Please back-up your database before upgrading! Fixed issue with Untappd importing + = 3.2.1 = Please back-up your database before upgrading! Fixed issue that broke plugin localization diff --git a/em-beer-manager.php b/em-beer-manager.php index 9eeb59c..f0d599f 100644 --- a/em-beer-manager.php +++ b/em-beer-manager.php @@ -3,12 +3,12 @@ * Plugin Name: EM Beer Manager * Plugin URI: https://www.erinmorelli.com/projects/em-beer-manager * Description: Manage and display your beers with WordPress. Integrates simply with Untappd and Untappd for Business. Great for everyone from home brewers to professional breweries! - * Version: 3.2.1 + * Version: 3.2.2 * Author: Erin Morelli * Author URI: https://www.erinmorelli.com/ * License: GPLv2 or later * License URI: http://www.gnu.org/licenses/gpl-2.0.html - * Text Domain: embm + * Text Domain: em-beer-manager * Domain Path: /languages */ @@ -91,7 +91,7 @@ function EMBM_Plugin_load() } // Set current version - $embm_curr_version = '3.2.1'; + $embm_curr_version = '3.2.2'; // Define version key name if (!defined('EMBM_VERSION_KEY')) { @@ -135,7 +135,7 @@ function EMBM_Plugin_load() } // Plugin localization - load_plugin_textdomain('embm', false, plugin_basename(dirname(__FILE__)).'/languages'); + load_plugin_textdomain('em-beer-manager', false, plugin_basename(dirname(__FILE__)).'/languages'); } // Initial plugin load @@ -321,7 +321,7 @@ function EMBM_Plugin_links($links) // Define settings link HTML $settings_link = ''; - $settings_link .= __('Settings', 'embm') . ''; + $settings_link .= __('Settings', 'em-beer-manager') . ''; // Add to to existing links array return array_merge(array($settings_link), $links); @@ -380,8 +380,8 @@ function EMBM_Plugin_php() { echo '
'; printf( - __('%s only supports PHP version %s or higher. Please upgrade your PHP to use this plugin.', 'embm'), - sprintf('%s', __('EM Beer Manager', 'embm')), + __('%s only supports PHP version %s or higher. Please upgrade your PHP to use this plugin.', 'em-beer-manager'), + sprintf('%s', __('EM Beer Manager', 'em-beer-manager')), '5.3' ); echo '
'. - __('Checking the "Disable site-wide integration" option under the EM Beer Manager "Untappd settings", will completely disable all Untappd functionality, including the Recent Check-ins widget, ratings, check-ins, check-in buttons, and any Untappd-related Labs features.', 'embm'). + __('Checking the "Disable site-wide integration" option under the EM Beer Manager "Untappd settings", will completely disable all Untappd functionality, including the Recent Check-ins widget, ratings, check-ins, check-in buttons, and any Untappd-related Labs features.', 'em-beer-manager'). '
'. - __('You can disable the Untappd check-in button for an individual beer by simply leaving the "Beer ID" setting empty. Beers that have an active check-in button will display a square Untappd icon next to their entry on the Beers admin page.', 'embm'). + __('You can disable the Untappd check-in button for an individual beer by simply leaving the "Beer ID" setting empty. Beers that have an active check-in button will display a square Untappd icon next to their entry on the Beers admin page.', 'em-beer-manager'). '
'. - __('You can display Untappd beer ratings and recent check-ins if you are logged in to Untappd. Ratings are shown in all beer views, including shortcodes. Check-ins are only displayed on single beer pages. This option can be disabled for specific beers. You can specify how many check-ins to show.', 'embm'). + __('You can display Untappd beer ratings and recent check-ins if you are logged in to Untappd. Ratings are shown in all beer views, including shortcodes. Check-ins are only displayed on single beer pages. This option can be disabled for specific beers. You can specify how many check-ins to show.', 'em-beer-manager'). '
'. - __('Data from Untappd for ratings and check-ins is refreshed automatically, or can be refreshed manually. We do not recommend doing this often as Untappd places a limit on how many API calls can be made per hour.', 'embm'). + __('Data from Untappd for ratings and check-ins is refreshed automatically, or can be refreshed manually. We do not recommend doing this often as Untappd places a limit on how many API calls can be made per hour.', 'em-beer-manager'). '' ), 'untappd_id' => array( 'id' => 'embm-untappd-beer-id', - 'title' => __('Untappd Beer ID', 'embm'), + 'title' => __('Untappd Beer ID', 'em-beer-manager'), 'content' => ''. - __('Find your Untappd Beer ID by visiting your beer\'s official page. The URL will be formatted like this', 'embm'). + __('Find your Untappd Beer ID by visiting your beer\'s official page. The URL will be formatted like this', 'em-beer-manager'). ':
https://untappd.com/b/the-alchemist-heady-topper/4691
'. - __('The string of numbers at the end of the URL is your beer\'s ID.', 'embm'). + __('The string of numbers at the end of the URL is your beer\'s ID.', 'em-beer-manager'). '
' ), 'untappd_limit' => array ( 'id' => 'embm-untappd-api-ratelimit', - 'title' => __('API Rate-Limit', 'embm'), + 'title' => __('API Rate-Limit', 'em-beer-manager'), 'content' => ''. sprintf( - __('From the %s', 'embm').':', + __('From the %s', 'em-beer-manager').':', sprintf( '%s', - __('Untappd API documentation', 'embm') + __('Untappd API documentation', 'em-beer-manager') ) ).'
"'. - __('All API applications are rate-limited to protect against abuse and keep the platform healthy. The default limit for API access is 100 calls per hour per key.', 'embm').'"
'. - __('If you see this message, it means your authenticated API session has reached this limit and any actions that require an API call will be limited until your access is reset in the next hour.', 'embm').'
'. - __('In most cases you should still be able to use all of the Untappd features with cached data, but rare cases may display a rate-limit warning messages when no cached data is available.', 'embm'). + __('All API applications are rate-limited to protect against abuse and keep the platform healthy. The default limit for API access is 100 calls per hour per key.', 'em-beer-manager').'"
'. + __('If you see this message, it means your authenticated API session has reached this limit and any actions that require an API call will be limited until your access is reset in the next hour.', 'em-beer-manager').'
'. + __('In most cases you should still be able to use all of the Untappd features with cached data, but rare cases may display a rate-limit warning messages when no cached data is available.', 'em-beer-manager'). '
' ), - 'sidebar' => '' . __('For more information', 'embm') . ':
' . - '' . __('Plugin Website', 'embm') . '
' . - '' . __('Support Forums', 'embm') . '
' + 'sidebar' => '' . __('For more information', 'em-beer-manager') . ':
' . + '' . __('Plugin Website', 'em-beer-manager') . '
' . + '' . __('Support Forums', 'em-beer-manager') . '
' ); } diff --git a/includes/admin/embm-admin-footer.php b/includes/admin/embm-admin-footer.php index b75d4b9..9a4f8e8 100644 --- a/includes/admin/embm-admin-footer.php +++ b/includes/admin/embm-admin-footer.php @@ -30,14 +30,14 @@ @@ -87,14 +87,14 @@ class="embm-settings-footer--donate-button" -Untappd LLC.'); ?>
+Untappd LLC.'); ?>
simple icon' ); ?>.
diff --git a/includes/admin/embm-admin-notices.php b/includes/admin/embm-admin-notices.php index 3e142e8..32520f2 100644 --- a/includes/admin/embm-admin-notices.php +++ b/includes/admin/embm-admin-notices.php @@ -19,9 +19,9 @@ * @package EMBM\Admin\Notices */ -$SUCCESS_TITLE = __('Success!', 'embm'); -$ERROR_TITLE = __('ERROR', 'embm') . ':'; -$WARNING_TITLE = __('WARNING', 'embm') . ':'; +$SUCCESS_TITLE = __('Success!', 'em-beer-manager'); +$ERROR_TITLE = __('ERROR', 'em-beer-manager') . ':'; +$WARNING_TITLE = __('WARNING', 'em-beer-manager') . ':'; // Map of notices $GLOBALS['EMBM_NOTICE_MAP'] = array( @@ -29,142 +29,142 @@ '1' => array( 'type' => 'updated', 'title' => $SUCCESS_TITLE, - 'message' => __('Your beer styles have been restored.', 'embm') + 'message' => __('Your beer styles have been restored.', 'em-beer-manager') ) ), 'import-success' => array( '1' => array( 'type' => 'updated', 'title' => $SUCCESS_TITLE, - 'message' => __('Your beer has been imported from Untappd.', 'embm') + 'message' => __('Your beer has been imported from Untappd.', 'em-beer-manager') ), '2' => array( 'type' => 'updated', 'title' => $SUCCESS_TITLE, - 'message' => __('Your beers have been imported from Untappd.', 'embm') + 'message' => __('Your beers have been imported from Untappd.', 'em-beer-manager') ) ), 'import-error' => array( '1' => array( 'type' => 'error', 'title' => $ERROR_TITLE, - 'message' => __('There was a problem! You may have reached your API token\'s rate limit for the hour. Please try again later.', 'embm') + 'message' => __('There was a problem! You may have reached your API token\'s rate limit for the hour. Please try again later.', 'em-beer-manager') ), '2' => array( 'type' => 'error', 'title' => $ERROR_TITLE, - 'message' => __('There was a problem during the import! The beer you specified was not found on Untappd.', 'embm') + 'message' => __('There was a problem during the import! The beer you specified was not found on Untappd.', 'em-beer-manager') ), '3' => array( 'type' => 'error', 'title' => $ERROR_TITLE, - 'message' => __('This beer does not belong to your brewery! You can only import beers that are owned by your Untappd brewery account.', 'embm') + 'message' => __('This beer does not belong to your brewery! You can only import beers that are owned by your Untappd brewery account.', 'em-beer-manager') ), '4' => array( 'type' => 'error', 'title' => $ERROR_TITLE, - 'message' => __('There was a problem during the import! Please try again later.', 'embm') + 'message' => __('There was a problem during the import! Please try again later.', 'em-beer-manager') ), '5' => array( 'type' => 'warning', 'title' => $WARNING_TITLE, - 'message' => __('There was a problem during the import! One or more beers was not imported. Please try again later.', 'embm') + 'message' => __('There was a problem during the import! One or more beers was not imported. Please try again later.', 'em-beer-manager') ) ), 'sync-success' => array( '1' => array( 'type' => 'updated', 'title' => $SUCCESS_TITLE, - 'message' => __('Your beers have been updated from Untappd.', 'embm') + 'message' => __('Your beers have been updated from Untappd.', 'em-beer-manager') ), '2' => array( 'type' => 'updated', 'title' => $SUCCESS_TITLE, - 'message' => __('Your beer has been updated from Untappd.', 'embm') + 'message' => __('Your beer has been updated from Untappd.', 'em-beer-manager') ) ), 'sync-error' => array( '1' => array( 'type' => 'error', 'title' => $ERROR_TITLE, - 'message' => __('There was a problem during the sync! Please try again later.', 'embm') + 'message' => __('There was a problem during the sync! Please try again later.', 'em-beer-manager') ), '2' => array( 'type' => 'warning', 'title' => $WARNING_TITLE, - 'message' => __('There was a problem during the sync! One or more beers were not updated. Please try again later.', 'embm') + 'message' => __('There was a problem during the sync! One or more beers were not updated. Please try again later.', 'em-beer-manager') ), '3' => array( 'type' => 'error', 'title' => $ERROR_TITLE, - 'message' => __('There was a problem during the sync! The selected beer does not have an Untappd ID.', 'embm') + 'message' => __('There was a problem during the sync! The selected beer does not have an Untappd ID.', 'em-beer-manager') ), ), 'save-error' => array( '1' => array( 'type' => 'error', 'title' => $ERROR_TITLE, - 'message' => __('There was a problem saving your beer\'s Untappd data!', 'embm').' '. - __('You may have reached your API token\'s rate limit for the hour. Please try again later.', 'embm') + 'message' => __('There was a problem saving your beer\'s Untappd data!', 'em-beer-manager').' '. + __('You may have reached your API token\'s rate limit for the hour. Please try again later.', 'em-beer-manager') ), '2' => array( 'type' => 'error', 'title' => $ERROR_TITLE, - 'message' => __('There was a problem saving your menu\'s Untappd for Business data!', 'embm').' '. - __('You may have reached your API token\'s rate limit for the hour. Please try again later.', 'embm') + 'message' => __('There was a problem saving your menu\'s Untappd for Business data!', 'em-beer-manager').' '. + __('You may have reached your API token\'s rate limit for the hour. Please try again later.', 'em-beer-manager') ) ), 'widget-error' => array( '1' => array( 'type' => 'error', 'title' => $ERROR_TITLE, - 'message' => __('There was a problem retrieving check-in data from Untappd!', 'embm').' '. - __('Please try again later.', 'embm') + 'message' => __('There was a problem retrieving check-in data from Untappd!', 'em-beer-manager').' '. + __('Please try again later.', 'em-beer-manager') ), '2' => array( 'type' => 'error', 'title' => $ERROR_TITLE, - 'message' => __('There was a problem refreshing check-in data from Untappd!', 'embm').' '. - __('Please try again later.', 'embm') + 'message' => __('There was a problem refreshing check-in data from Untappd!', 'em-beer-manager').' '. + __('Please try again later.', 'em-beer-manager') ) ), 'utfb-error' => array( '1' => array( 'type' => 'error', 'title' => $ERROR_TITLE, - 'message' => __('There was a problem connecting your Untappd for Business account! Please try again later.', 'embm') + 'message' => __('There was a problem connecting your Untappd for Business account! Please try again later.', 'em-beer-manager') ), '2' => array( 'type' => 'error', 'title' => $ERROR_TITLE, - 'message' => __('There was a problem during the import! Please try again later.', 'embm') + 'message' => __('There was a problem during the import! Please try again later.', 'em-beer-manager') ), '3' => array( 'type' => 'warning', 'title' => $WARNING_TITLE, - 'message' => __('There was a problem during the import! One or more beers were not imported. Please try again later.', 'embm') + 'message' => __('There was a problem during the import! One or more beers were not imported. Please try again later.', 'em-beer-manager') ), '4' => array( 'type' => 'warning', 'title' => $WARNING_TITLE, - 'message' => __('There was a problem during the sync! One or more beers were not updated. Please try again later.', 'embm') + 'message' => __('There was a problem during the sync! One or more beers were not updated. Please try again later.', 'em-beer-manager') ) ), 'utfb-success' => array( '1' => array( 'type' => 'updated', 'title' => $SUCCESS_TITLE, - 'message' => __('Your Untappd for Business account has been connected.', 'embm') + 'message' => __('Your Untappd for Business account has been connected.', 'em-beer-manager') ), '2' => array( 'type' => 'updated', 'title' => $SUCCESS_TITLE, - 'message' => __('Your beers have been imported from your Untappd for Business account.', 'embm') + 'message' => __('Your beers have been imported from your Untappd for Business account.', 'em-beer-manager') ), '3' => array( 'type' => 'updated', 'title' => $SUCCESS_TITLE, - 'message' => __('Your beers have been synced with your Untappd for Business menus.', 'embm') + 'message' => __('Your beers have been synced with your Untappd for Business menus.', 'em-beer-manager') ) ) ); @@ -220,7 +220,7 @@ function EMBM_Admin_Notices_ratelimit($msg = null) { // Set fallback message if (is_null($msg)) { - $msg = __('There was a problem! You may have reached your API token\'s rate limit for the hour. Please try again later.', 'embm'); + $msg = __('There was a problem! You may have reached your API token\'s rate limit for the hour. Please try again later.', 'em-beer-manager'); } // Display notice diff --git a/includes/admin/embm-admin-settings.php b/includes/admin/embm-admin-settings.php index 83ce5e8..f7cfe00 100644 --- a/includes/admin/embm-admin-settings.php +++ b/includes/admin/embm-admin-settings.php @@ -38,8 +38,8 @@ function EMBM_Admin_menu() // Setup admin page $embm_admin_page = add_options_page( - __('EM Beer Manager Settings', 'embm'), - __('EM Beer Manager', 'embm'), + __('EM Beer Manager Settings', 'em-beer-manager'), + __('EM Beer Manager', 'em-beer-manager'), 'manage_options', 'embm-settings', 'EMBM_Admin_Settings_page' @@ -66,64 +66,64 @@ function EMBM_Admin_settings() $logged_in = !is_null(EMBM_Admin_Authorize_token()); // Untappd Settings - add_settings_section('embm_untappd_settings', __('Untappd Settings', 'embm'), 'EMBM_Admin_Settings_untappd', 'embm'); - add_settings_field('embm_untappd_integration', __('Site-wide Integration', 'embm'), 'EMBM_Admin_Settings_Untappd_integration', 'embm', 'embm_untappd_settings'); - add_settings_field('embm_untappd_icons', __('Icon Set', 'embm'), 'EMBM_Admin_Settings_Untappd_icons', 'embm', 'embm_untappd_settings'); + add_settings_section('embm_untappd_settings', __('Untappd Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_untappd', 'em-beer-manager'); + add_settings_field('embm_untappd_integration', __('Site-wide Integration', 'em-beer-manager'), 'EMBM_Admin_Settings_Untappd_integration', 'em-beer-manager', 'embm_untappd_settings'); + add_settings_field('embm_untappd_icons', __('Icon Set', 'em-beer-manager'), 'EMBM_Admin_Settings_Untappd_icons', 'em-beer-manager', 'embm_untappd_settings'); if ($logged_in) { - add_settings_field('embm_untappd_rating_format', __('Rating Display Format', 'embm'), 'EMBM_Admin_Settings_Untappd_rating', 'embm', 'embm_untappd_settings'); - add_settings_field('embm_untappd_rating_color', __('Rating Star Color', 'embm'), 'EMBM_Admin_Settings_Untappd_Rating_color', 'embm', 'embm_untappd_settings'); - add_settings_field('embm_untappd_rating_opacity', __('Rating Star Empty Opacity', 'embm'), 'EMBM_Admin_Settings_Untappd_Rating_opacity', 'embm', 'embm_untappd_settings'); + add_settings_field('embm_untappd_rating_format', __('Rating Display Format', 'em-beer-manager'), 'EMBM_Admin_Settings_Untappd_rating', 'em-beer-manager', 'embm_untappd_settings'); + add_settings_field('embm_untappd_rating_color', __('Rating Star Color', 'em-beer-manager'), 'EMBM_Admin_Settings_Untappd_Rating_color', 'em-beer-manager', 'embm_untappd_settings'); + add_settings_field('embm_untappd_rating_opacity', __('Rating Star Empty Opacity', 'em-beer-manager'), 'EMBM_Admin_Settings_Untappd_Rating_opacity', 'em-beer-manager', 'embm_untappd_settings'); } else { - add_settings_field('embm_untappd_logged_out', '', 'EMBM_Admin_Settings_Untappd_login', 'embm', 'embm_untappd_settings'); + add_settings_field('embm_untappd_logged_out', '', 'EMBM_Admin_Settings_Untappd_login', 'em-beer-manager', 'embm_untappd_settings'); } // Global settings - add_settings_section('embm_global_settings', __('Global Settings', 'embm'), 'EMBM_Admin_Settings_section', 'embm'); - add_settings_field('embm_css_url', __('Custom Stylesheet (URL)', 'embm'), 'EMBM_Admin_Settings_Global_css', 'embm', 'embm_global_settings', array('label_for' => 'embm_css_url')); - add_settings_field('embm_display_settings', __('Display Settings', 'embm'), 'EMBM_Admin_Settings_Global_display', 'embm', 'embm_global_settings'); + add_settings_section('embm_global_settings', __('Global Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_section', 'em-beer-manager'); + add_settings_field('embm_css_url', __('Custom Stylesheet (URL)', 'em-beer-manager'), 'EMBM_Admin_Settings_Global_css', 'em-beer-manager', 'embm_global_settings', array('label_for' => 'embm_css_url')); + add_settings_field('embm_display_settings', __('Display Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_Global_display', 'em-beer-manager', 'embm_global_settings'); if ($logged_in) { - add_settings_field('embm_untappd_settings', __('Untappd Settings', 'embm'), 'EMBM_Admin_Settings_Global_untappd', 'embm', 'embm_global_settings'); + add_settings_field('embm_untappd_settings', __('Untappd Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_Global_untappd', 'em-beer-manager', 'embm_global_settings'); } else { - add_settings_field('embm_untappd_settings', __('Untappd Settings', 'embm'), 'EMBM_Admin_Settings_Untappd_login', 'embm', 'embm_global_settings'); + add_settings_field('embm_untappd_settings', __('Untappd Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_Untappd_login', 'em-beer-manager', 'embm_global_settings'); } // Group Tax Settings - add_settings_section('embm_group_settings', __('Beer Group Settings', 'embm'), 'EMBM_Admin_Settings_section', 'embm'); - add_settings_field('embm_group_slug', __('Custom Taxonomy Slug', 'embm'), 'EMBM_Admin_Settings_Group_slug', 'embm', 'embm_group_settings', array('label_for' => 'embm_group_slug')); - add_settings_field('embm_group_display_settings', __('Display Settings', 'embm'), 'EMBM_Admin_Settings_Group_display', 'embm', 'embm_group_settings'); + add_settings_section('embm_group_settings', __('Beer Group Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_section', 'em-beer-manager'); + add_settings_field('embm_group_slug', __('Custom Taxonomy Slug', 'em-beer-manager'), 'EMBM_Admin_Settings_Group_slug', 'em-beer-manager', 'embm_group_settings', array('label_for' => 'embm_group_slug')); + add_settings_field('embm_group_display_settings', __('Display Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_Group_display', 'em-beer-manager', 'embm_group_settings'); if ($logged_in) { - add_settings_field('embm_group_untappd_settings', __('Untappd Settings', 'embm'), 'EMBM_Admin_Settings_Group_untappd', 'embm', 'embm_group_settings'); + add_settings_field('embm_group_untappd_settings', __('Untappd Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_Group_untappd', 'em-beer-manager', 'embm_group_settings'); } else { - add_settings_field('embm_group_untappd_settings', __('Untappd Settings', 'embm'), 'EMBM_Admin_Settings_Untappd_login', 'embm', 'embm_group_settings'); + add_settings_field('embm_group_untappd_settings', __('Untappd Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_Untappd_login', 'em-beer-manager', 'embm_group_settings'); } // Style Tax Settings - add_settings_section('embm_style_settings', __('Beer Style Settings', 'embm'), 'EMBM_Admin_Settings_section', 'embm'); - add_settings_field('embm_style_rest', __('Restore Styles', 'embm'), 'EMBM_Admin_Settings_Style_reset', 'embm', 'embm_style_settings'); - add_settings_field('embm_style_display_settings', __('Display Settings', 'embm'), 'EMBM_Admin_Settings_Style_display', 'embm', 'embm_style_settings'); + add_settings_section('embm_style_settings', __('Beer Style Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_section', 'em-beer-manager'); + add_settings_field('embm_style_rest', __('Restore Styles', 'em-beer-manager'), 'EMBM_Admin_Settings_Style_reset', 'em-beer-manager', 'embm_style_settings'); + add_settings_field('embm_style_display_settings', __('Display Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_Style_display', 'em-beer-manager', 'embm_style_settings'); if ($logged_in) { - add_settings_field('embm_style_untappd_settings', __('Untappd Settings', 'embm'), 'EMBM_Admin_Settings_Style_untappd', 'embm', 'embm_style_settings'); + add_settings_field('embm_style_untappd_settings', __('Untappd Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_Style_untappd', 'em-beer-manager', 'embm_style_settings'); } else { - add_settings_field('embm_style_untappd_settings', __('Untappd Settings', 'embm'), 'EMBM_Admin_Settings_Untappd_login', 'embm', 'embm_style_settings'); + add_settings_field('embm_style_untappd_settings', __('Untappd Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_Untappd_login', 'em-beer-manager', 'embm_style_settings'); } // Menu Tax Settings - add_settings_section('embm_menu_settings', __('Beer Menu Settings', 'embm'), 'EMBM_Admin_Settings_section', 'embm'); - add_settings_field('embm_menu_display_settings', __('Display Settings', 'embm'), 'EMBM_Admin_Settings_Menu_display', 'embm', 'embm_menu_settings'); + add_settings_section('embm_menu_settings', __('Beer Menu Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_section', 'em-beer-manager'); + add_settings_field('embm_menu_display_settings', __('Display Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_Menu_display', 'em-beer-manager', 'embm_menu_settings'); if ($logged_in) { - add_settings_field('embm_menu_untappd_settings', __('Untappd Settings', 'embm'), 'EMBM_Admin_Settings_Menu_untappd', 'embm', 'embm_menu_settings'); + add_settings_field('embm_menu_untappd_settings', __('Untappd Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_Menu_untappd', 'em-beer-manager', 'embm_menu_settings'); } else { - add_settings_field('embm_menu_untappd_settings', __('Untappd Settings', 'embm'), 'EMBM_Admin_Settings_Untappd_login', 'embm', 'embm_menu_settings'); + add_settings_field('embm_menu_untappd_settings', __('Untappd Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_Untappd_login', 'em-beer-manager', 'embm_menu_settings'); } // Single Beer Settings - add_settings_section('embm_single_settings', __('Single Beer Page Settings', 'embm'), 'EMBM_Admin_Settings_section', 'embm'); - add_settings_field('embm_comments_toggle', __('Comments', 'embm'), 'EMBM_Admin_Settings_Single_comments', 'embm', 'embm_single_settings'); - add_settings_field('embm_single_display_settings', __('Display Settings', 'embm'), 'EMBM_Admin_Settings_Single_display', 'embm', 'embm_single_settings'); + add_settings_section('embm_single_settings', __('Single Beer Page Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_section', 'em-beer-manager'); + add_settings_field('embm_comments_toggle', __('Comments', 'em-beer-manager'), 'EMBM_Admin_Settings_Single_comments', 'em-beer-manager', 'embm_single_settings'); + add_settings_field('embm_single_display_settings', __('Display Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_Single_display', 'em-beer-manager', 'embm_single_settings'); if ($logged_in) { - add_settings_field('embm_single_untappd_settings', __('Untappd Settings', 'embm'), 'EMBM_Admin_Settings_Single_untappd', 'embm', 'embm_single_settings'); + add_settings_field('embm_single_untappd_settings', __('Untappd Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_Single_untappd', 'em-beer-manager', 'embm_single_settings'); } else { - add_settings_field('embm_single_untappd_settings', __('Untappd Settings', 'embm'), 'EMBM_Admin_Settings_Untappd_login', 'embm', 'embm_single_settings'); + add_settings_field('embm_single_untappd_settings', __('Untappd Settings', 'em-beer-manager'), 'EMBM_Admin_Settings_Untappd_login', 'em-beer-manager', 'embm_single_settings'); } } @@ -189,7 +189,7 @@ function EMBM_Admin_Settings_untappd($section) */ function EMBM_Admin_Settings_Untappd_login() { - echo ''.__('Log in to Untappd to access additional display options.', 'embm').'
'; + echo ''.__('Log in to Untappd to access additional display options.', 'em-beer-manager').'
'; } /** @@ -207,7 +207,7 @@ function EMBM_Admin_Settings_Untappd_integration() } echo ''; - echo ''; + echo ''; echo '?
'; } @@ -274,8 +274,8 @@ function EMBM_Admin_Settings_Untappd_icons() // Set up possible options $icon_sets = array( - '1' => __('Original', 'embm').' (v1)', - '2' => __('Modern', 'embm').' (v2)' + '1' => __('Original', 'em-beer-manager').' (v1)', + '2' => __('Modern', 'em-beer-manager').' (v2)' ); echo ''; } /** @@ -437,7 +437,7 @@ function EMBM_Admin_Settings_Group_slug() */ function EMBM_Admin_Settings_Group_display() { - echo EMBM_Admin_Settings_Section_display(__('in groups', 'embm'), 'group'); + echo EMBM_Admin_Settings_Section_display(__('in groups', 'em-beer-manager'), 'group'); } /** @@ -447,7 +447,7 @@ function EMBM_Admin_Settings_Group_display() */ function EMBM_Admin_Settings_Group_untappd() { - echo EMBM_Admin_Settings_Section_untappd(__('in groups', 'embm'), 'group'); + echo EMBM_Admin_Settings_Section_untappd(__('in groups', 'em-beer-manager'), 'group'); } /** @@ -457,8 +457,8 @@ function EMBM_Admin_Settings_Group_untappd() */ function EMBM_Admin_Settings_Style_reset() { - echo ''; - echo ''.__('Restore missing or deleted beer styles from the pre-loaded list.', 'embm').'
'; + echo ''; + echo ''.__('Restore missing or deleted beer styles from the pre-loaded list.', 'em-beer-manager').'
'; // Add modal prompt add_thickbox(); @@ -466,19 +466,19 @@ function EMBM_Admin_Settings_Style_reset() ?> @@ -486,7 +486,7 @@ function EMBM_Admin_Settings_Style_reset() href="#TB_inline?width=550&height=155&inlineId=embm-styles-reset-prompt" class="thickbox" id="embm-styles-reset-prompt--button" - title="" + title="" style="display:none;" > '; - echo ''; + echo ''; } /** @@ -557,7 +557,7 @@ function EMBM_Admin_Settings_Single_comments() */ function EMBM_Admin_Settings_Single_display() { - echo EMBM_Admin_Settings_Section_display(__('on single beer pages', 'embm'), 'single'); + echo EMBM_Admin_Settings_Section_display(__('on single beer pages', 'em-beer-manager'), 'single'); } /** @@ -574,20 +574,20 @@ function EMBM_Admin_Settings_Single_untappd() $reviews_count = isset($options['embm_reviews_count_single']) ? $options['embm_reviews_count_single'] : 5; // Output ratings setting - echo EMBM_Admin_Settings_Section_untappd(__('on single beer pages', 'embm'), 'single'); + echo EMBM_Admin_Settings_Section_untappd(__('on single beer pages', 'em-beer-manager'), 'single'); // Output review setting echo ''; - echo ''; + echo ''; // Output review count setting - echo '