Merged in embm_v3.2.2 (pull request #4)

3.2.2 - Bug Fixes Approved-by: Erin Morelli <erin@erinmorelli.com>
ErinMorelli · Oct 15, 2017 · bd6fce5 · bd6fce5
2 parents 0dda74b + 4eb7082
commit bd6fce5
Show file tree

Hide file tree

Showing 34 changed files with 1,077 additions and 931 deletions.
diff --git 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
@@ -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
@@ -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 = '<a href="' . get_bloginfo('wpurl');
     $settings_link .= '/wp-admin/admin.php?page=embm-settings">';
-    $settings_link .= __('Settings', 'embm') . '</a>';
+    $settings_link .= __('Settings', 'em-beer-manager') . '</a>';
 
     // Add to to existing links array
     return array_merge(array($settings_link), $links);
@@ -380,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'),
-        sprintf('<strong>%s</strong>', __('EM Beer Manager', 'embm')),
+        __('%s only supports PHP version %s or higher. Please upgrade your PHP to use this plugin.', 'em-beer-manager'),
+        sprintf('<strong>%s</strong>', __('EM Beer Manager', 'em-beer-manager')),
         '5.3'
     );
     echo '</p></div>';
@@ -401,44 +401,44 @@ function EMBM_Plugin_help()
     return array(
         'untappd'       => array(
             'id'        => 'embm-untappd-integration',
-            'title'     => __('Untappd Integration', 'embm'),
+            'title'     => __('Untappd Integration', 'em-beer-manager'),
             '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').
+                __('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').
                 '</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').
+                __('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').
                 '</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').
+                __('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').
                 '</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').
+                __('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').
                 '</p>'
         ),
         'untappd_id'    => array(
             'id'        => 'embm-untappd-beer-id',
-            'title'     => __('Untappd Beer ID', 'embm'),
+            'title'     => __('Untappd Beer ID', 'em-beer-manager'),
             'content'   => '<p>'.
-                __('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').
                 ':</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').
+                __('The string of numbers at the end of the URL is your beer\'s ID.', 'em-beer-manager').
                 '</p>'
         ),
         'untappd_limit' => array (
             'id'        => 'embm-untappd-api-ratelimit',
-            'title'     => __('API Rate-Limit', 'embm'),
+            'title'     => __('API Rate-Limit', 'em-beer-manager'),
             'content'   => '<p>'.
                 sprintf(
-                    __('From the %s', 'embm').':',
+                    __('From the %s', 'em-beer-manager').':',
                     sprintf(
                         '<a href="https://untappd.com/api/docs" target="_blank">%s</a>',
-                        __('Untappd API documentation', 'embm')
+                        __('Untappd API documentation', 'em-beer-manager')
                     )
                 ).'</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').'"</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').
+                __('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').'"</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.', 'em-beer-manager').'</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.', 'em-beer-manager').
                 '</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>'
+        'sidebar'       => '<p><strong>' . __('For more information', 'em-beer-manager') . ':</strong></p>' .
+            '<p><a href="https://www.erinmorelli.com/projects/em-beer-manager" target="_blank">' . __('Plugin Website', 'em-beer-manager') . '</a></p>' .
+            '<p><a href="https://wordpress.org/support/plugin/em-beer-manager" target="_blank">' . __('Support Forums', 'em-beer-manager') . '</a></p>'
     );
 }
diff --git a/includes/admin/embm-admin-footer.php b/includes/admin/embm-admin-footer.php
@@ -30,14 +30,14 @@
 
 <div class="embm-settings-footer--donate">
     <p class="embm-settings-footer--donate-text">
-        <span><?php _e('Like this plugin?', 'embm'); ?></span>
+        <span><?php _e('Like this plugin?', 'em-beer-manager'); ?></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'); ?>"
+            title="<?php _e('Buy me a beer!', 'em-beer-manager'); ?>"
             target="_blank"
         >
-            <?php _e('Buy me a beer!', 'embm'); ?>
+            <?php _e('Buy me a beer!', 'em-beer-manager'); ?>
         </a>
         <span class="dashicons dashicons-smiley"></span>
     </p>
@@ -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')); ?></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>
+                <option value="6.00" selected><?php printf('%s ($6)', __('A Pint', 'em-beer-manager')); ?></option>
+                <option value="12.00"><?php printf('%s ($12)', __('A 6-Pack', 'em-beer-manager')); ?></option>
+                <option value="24.00"><?php printf('%s ($24)', __('A Case', 'em-beer-manager')); ?></option>
+                <option value="other"><?php _e('Custom Amount', 'em-beer-manager'); ?></option>
             </select>
             <input
                 type="number"
@@ -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'); ?>"
+                value="<?php _e('Buy me a beer!', 'em-beer-manager'); ?>"
             ><br />
-            <img src="<?php echo EMBM_PLUGIN_URL; ?>/assets/img/donate.png" alt="<?php _e('PayPal', 'embm'); ?>" border="0" />
+            <img src="<?php echo EMBM_PLUGIN_URL; ?>/assets/img/donate.png" alt="<?php _e('PayPal', 'em-beer-manager'); ?>" border="0" />
         </p>
     </form>
 </div>
@@ -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'); ?>" border="0" />
+            <img src="<?php echo EMBM_PLUGIN_URL; ?>/assets/img/ut-credit.png" alt="<?php _e('Powered by Untappd', 'em-beer-manager'); ?>" border="0" />
         </a>
     </p>
-    <p><?php printf(__('All Untappd logo graphics are the sole property of %s', 'embm'), '<strong>Untappd LLC.</strong>'); ?></p>
+    <p><?php printf(__('All Untappd logo graphics are the sole property of %s', 'em-beer-manager'), '<strong>Untappd LLC.</strong>'); ?></p>
     <!-- Admin menu beer icon from SimpleIcon.com-->
     <p>
         <?php printf(
-            __('Free beer icon from %s', 'embm'),
+            __('Free beer icon from %s', 'em-beer-manager'),
             '<a href="http://simpleicon.com" target="_blank" title="simple icon" rel="nofollow"><strong>simple icon</strong></a>'
         ); ?>.
     </p>