Skip to content

Commit

Permalink
Version 3.2.1 - Quick Bug Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@ErinMorelli
ErinMorelli committed Oct 14, 2017
1 parent cb70b91 commit 0dda74b
Show file tree
Hide file tree
Showing 23 changed files with 512 additions and 513 deletions.
10 changes: 2 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,8 @@ This plugin allows beer creators from home brewers to professional breweries to

## Latest Release ##

### [Version 3.2.0 - Feature Release](https://github.com/ErinMorelli/em-beer-manager/releases/download/v3.2.0/em-beer-manager.3.2.0.zip) ###
* [DEPRECATED] Ended support for PHP <= 5.2, please upgrade your PHP
* [NEW] Added support for collaboration beers in the Untappd import feature
* [NEW] Display multiple styles or groups with the `beer-list` shortcode
* [NEW] Added `beer-menu` shortcode for displaying beer menus
* [NEW] Added view settings for beer menu pages
* [LABS] Added new "Delete Missing" option for Untappd and UTFB syncing
* [FIXED] Issue with UTFB importing and syncing where beers in multiple menus were only getting associated with one menu
### [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


### Installation ###
Expand Down
8 changes: 7 additions & 1 deletion README.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Donate link: http://www.erinmorelli.com/projects/em-beer-manager/
Tags: beer, beers, brewery, untappd, untappd for business
Requires at least: 3.0.1
Tested up to: 4.8.2
Stable tag: 3.2.0
Stable tag: 3.2.1
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -339,6 +339,9 @@ Try refreshing your permalinks by going to "Settings" -> "Permalinks" and clicki

== Changelog ==

= 3.2.1 =
* [FIXED] Issue introduced in version 3.2.0 that broke plugin localization

= 3.2.0 =
* [DEPRECATED] Ended support for PHP <= 5.2, please upgrade your PHP
* [NEW] Added support for collaboration beers in the Untappd import feature
Expand Down Expand Up @@ -492,6 +495,9 @@ Try refreshing your permalinks by going to "Settings" -> "Permalinks" and clicki

== Upgrade Notice ==

= 3.2.1 =
Please back-up your database before upgrading! Fixed issue that broke plugin localization

= 3.2.0 =
Please back-up your database before upgrading!

Expand Down
47 changes: 23 additions & 24 deletions em-beer-manager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.0
* Version: 3.2.1
* Author: Erin Morelli
* Author URI: https://www.erinmorelli.com/
* License: GPLv2 or later
Expand Down Expand Up @@ -35,7 +35,6 @@
// Define plugin constants
define('EMBM_PLUGIN_DIR', plugin_dir_path(__FILE__));
define('EMBM_PLUGIN_URL', plugin_dir_url(__FILE__));
define('EMBM_DOMAIN', 'embm');

// WP general options
define('EMBM_OPTIONS', 'embm_options');
Expand Down Expand Up @@ -92,7 +91,7 @@ function EMBM_Plugin_load()
}

// Set current version
$embm_curr_version = '3.2.0';
$embm_curr_version = '3.2.1';

// Define version key name
if (!defined('EMBM_VERSION_KEY')) {
Expand Down Expand Up @@ -136,7 +135,7 @@ function EMBM_Plugin_load()
}

// Plugin localization
load_plugin_textdomain(EMBM_DOMAIN, false, plugin_basename(dirname(__FILE__)).'/languages');
load_plugin_textdomain('embm', false, plugin_basename(dirname(__FILE__)).'/languages');
}

// Initial plugin load
Expand Down Expand Up @@ -322,7 +321,7 @@ function EMBM_Plugin_links($links)
// Define settings link HTML
$settings_link = '<a href="' . get_bloginfo('wpurl');
$settings_link .= '/wp-admin/admin.php?page=embm-settings">';
$settings_link .= __('Settings', EMBM_DOMAIN) . '</a>';
$settings_link .= __('Settings', 'embm') . '</a>';

