Merge pull request #195 from publishpress/develop

Develop
publishpress · Dec 9, 2020 · c3e9192 · c3e9192
2 parents 5a8f268 + 2f3bb0f
commit c3e9192
Show file tree

Hide file tree

Showing 64 changed files with 41,445 additions and 5,882 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,11 @@
   "private": true,
   "scripts": {
     "build_react_dev": "webpack --mode development --watch",
-    "compile_css": "concurrently --kill-others \"node-sass --output-style compressed src/assets/css/blocks_styles/blocks.scss > src/assets/css/blocks_styles/blocks.min.css\" \"node-sass --output-style expanded src/assets/css/blocks_styles/blocks.scss > src/assets/css/blocks_styles/blocks.css\""
+    "compile_css": "concurrently --kill-others \"node-sass --output-style compressed src/assets/css/blocks_styles/blocks.scss > src/assets/css/blocks_styles/blocks.min.css\" \"node-sass --output-style expanded src/assets/css/blocks_styles/blocks.scss > src/assets/css/blocks_styles/blocks.css\"",
+    "compile_css_style": "concurrently --kill-others \"node-sass --output-style expanded src/assets/scss/style.scss > src/assets/css/style.css\" \"node-sass --output-style compressed src/assets/scss/style.scss > src/assets/css/style.min.css\"",
+    "compile_css_main": "node-sass --output-style expanded src/assets/scss/main.scss > src/assets/css/main.css",
+    "compile_css_settings": "node-sass --output-style expanded src/assets/scss/settings.scss > src/assets/css/settings.css",
+    "compile_css_profiles": "node-sass --output-style expanded src/assets/scss/profiles.scss > src/assets/css/profiles.css"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",

diff --git a/src/advanced-gutenberg.php b/src/advanced-gutenberg.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Plugin Name: Advanced Gutenberg
- * Plugin URI: https://publishpress.com/advanced-gutenberg/
+ * Plugin Name: PublishPress Blocks
+ * Plugin URI: https://publishpress.com/blocks/
  * Description: Enhanced tools for Gutenberg editor
- * Version: 2.4.7
- * Tested up to: 5.5.1
+ * Version: 2.5.0
+ * Tested up to: 5.6
  * Author: PublishPress
  * Author URI: https://publishpress.com/
  * License: GPL2
@@ -63,7 +63,7 @@ function advgb_disable_plugin()
          */
         function advgb_show_error()
         {
-            echo '<div class="error"><p><strong>Advanced Gutenberg</strong> needs at least PHP 5.6.20 version, please update php before installing the plugin.</p></div>';
+            echo '<div class="error"><p><strong>PublishPress Blocks</strong> needs at least PHP 5.6.20 version, please update php before installing the plugin.</p></div>';
         }
     }
 
@@ -76,7 +76,7 @@ function advgb_show_error()
 }
 
 if (! defined('ADVANCED_GUTENBERG_VERSION')) {
-    define('ADVANCED_GUTENBERG_VERSION', '2.4.7');
+    define('ADVANCED_GUTENBERG_VERSION', '2.5.0');
 }
 
 if (! defined('ADVANCED_GUTENBERG_PLUGIN')) {
@@ -117,6 +117,12 @@ function advg_language_domain_init()
                 plugin_dir_path(__FILE__) . 'languages/' . 'advanced-gutenberg' . '-' . get_locale() . '.mo'
             );
         }
+
+        wp_set_script_translations(
+            'editor', 
+            'advanced-gutenberg', 
+            plugin_dir_path( __FILE__ ) . 'languages'
+        );
     }
 }
 add_action( 'init', 'advg_language_domain_init' );
@@ -128,6 +134,6 @@ function advg_language_domain_init()
     __FILE__,
     'advgb',
     'advanced-gutenberg',
-    'Advanced Gutenberg',
+    'PublishPress Blocks',
     'advanced-gutenberg'
 );
diff --git a/src/assets/blocks/accordion/block.jsx b/src/assets/blocks/accordion/block.jsx
@@ -275,7 +275,7 @@
     const accordionAttrs = {
         header: {
             type: 'string',
-            default: __( 'Header text', 'advanced-gutenberg' ),
+            default: 'Header text',
         },
         headerBgColor: {
             type: 'string',

diff --git a/src/assets/blocks/advaccordion/accordion.jsx b/src/assets/blocks/advaccordion/accordion.jsx
@@ -274,7 +274,7 @@
         attributes: {
             header: {
                 type: 'string',
-                default: __( 'Header text', 'advanced-gutenberg' ),
+                default: 'Header text',
             },
             headerBgColor: {
                 type: 'string',
@@ -409,7 +409,7 @@
                 attributes: {
                     header: {
                         type: 'string',
-                        default: __( 'Header text', 'advanced-gutenberg' ),
+                        default: 'Header text',
                     },
                     headerBgColor: {
                         type: 'string',

diff --git a/src/assets/blocks/advbutton/block.jsx b/src/assets/blocks/advbutton/block.jsx
@@ -371,7 +371,7 @@ import {AdvColorControl} from "../0-adv-components/components.jsx";
         text: {
             source: 'children',
             selector: 'a',
-            default: __( 'PUSH THE BUTTON', 'advanced-gutenberg' ),
+            default: 'PUSH THE BUTTON',
         },
         bgColor: {
             type: 'string',

diff --git a/src/assets/blocks/advimage/block.jsx b/src/assets/blocks/advimage/block.jsx
@@ -300,15 +300,15 @@
         },
         title: {
             type: 'string',
-            default: __( 'Image title', 'advanced-gutenberg' ),
+            default: 'Image title',
         },
         titleColor: {
             type: 'string',
             default: '#fff',
         },
         subtitle: {
             type: 'string',
-            default: __( 'Your subtitle here', 'advanced-gutenberg' ),
+            default: 'Your subtitle here',
         },
         subtitleColor: {
             type: 'string',

diff --git a/src/assets/blocks/advtabs/block.jsx b/src/assets/blocks/advtabs/block.jsx
@@ -157,7 +157,7 @@
             setAttributes( {
                 tabHeaders: [
                     ...attributes.tabHeaders,
-                    __('Tab header', 'advanced-gutenberg')
+                    'Tab header'
                 ]
             } );
             this.props.resetOrder();

diff --git a/src/assets/blocks/advvideo/block.jsx b/src/assets/blocks/advvideo/block.jsx
@@ -434,7 +434,7 @@
                                                    muted={muted}
                                             >
                                                 <source src={videoURL}/>
-                                                { __( 'Your browser does not support HTML5 video.', 'advanced-gutenberg' ) }
+                                                { 'Your browser does not support HTML5 video.' }
                                             </video>
                                         </Disabled>
                                     ))
@@ -688,7 +688,7 @@
                                        playsInline={playsinline}
                                 >
                                     <source src={videoURL}/>
-                                    { __( 'Your browser does not support HTML5 video.', 'advanced-gutenberg' ) }
+                                    { 'Your browser does not support HTML5 video.' }
                                 </video>
                             )
                             || !videoSourceType && <div style={ { width: videoWidth, height: videoHeight } } />}
@@ -767,7 +767,7 @@
                                                controls
                                         >
                                             <source src={videoURL}/>
-                                            { __( 'Your browser does not support HTML5 video.', 'advanced-gutenberg' ) }
+                                            { 'Your browser does not support HTML5 video.' }
                                         </video>
                                     )
                                     || !videoSourceType && <div style={ { width: videoWidth, height: videoHeight } } />}