From 40b153f58ae97e42dee38df6c52a7730c030f453 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro.celaya@hypothes.is>
Date: Fri, 26 Jan 2024 11:02:04 +0100
Subject: [PATCH 1/3] Change license identifier from BSD to BSD-2-Clause

---
 README.md      | 2 +-
 hypothesis.php | 2 +-
 readme.txt     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 84cae18..e686400 100644
--- a/README.md
+++ b/README.md
@@ -53,4 +53,4 @@ Create a [new GitHub release](https://github.com/hypothesis/wp-hypothesis/releas
 
 ## License
 
-[BSD](http://opensource.org/licenses/BSD-2-Clause)
+[BSD-2-Clause](http://opensource.org/licenses/BSD-2-Clause)
diff --git a/hypothesis.php b/hypothesis.php
index 3b75692..47d9e1b 100644
--- a/hypothesis.php
+++ b/hypothesis.php
@@ -8,7 +8,7 @@
  * Requires PHP: 7.4
  * Author: The Hypothesis Project and contributors
  * Author URI: https://hypothes.is/
- * License: BSD
+ * License: BSD-2-Clause
  * License URI: https://opensource.org/licenses/BSD-2-Clause
  * Text Domain: hypothesis
  * Domain Path: /languages
diff --git a/readme.txt b/readme.txt
index 5f4b172..fc724dd 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: hypothesis, annotation, comments
 Requires at least: 6.2
 Tested up to: 6.4.2
 Stable tag: 0.7.1
-License: BSD
+License: BSD-2-Clause
 License URI: http://opensource.org/licenses/BSD-2-Clause
 
 An open platform for the collaborative evaluation of knowledge.

From 2f37fdfffbdd8d2d724b8795342f06db0c5963b1 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro.celaya@hypothes.is>
Date: Fri, 26 Jan 2024 11:32:54 +0100
Subject: [PATCH 2/3] Document the integration with hypothes.is in the plugin
 readme.txt

---
 readme.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/readme.txt b/readme.txt
index fc724dd..6a1a09c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -13,6 +13,13 @@ An open platform for the collaborative evaluation of knowledge.
 
 Hypothesis is a web annotation tool that allows users to provide commentary, references, and insight on top of news, blogs, scientific articles, books, terms of service, ballot initiatives, legislation and regulations, software code and more. You can find out more at [http://hypothes.is/](http://hypothes.is/)
 
+This plugin will allow you to automatically embed Hypothesis in your site, and integrate with the Hypothesis annotations API.
+
+Without this plugin, you would have to follow [these steps](https://web.hypothes.is/help/embedding-hypothesis-in-websites-and-platforms/), but with this plugin you only need to check some checkboxes, and you will be good to go.
+
+* [Terms of Service](https://web.hypothes.is/terms-of-service/)
+* [Privacy Policy](https://web.hypothes.is/privacy/)
+
 == Installation ==
 
 1. Upload `hypothesis.php` to the `/wp-content/plugins/` directory

From 580fa5d8d2eca6c085602df24edf5635ccf97689 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro.celaya@hypothes.is>
Date: Fri, 26 Jan 2024 11:51:52 +0100
Subject: [PATCH 3/3] Add Hypothesis namespace to custom functions and classes

---
 class-hypothesissettingspage.php |  2 ++
 hypothesis.php                   | 20 +++++++++++++++-----
 readme.txt                       |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/class-hypothesissettingspage.php b/class-hypothesissettingspage.php
index 0a1b7d3..0e3bfb9 100644
--- a/class-hypothesissettingspage.php
+++ b/class-hypothesissettingspage.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Hypothesis;
+
 /**
  * Create settings page (see https://codex.wordpress.org/Creating_Options_Pages)
  */
diff --git a/hypothesis.php b/hypothesis.php
index 47d9e1b..4faf2be 100644
--- a/hypothesis.php
+++ b/hypothesis.php
@@ -14,14 +14,24 @@
  * Domain Path: /languages
  **/
 
+namespace Hypothesis;
+
+use function add_action;
+use function define;
+use function defined;
+use function get_option;
+use function is_admin;
+use function load_plugin_textdomain as wp_load_plugin_textdomain;
+use function wp_enqueue_script;
+
 // Exit if called directly.
 defined( 'ABSPATH' ) || die( 'Cannot access pages directly.' );
 
 // Load textdomain
-function hypothesis_load_plugin_textdomain() {
-	load_plugin_textdomain( 'hypothesis', false, basename( __DIR__ ) . '/languages/' );
+function load_plugin_textdomain() {
+	wp_load_plugin_textdomain( 'hypothesis', false, basename( __DIR__ ) . '/languages/' );
 }
-add_action( 'plugins_loaded', 'hypothesis_load_plugin_textdomain' );
+add_action( 'plugins_loaded', 'Hypothesis\load_plugin_textdomain' );
 
 define( 'HYPOTHESIS_PLUGIN_VERSION', '0.7.1' );
 
@@ -34,7 +44,7 @@ function hypothesis_load_plugin_textdomain() {
 /**
  * Add Hypothesis based on conditions set in the plugin settings.
  */
-add_action( 'wp', 'add_hypothesis' );
+add_action( 'wp', 'Hypothesis\add_scripts' );
 
 /**
  * Wrapper for the primary Hypothesis wp_enqueue call.
@@ -46,7 +56,7 @@ function enqueue_hypothesis() {
 /**
  * Add Hypothesis script(s) to front end.
  */
-function add_hypothesis() {
+function add_scripts() {
 	$options   = get_option( 'wp_hypothesis_options' );
 	$posttypes = HypothesisSettingsPage::get_posttypes();
 
diff --git a/readme.txt b/readme.txt
index 6a1a09c..f07b37a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -13,7 +13,7 @@ An open platform for the collaborative evaluation of knowledge.
 
 Hypothesis is a web annotation tool that allows users to provide commentary, references, and insight on top of news, blogs, scientific articles, books, terms of service, ballot initiatives, legislation and regulations, software code and more. You can find out more at [http://hypothes.is/](http://hypothes.is/)
 
-This plugin will allow you to automatically embed Hypothesis in your site, and integrate with the Hypothesis annotations API.
+This plugin will allow you to automatically embed Hypothesis in your site.
 
 Without this plugin, you would have to follow [these steps](https://web.hypothes.is/help/embedding-hypothesis-in-websites-and-platforms/), but with this plugin you only need to check some checkboxes, and you will be good to go.