Merge pull request #132 from bu-ist/release/1.1.4

Release 1.1.4

bu-learning-blocks.php

@@ -9,7 +9,7 @@
  * Author URI: http://www.bu.edu/
  * Text Domain: bu-learning-blocks
  * Domain Path: /languages
- * Version: 1.1.3
+ * Version: 1.1.4
  * License: GPL2+
  * License URI: http://www.gnu.org/licenses/gpl-2.0.txt
  *

languages/bu-learning-blocks.pot

@@ -1,17 +1,17 @@
-# Copyright (C) 2021 Boston University: Web Applications
-# This file is distributed under the same license as the BU Learning Blocks plugin.
+# Copyright (C) 2022 Boston University: Web Applications
+# This file is distributed under the GPL2+.
 msgid ""
 msgstr ""
-"Project-Id-Version: BU Learning Blocks v1.1.3\n"
+"Project-Id-Version: BU Learning Blocks 1.1.4\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/bu-learning-blocks\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2021-03-09T22:14:20+00:00\n"
+"POT-Creation-Date: 2022-07-18T17:16:56-04:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.4.0\n"
+"X-Generator: WP-CLI 2.6.0\n"
 "X-Domain: bu-learning-blocks\n"
 
 #. Plugin Name of the plugin
@@ -34,15 +34,15 @@ msgstr ""
 msgid "http://www.bu.edu/"
 msgstr ""
 
-#: bu-learning-blocks.php:39
+#: bu-learning-blocks.php:41
 msgid "BULB Error: BU Learning Blocks requires either WordPress 5.0.0, or the Gutenberg plugin to be installed and activated on any version previous to 5.0.0."
 msgstr ""
 
-#: bu-learning-blocks.php:42
+#: bu-learning-blocks.php:44
 msgid "Please install and activate the Gutenberg plugin to use BU Learning Blocks."
 msgstr ""
 
-#: src/init.php:38
+#: src/init.php:41
 #: src/blocks/bulb-cn/index.js:22
 #: src/blocks/bulb-fitb/index.js:22
 #: src/blocks/bulb-ma/index.js:20
@@ -52,169 +52,154 @@ msgstr ""
 msgid "BULB"
 msgstr ""
 
-#: src/init.php:101
+#: src/init.php:104
 msgid "<strong>Welcome to BU Learning Blocks</strong>"
 msgstr ""
 
-#: src/init.php:109
+#: src/init.php:112
 msgid "Install Blocks and Pages"
 msgstr ""
 
-#: src/init.php:115
+#: src/init.php:118
 msgid "Install Blocks Only"
 msgstr ""
 
-#: src/learning-module-cpt.php:17
+#: src/learning-module-cpt.php:19
 msgctxt "Taxonomy General Name"
 msgid "Lessons"
 msgstr ""
 
-#: src/learning-module-cpt.php:18
+#: src/learning-module-cpt.php:20
 msgctxt "Taxonomy Singular Name"
 msgid "Lesson"
 msgstr ""
 
-#: src/learning-module-cpt.php:19
+#: src/learning-module-cpt.php:21
 msgid "Lessons"
 msgstr ""
 
-#: src/learning-module-cpt.php:20
+#: src/learning-module-cpt.php:22
 msgid "All Lessons"
 msgstr ""
 
-#: src/learning-module-cpt.php:21
+#: src/learning-module-cpt.php:23
 msgid "View Lesson"
 msgstr ""
 
-#: src/learning-module-cpt.php:22
+#: src/learning-module-cpt.php:24
 msgid "Parent Lesson"
 msgstr ""
 
-#: src/learning-module-cpt.php:23
+#: src/learning-module-cpt.php:25
 msgid "Parent Lesson:"
 msgstr ""
 
-#: src/learning-module-cpt.php:24
+#: src/learning-module-cpt.php:26
 msgid "New Lesson Name"
 msgstr ""
 
-#: src/learning-module-cpt.php:25
-msgid "Create Lesson"
+#: src/learning-module-cpt.php:27
+msgid "Include in Lesson (start typing name of Lesson)"
 msgstr ""
 
-#: src/learning-module-cpt.php:26
+#: src/learning-module-cpt.php:28
 msgid "Edit Lesson"
 msgstr ""
 
-#: src/learning-module-cpt.php:27
+#: src/learning-module-cpt.php:29
 msgid "Update Lesson"
 msgstr ""
 
-#: src/learning-module-cpt.php:28
+#: src/learning-module-cpt.php:30
 msgid "Separate lessons with commas"
 msgstr ""
 
-#: src/learning-module-cpt.php:29
+#: src/learning-module-cpt.php:31
 msgid "Search Lessons"
 msgstr ""
 
-#: src/learning-module-cpt.php:30
+#: src/learning-module-cpt.php:32
 msgid "Add or remove lessons"
 msgstr ""
 
-#: src/learning-module-cpt.php:31
+#: src/learning-module-cpt.php:33
 msgid "Choose from the most used lessons"
 msgstr ""
 
-#: src/learning-module-cpt.php:32
+#: src/learning-module-cpt.php:34
 msgid "Not Found"
 msgstr ""
 
-#: src/learning-module-cpt.php:62
+#: src/learning-module-cpt.php:64
 msgid "Lesson Pages"
 msgstr ""
 
-#: src/learning-module-cpt.php:63
+#: src/learning-module-cpt.php:65
 msgid "Lesson Page"
 msgstr ""
 
-#: src/learning-module-cpt.php:64
+#: src/learning-module-cpt.php:66
 msgid "BULB Lessons"
 msgstr ""
 
