Skip to content

Commit

Permalink
Deploying version 0.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@A5hleyRich
A5hleyRich committed Nov 2, 2015
1 parent 1f4f5d5 commit 9aa1091
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 44 deletions.
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ This plugin is required by other plugins, which uses its libraries and its setti

## Changelog ##

### 0.3.4 - 2015-11-02 ###
* Improvement: Compatibility with WP Offload S3 Pro 1.0.3

### 0.3.3 - 2015-10-26 ###
* Improvement: Updated Amazon SDK to version 2.8.18
* Improvement: Fix inconsistent notice widths on _Access Keys_ screen
Expand Down
4 changes: 2 additions & 2 deletions amazon-web-services.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Plugin URI: http://wordpress.org/extend/plugins/amazon-web-services/
Description: Includes the Amazon Web Services PHP libraries, stores access keys, and allows other plugins to hook into it.
Author: Delicious Brains
Version: 0.3.3
Version: 0.3.4
Author URI: http://deliciousbrains.com/
Network: True
Text Domain: amazon-web-services
Expand All @@ -22,7 +22,7 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// **********************************************************************

$GLOBALS['aws_meta']['amazon-web-services']['version'] = '0.3.3';
$GLOBALS['aws_meta']['amazon-web-services']['version'] = '0.3.4';

