Ensure default link text of (Edit) is translatable #5

bobbingwide · Sep 9, 2021 · 26c7796 · 26c7796
1 parent 5f1b080
commit 26c7796
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 39 deletions.
diff --git a/block.json b/block.json
@@ -10,11 +10,10 @@
 		"type": "string"
 	  },
 	  "label": {
-		"type": "string",
-		"default": "(Edit)"
+		"type": "string"
 	  }
 	},
-  "supports": {
+   "supports": {
 	"html": false,
 	"color": {
 	  "gradients": true,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sb-post-edit-block",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"description": "Post edit block to allow direct editing of the post",
 	"author": "bobbingwide",
   	"license": "GPL-2.0-or-later",

diff --git a/sb-post-edit-block.php b/sb-post-edit-block.php
@@ -4,7 +4,7 @@
  * Description:       Post edit block to allow direct editing of the post
  * Requires at least: 5.7
  * Requires PHP:      7.3
- * Version:           0.3.0
+ * Version:           0.3.1
  * Author:            bobbingwide
  * License:           GPLv3
  * License URI:       https://www.gnu.org/licenses/gpl-2.0.html
@@ -30,10 +30,7 @@ function oik_sb_sb_post_edit_block_block_init() {
 	 * from the locale specific .json file in the languages folder
 	 */
 	$ok = wp_set_script_translations( 'oik-sb-sb-post-edit-block-editor-script', 'sb-post-edit-block' , __DIR__ .'/languages' );
-	//echo "?$ok?";
-
 	//add_filter( 'load_script_textdomain_relative_path', 'oik_load_script_textdomain_relative_path', 10, 2);
-
 }
 
 function oik_sb_sb_post_edit_block_loaded() {
@@ -42,7 +39,7 @@ function oik_sb_sb_post_edit_block_loaded() {
 
 function oik_sb_sb_post_edit_block_load_plugin_textdomain( $domain="sb-post-edit-block" ) {
 	$languages_dir =  "$domain/languages";
-	bw_trace2( $languages_dir, "languages dir" );
+	//bw_trace2( $languages_dir, "languages dir" );
 	$loaded = load_plugin_textdomain( $domain, false, $languages_dir );
 	return $loaded;
 }
@@ -63,8 +60,12 @@ function oik_sb_sb_post_edit_block_dynamic_block( $attributes ) {
 		$html = '<span></span>';
 		return $html;
 	}
-	$text = empty( $attributes['label']) ? __( '(Edit)', 'sb-post-edit-block' ) : $attributes['label'];
 
+	/** Use the default value for the link text if the label attribute is not set or just blank.
+	 */
+	$text = empty( $attributes['label'])  ? '' : $attributes['label'];
+	$text = trim( $text );
+	$text = empty( $text ) ?  __( '(Edit)', 'sb-post-edit-block' ) : $text;
 
 	$align_class_name   = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
 

diff --git a/src/post-edit/edit.js b/src/post-edit/edit.js
@@ -39,13 +39,20 @@ export default function Edit ( { attributes, className, isSelected, setAttribute
 	};
 	const { textAlign, label } = attributes;
 
+	let displayLabel = label;
+
+	/** Force a default value if the label is empty or all blank */
+	if ( label === undefined || label.trim() === '') {
+		setAttributes( { label: undefined } );
+		displayLabel = __( '(Edit)', 'sb-post-edit-block');
+	}
+
 	const blockProps = useBlockProps( {
 		className: classnames( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
 
-
 	return (
 		<>
 			<BlockControls group="block">
@@ -58,24 +65,18 @@ export default function Edit ( { attributes, className, isSelected, setAttribute
 			</BlockControls>
 			<InspectorControls>
 				<PanelBody>
-				<PanelRow>
-				<TextControl
-				label={ __("Link text", 'sb-post-edit-block' ) }
-				value={ label }
-				onChange={ onChangeLabel }
-			/>
-				</PanelRow>
+					<PanelRow>
+						<TextControl
+							label={ __("Link text", 'sb-post-edit-block' ) }
+							value={ displayLabel }
+							onChange={ onChangeLabel }
+						/>
+					</PanelRow>
 				</PanelBody>
-
 			</InspectorControls>
-
-
-
-			<div { ...blockProps }><a href="#">{ label }</a>
-
-	</div>
-			</>
-
-
+			<div { ...blockProps }>
+				<a href="#">{ displayLabel }</a>
+			</div>
+		</>
 	);
 }
diff --git a/src/post-edit/index.js b/src/post-edit/index.js
@@ -5,6 +5,8 @@
  */
 import { registerBlockType } from '@wordpress/blocks';
 
+import { __ } from '@wordpress/i18n';
+
 /**
  * Lets webpack process CSS, SASS or SCSS files referenced in JavaScript files.
  * All files containing `style` keyword are bundled together. The code used
@@ -18,26 +20,21 @@ import './style.scss';
  * Internal dependencies
  */
 import Edit from './edit';
-import save from './save';
 
-import metadata from '../../block.json';
 
 /**
  * Every block starts by registering a new block type definition.
  *
  * @see https://developer.wordpress.org/block-editor/developers/block-api/#registering-a-block
  */
 registerBlockType( 'oik-sb/sb-post-edit-block', {
+	example: {
+		attributes: {
+			label: __( "(Edit)", 'sb-post-edit-block')
+		}
+	},
 	/**
 	 * @see ./edit.js
 	 */
-	edit: Edit,
-	attributes: metadata.attributes,
-	supports: metadata.supports
-
-	/**
-	 * @see ./save.js
-
-	save,
-	 */
+	edit: Edit
 } );