-#: src/learning-module-cpt.php:65
-#: src/learning-module-cpt.php:66
-#: src/learning-module-cpt.php:69
+#: src/learning-module-cpt.php:67
+#: src/learning-module-cpt.php:68
+#: src/learning-module-cpt.php:71
 msgid "New Lesson Page"
 msgstr ""
 
-#: src/learning-module-cpt.php:67
+#: src/learning-module-cpt.php:69
 msgid "Edit Lesson Page"
 msgstr ""
 
-#: src/learning-module-cpt.php:68
+#: src/learning-module-cpt.php:70
 msgid "Update Lesson Page"
 msgstr ""
 
-#: src/learning-module-cpt.php:70
+#: src/learning-module-cpt.php:72
 msgid "All Lesson Pages"
 msgstr ""
 
-#: src/learning-module-cpt.php:71
+#: src/learning-module-cpt.php:73
 msgid "View Lesson Page"
 msgstr ""
 
-#: src/learning-module-cpt.php:72
+#: src/learning-module-cpt.php:74
 msgid "View Lesson Pages"
 msgstr ""
 
-#: src/learning-module-cpt.php:73
+#: src/learning-module-cpt.php:75
 msgid "Lesson Page Attributes"
 msgstr ""
 
-#: src/learning-module-cpt.php:74
+#: src/learning-module-cpt.php:76
 msgid "Search Lesson Pages"
 msgstr ""
 
-#: src/learning-module-cpt.php:75
+#: src/learning-module-cpt.php:77
 msgid "No Lesson Pages found"
 msgstr ""
 
-#: src/learning-module-cpt.php:76
+#: src/learning-module-cpt.php:78
 msgid "No Lessons Pages found in Trash"
 msgstr ""
 
-#: src/learning-module-cpt.php:77
+#: src/learning-module-cpt.php:79
 msgid "Lesson Page Archives"
 msgstr ""
 
-#: src/learning-module-cpt.php:78
+#: src/learning-module-cpt.php:80
 msgid "Parent Lesson Page:"
 msgstr ""
 
-#: src/learning-module-cpt.php:87
+#: src/learning-module-cpt.php:89
 msgid "lesson"
 msgstr ""
 
-#: src/learning-module-cpt.php:89
+#: src/learning-module-cpt.php:91
 msgid "Holds our Lessons"
 msgstr ""
 
-#: build/blocks/blocks.build.js:1
-#: src/components/QuestionHeader.js:7
-msgid "Question"
-msgstr ""
-
-#: build/blocks/blocks.build.js:1
-#: src/components/QuestionHeader.js:8
-msgid "Question Header"
-msgstr ""
-
-#: build/blocks/blocks.build.js:1
-#: src/components/QuestionHeader.js:11
-msgid "Enter Question Header"
-msgstr ""
-
 #: src/blocks/bulb-cn/index.js:16
 msgid "BULB - Calculated Numeric"
 msgstr ""
@@ -330,3 +315,15 @@ msgstr ""
 #: src/components/QuestionFeedback.js:44
 msgid "Enter Incorrect Feedback"
 msgstr ""
+
+#: src/components/QuestionHeader.js:7
+msgid "Question"
+msgstr ""
+
+#: src/components/QuestionHeader.js:8
+msgid "Question Header"
+msgstr ""
+
+#: src/components/QuestionHeader.js:11
+msgid "Enter Question Header"
+msgstr ""

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bu-learning-blocks",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"private": true,
 	"scripts": {
 		"start": "wp-scripts start",

readme.txt

@@ -2,8 +2,8 @@
 Contributors: carlosesilva, dannycrews, jdub233
 Tags: learning, teaching, education, online courses, boston university, bu
 Requires at least: 5.3.2
-Tested up to: 5.7
-Stable tag: 1.1.3
+Tested up to: 6.0
+Stable tag: 1.1.4
 Requires PHP: 7.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -39,6 +39,9 @@ Development takes place at https://github.com/bu-ist/bu-learning-blocks/
 
 == Changelog ==
 
+= 1.1.4 =
+* Patch issues with 5.8 and 5.9 compatibility
+
 = 1.1.3 =
 * Add Github publish action
 

src/customize_tax_label.js

@@ -0,0 +1,20 @@
+/**
+ * Customizes the taxonomy editor, to set the new Lesson label.
+ *
+ * This used to be customized in the block editor, but that became unstable.  It is easier to
+ * set the default label to what we want in the block editor, then customize the taxonomy admin page.
+ * Relies on the markup of the taxonomy editor page.
+ */
+document.addEventListener('DOMContentLoaded', function () {
+	// The block editor uses the native "new tag" label, so we reset it here to a more general meaning.
+	var labelText = 'Create Lesson';
+
+	// Rename the form label.
+	var taxForm = document.querySelector("#addtag");
+	var labelElement = taxForm.parentElement.getElementsByTagName('h2')[0];
+	labelElement.innerHTML = labelText;
+
+	// Rename the submit button.
+	document.querySelector("#addtag #submit").value = labelText;
+
+}, false);

src/init.php

@@ -26,11 +26,12 @@
 require_once BULB_PLUGIN_DIR_PATH . 'src/blocks/bulb-fitb/index.php';
 require_once BULB_PLUGIN_DIR_PATH . 'src/blocks/bulb-mat/index.php';
 
-
+// To support versions before and after 5.8, check the WordPress version and use the newer 'block_categories_all' tag if it's 5.8 or newer.
+$block_category_filter = ( version_compare( get_bloginfo( 'version' ), '5.8', '>=' ) ) ? 'block_categories_all' : 'block_categories';
 
 // Add BULB custom block category.
 add_filter(
-	'block_categories',
+	$block_category_filter,
 	function( $categories, $post ) {
 		return array_merge(
 			$categories,