$GLOBALS['aws_meta']['amazon-web-services']['supported_addon_versions'] = array(
'amazon-s3-and-cloudfront' => '0.9',
Expand Down
53 changes: 32 additions & 21 deletions classes/amazon-web-services.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,11 @@ function get_plugin_action_settings_text() {
/**
* Get all defined addons that use this plugin
*
* @param bool $unfiltered
*
* @return array
*/
function get_addons() {
function get_addons( $unfiltered = false ) {
$addons = array(
'amazon-s3-and-cloudfront' => array(
'title' => __( 'WP Offload S3', 'amazon-web-services' ),
Expand All @@ -353,42 +355,51 @@ function get_addons() {
'title' => __( 'Pro Upgrade', 'amazon-web-services' ),
'url' => 'https://deliciousbrains.com/wp-offload-s3/',
'addons' => array(
'amazon-s3-and-cloudfront-assets' => array(
'amazon-s3-and-cloudfront-assets' => array(
'title' => __( 'Assets', 'amazon-web-services' ),
'url' => 'https://deliciousbrains.com/wp-offload-s3/doc/assets-addon/',
'label' => __( 'Addon', 'amazon-web-services' ),
),
'amazon-s3-and-cloudfront-woocommerce' => array(
'title' => __( 'WooCommerce', 'amazon-web-services' ),
'url' => 'https://deliciousbrains.com/wp-offload-s3/doc/woocommerce-addon/',
'label' => __( 'Addon', 'amazon-web-services' ),
'amazon-s3-and-cloudfront-woocommerce' => array(
'title' => __( 'WooCommerce', 'amazon-web-services' ),
'url' => 'https://deliciousbrains.com/wp-offload-s3/doc/woocommerce-addon/',
'label' => __( 'Addon', 'amazon-web-services' ),
'parent_plugin_basename' => 'woocommerce/woocommerce.php',
),
'amazon-s3-and-cloudfront-edd' => array(
'title' => __( 'Easy Digital Downloads', 'amazon-web-services' ),
'url' => 'https://deliciousbrains.com/wp-offload-s3/doc/edd-addon/',
'label' => __( 'Addon', 'amazon-web-services' ),
'amazon-s3-and-cloudfront-edd' => array(
'title' => __( 'Easy Digital Downloads', 'amazon-web-services' ),
'url' => 'https://deliciousbrains.com/wp-offload-s3/doc/edd-addon/',
'label' => __( 'Addon', 'amazon-web-services' ),
'parent_plugin_basename' => 'easy-digital-downloads/easy-digital-downloads.php',
),
'amazon-s3-and-cloudfront-wpml' => array(
'title' => __( 'WPML', 'amazon-web-services' ),
'url' => 'https://deliciousbrains.com/wp-offload-s3/doc/wpml-addon/',
'label' => __( 'Addon', 'amazon-web-services' ),
'amazon-s3-and-cloudfront-wpml' => array(
'title' => __( 'WPML', 'amazon-web-services' ),
'url' => 'https://deliciousbrains.com/wp-offload-s3/doc/wpml-addon/',
'label' => __( 'Addon', 'amazon-web-services' ),
'parent_plugin_basename' => 'wpml-media/plugin.php',
),
'amazon-s3-and-cloudfront-meta-slider' => array(
'title' => __( 'Meta Slider', 'amazon-web-services' ),
'url' => 'https://deliciousbrains.com/wp-offload-s3/doc/meta-slider-addon/',
'label' => __( 'Addon', 'amazon-web-services' ),
'amazon-s3-and-cloudfront-meta-slider' => array(
'title' => __( 'Meta Slider', 'amazon-web-services' ),
'url' => 'https://deliciousbrains.com/wp-offload-s3/doc/meta-slider-addon/',
'label' => __( 'Addon', 'amazon-web-services' ),
'parent_plugin_basename' => 'ml-slider/ml-slider.php',
),
'amazon-s3-and-cloudfront-enable-media-replace' => array(
'title' => __( 'Enable Media Replace', 'amazon-web-services' ),
'url' => 'https://deliciousbrains.com/wp-offload-s3/doc/enable-media-replace-addon/',
'label' => __( 'Addon', 'amazon-web-services' ),
'title' => __( 'Enable Media Replace', 'amazon-web-services' ),
'url' => 'https://deliciousbrains.com/wp-offload-s3/doc/enable-media-replace-addon/',
'label' => __( 'Addon', 'amazon-web-services' ),
'parent_plugin_basename' => 'enable-media-replace/enable-media-replace.php',
),
),
),
),
),
);

if ( $unfiltered ) {
return $addons;
}

$addons = apply_filters( 'aws_addons', $addons );

return $addons;
Expand Down
9 changes: 9 additions & 0 deletions classes/aws-plugin-base.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@ public function get_plugin_basename() {
return $this->plugin_basename;
}

/**
* Accessor for plugin file path
*
* @return string
*/
public function get_plugin_file_path() {
return $this->plugin_file_path;
}

/**
* Accessor for plugin dir path
*
Expand Down
42 changes: 21 additions & 21 deletions languages/amazon-web-services-en.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: amazon-web-services\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2015-10-26 13:48+0000\n"
"POT-Creation-Date: 2015-11-02 14:25+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -50,72 +50,72 @@ msgid ""
"You must first <a href=\"%s\">set your AWS access keys</a> to use this addon."
msgstr ""

#: classes/amazon-web-services.php:348
#: classes/amazon-web-services.php:350
msgid "WP Offload S3"
msgstr ""

#: classes/amazon-web-services.php:353
#: classes/amazon-web-services.php:355
msgid "Pro Upgrade"
msgstr ""

#: classes/amazon-web-services.php:357
#: classes/amazon-web-services.php:359
msgid "Assets"
msgstr ""

#: classes/amazon-web-services.php:359
#: classes/amazon-web-services.php:364
#: classes/amazon-web-services.php:369
#: classes/amazon-web-services.php:374
#: classes/amazon-web-services.php:379
#: classes/amazon-web-services.php:361
#: classes/amazon-web-services.php:366
#: classes/amazon-web-services.php:372
#: classes/amazon-web-services.php:378
#: classes/amazon-web-services.php:384
#: classes/amazon-web-services.php:390
msgid "Addon"
msgstr ""

#: classes/amazon-web-services.php:362
#: classes/amazon-web-services.php:364
msgid "WooCommerce"
msgstr ""

#: classes/amazon-web-services.php:367
#: classes/amazon-web-services.php:370
msgid "Easy Digital Downloads"
msgstr ""

#: classes/amazon-web-services.php:372
#: classes/amazon-web-services.php:376
msgid "WPML"
msgstr ""

#: classes/amazon-web-services.php:377
#: classes/amazon-web-services.php:382
msgid "Meta Slider"
msgstr ""

#: classes/amazon-web-services.php:382
#: classes/amazon-web-services.php:388
msgid "Enable Media Replace"
msgstr ""

#: classes/amazon-web-services.php:423
#: classes/amazon-web-services.php:434
msgctxt "Plugin already installed and activated"
msgid "Installed & Activated"
msgstr ""

#: classes/amazon-web-services.php:425
#: classes/amazon-web-services.php:436
msgctxt "Plugin already installed"
msgid "Installed"
msgstr ""

#: classes/amazon-web-services.php:426
#: classes/amazon-web-services.php:437
msgctxt "Activate plugin now"
msgid "Activate Now"
msgstr ""

#: classes/amazon-web-services.php:429
#: classes/amazon-web-services.php:440
msgctxt "Install plugin now"
msgid "Install Now"
msgstr ""

#: classes/amazon-web-services.php:452
#: classes/amazon-web-services.php:463
msgid "Visit Site"
msgstr ""

#: classes/amazon-web-services.php:455
#: classes/amazon-web-services.php:466
msgctxt "View plugin details"
msgid "View Details"
msgstr ""
Expand All @@ -142,7 +142,7 @@ msgid ""
"7.16.2+ compiled with OpenSSL and zlib. Your server currently has"
msgstr ""

#: classes/aws-plugin-base.php:157
#: classes/aws-plugin-base.php:166
msgid "Settings"
msgstr ""

Expand Down
3 changes: 3 additions & 0 deletions readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ This plugin is required by other plugins, which uses its libraries and its setti

== Changelog ==

= 0.3.4 - 2015-11-02 =
* Improvement: Compatibility with WP Offload S3 Pro 1.0.3

= 0.3.3 - 2015-10-26 =
* Improvement: Updated Amazon SDK to version 2.8.18
* Improvement: Fix inconsistent notice widths on _Access Keys_ screen
Expand Down

0 comments on commit 9aa1091

Please sign in to comment.