// Add to to existing links array
return array_merge(array($settings_link), $links);
Expand Down Expand Up @@ -381,8 +380,8 @@ function EMBM_Plugin_php()
{
echo '<div class="notice notice-error is-dismissible"><p>';
printf(
__('%s only supports PHP version %s or higher. Please upgrade your PHP to use this plugin.', EMBM_DOMAIN),
sprintf('<strong>%s</strong>', __('EM Beer Manager', EMBM_DOMAIN)),
__('%s only supports PHP version %s or higher. Please upgrade your PHP to use this plugin.', 'embm'),
sprintf('<strong>%s</strong>', __('EM Beer Manager', 'embm')),
'5.3'
);
echo '</p></div>';
Expand All @@ -402,44 +401,44 @@ function EMBM_Plugin_help()
return array(
'untappd' => array(
'id' => 'embm-untappd-integration',
'title' => __('Untappd Integration', EMBM_DOMAIN),
'title' => __('Untappd Integration', 'embm'),
'content' => '<p>'.
__('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_DOMAIN).
__('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').
'</p><p>'.
__('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_DOMAIN).
__('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').
'</p><p>'.
__('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_DOMAIN).
__('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').
'</p></p>'.
__('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_DOMAIN).
__('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').
'</p>'
),
'untappd_id' => array(
'id' => 'embm-untappd-beer-id',
'title' => __('Untappd Beer ID', EMBM_DOMAIN),
'title' => __('Untappd Beer ID', 'embm'),
'content' => '<p>'.
__('Find your Untappd Beer ID by visiting your beer\'s official page. The URL will be formatted like this', EMBM_DOMAIN).
__('Find your Untappd Beer ID by visiting your beer\'s official page. The URL will be formatted like this', 'embm').
':</p><p><code>https://untappd.com/b/the-alchemist-heady-topper/<strong>4691</strong></code></p><p>'.
__('The string of numbers at the end of the URL is your beer\'s ID.', EMBM_DOMAIN).
__('The string of numbers at the end of the URL is your beer\'s ID.', 'embm').
'</p>'
),
'untappd_limit' => array (
'id' => 'embm-untappd-api-ratelimit',
'title' => __('API Rate-Limit', EMBM_DOMAIN),
'title' => __('API Rate-Limit', 'embm'),
'content' => '<p>'.
sprintf(
__('From the %s', EMBM_DOMAIN).':',
__('From the %s', 'embm').':',
sprintf(
'<a href="https://untappd.com/api/docs" target="_blank">%s</a>',
__('Untappd API documentation', EMBM_DOMAIN)
__('Untappd API documentation', 'embm')
)
).'</p><p><blockquote><em>"'.
__('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_DOMAIN).'"</em></blockquote></p><p>'.
__('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_DOMAIN).'</p><p>'.
__('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_DOMAIN).
__('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').'"</em></blockquote></p><p>'.
__('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').'</p><p>'.
__('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').
'</p>'
),
'sidebar' => '<p><strong>' . __('For more information', EMBM_DOMAIN) . ':</strong></p>' .
'<p><a href="https://www.erinmorelli.com/projects/em-beer-manager" target="_blank">' . __('Plugin Website', EMBM_DOMAIN) . '</a></p>' .
'<p><a href="https://wordpress.org/support/plugin/em-beer-manager" target="_blank">' . __('Support Forums', EMBM_DOMAIN) . '</a></p>'
'sidebar' => '<p><strong>' . __('For more information', 'embm') . ':</strong></p>' .
'<p><a href="https://www.erinmorelli.com/projects/em-beer-manager" target="_blank">' . __('Plugin Website', 'embm') . '</a></p>' .
'<p><a href="https://wordpress.org/support/plugin/em-beer-manager" target="_blank">' . __('Support Forums', 'embm') . '</a></p>'
);
}
24 changes: 12 additions & 12 deletions includes/admin/embm-admin-footer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@

<div class="embm-settings-footer--donate">
<p class="embm-settings-footer--donate-text">
<span><?php _e('Like this plugin?', EMBM_DOMAIN); ?></span>
<span><?php _e('Like this plugin?', 'embm'); ?></span>
<a
class="embm-settings-footer--donate-button thickbox"
href="#TB_inline?width=250&height=150&inlineId=embm-settings-footer--donate-modal"
title="<?php _e('Buy me a beer!', EMBM_DOMAIN); ?>"
title="<?php _e('Buy me a beer!', 'embm'); ?>"
target="_blank"
>
<?php _e('Buy me a beer!', EMBM_DOMAIN); ?>
<?php _e('Buy me a beer!', 'embm'); ?>
</a>
<span class="dashicons dashicons-smiley"></span>
</p>
Expand All @@ -53,10 +53,10 @@ class="embm-settings-footer--donate-button thickbox"
<input type="hidden" name="return" value="https://www.erinmorelli.com/thanks-paypal">
<p>
<select name="amount-select" id="embm-settings-footer--donate-select">
<option value="6.00" selected><?php printf('%s ($6)', __('A Pint', EMBM_DOMAIN)); ?></option>
<option value="12.00"><?php printf('%s ($12)', __('A 6-Pack', EMBM_DOMAIN)); ?></option>
<option value="24.00"><?php printf('%s ($24)', __('A Case', EMBM_DOMAIN)); ?></option>
<option value="other"><?php _e('Custom Amount', EMBM_DOMAIN); ?></option>
<option value="6.00" selected><?php printf('%s ($6)', __('A Pint', 'embm')); ?></option>
<option value="12.00"><?php printf('%s ($12)', __('A 6-Pack', 'embm')); ?></option>
<option value="24.00"><?php printf('%s ($24)', __('A Case', 'embm')); ?></option>
<option value="other"><?php _e('Custom Amount', 'embm'); ?></option>
</select>
<input
type="number"
Expand All @@ -74,9 +74,9 @@ class="embm-settings-footer--donate-button thickbox"
type="submit"
name="submit"
class="embm-settings-footer--donate-button"
value="<?php _e('Buy me a beer!', EMBM_DOMAIN); ?>"
value="<?php _e('Buy me a beer!', 'embm'); ?>"
><br />
<img src="<?php echo EMBM_PLUGIN_URL; ?>/assets/img/donate.png" alt="<?php _e('PayPal', EMBM_DOMAIN); ?>" border="0" />
<img src="<?php echo EMBM_PLUGIN_URL; ?>/assets/img/donate.png" alt="<?php _e('PayPal', 'embm'); ?>" border="0" />
</p>
</form>
</div>
Expand All @@ -87,14 +87,14 @@ class="embm-settings-footer--donate-button"
<!-- Logo graphics and data from Untappd -->
<p class="embm-settings-footer--credits-untappd">
<a href="https://untappd.com" target="_blank" rel="nofollow">
<img src="<?php echo EMBM_PLUGIN_URL; ?>/assets/img/ut-credit.png" alt="<?php _e('Powered by Untappd', EMBM_DOMAIN); ?>" border="0" />
<img src="<?php echo EMBM_PLUGIN_URL; ?>/assets/img/ut-credit.png" alt="<?php _e('Powered by Untappd', 'embm'); ?>" border="0" />
</a>
</p>
<p><?php printf(__('All Untappd logo graphics are the sole property of %s', EMBM_DOMAIN), '<strong>Untappd LLC.</strong>'); ?></p>
<p><?php printf(__('All Untappd logo graphics are the sole property of %s', 'embm'), '<strong>Untappd LLC.</strong>'); ?></p>
<!-- Admin menu beer icon from SimpleIcon.com-->
<p>
<?php printf(
__('Free beer icon from %s', EMBM_DOMAIN),
__('Free beer icon from %s', 'embm'),
'<a href="http://simpleicon.com" target="_blank" title="simple icon" rel="nofollow"><strong>simple icon</strong></a>'
); ?>.
</p>
Expand Down
Loading

0 comments on commit 0dda74b

Please sign in to comment.