Changeset 1548022

Timestamp:

12/07/2016 07:31:08 PM (9 years ago)

Author:

greatislander

Message:

Preparing release 0.4.9.

Location:

hypothesis/trunk

Files:

• Gruntfile.js (added)
• README.md (modified) (1 diff)
• hypothesis.php (modified) (20 diffs)
• languages (added)
• languages/hypothesis.pot (added)
• license.txt (modified) (1 diff)
• package.json (added)
• readme.txt (modified) (2 diffs)

hypothesis/trunk/README.md

@@ -11 +11 @@
 4. Click Install Now.
 5. Click Activate
+6. Visit your WordPress Settings > Hypothesis page to configure how it works on your site
 
 ## Publishing

hypothesis/trunk/hypothesis.php

@@ -1 +1 @@
 <?php
-/**
- * @package Hypothesis
- * @version 0.4.8
+/*
+ Plugin Name: Hypothesis
+ Plugin URI: http://hypothes.is/
+ Description: Hypothesis is an open platform for the collaborative evaluation of knowledge. This plugin embeds the necessary scripts in your Wordpress site to enable any user to use Hypothesis without installing any extensions.
+ Author: The Hypothesis Project and contributors
+ Version: 0.4.9
+ Author URI: http://hypothes.is/
+ Text Domain:     hypothesis
+ Domain Path:     /languages
+
+ @package         Hypothesis
  */
-
-/*
-Plugin Name: Hypothesis
-Plugin URI: http://hypothes.is/
-Description: Hypothesis is an open platform for the collaborative evaluation of knowledge. This plugin embeds the necessary scripts in your Wordpress site to enable any user to use Hypothesis without installing any extensions.
-Author: The Hypothesis Project and contributors
-Version: 0.4.8
-Author URI: http://hypothes.is/
-*/
 
 // Exit if called directly.
@@ -48 +47 @@
     public function add_plugin_page() {
         add_options_page(
-            'Hypothesis Settings',
-            'Hypothesis',
+            __( 'Hypothesis Settings', 'hypothesis' ),
+            __( 'Hypothesis', 'hypothesis' ),
             'manage_options',
             'hypothesis-setting-admin',
@@ -63 +62 @@
     public static function get_posttypes() {
         return apply_filters('hypothesis_supported_posttypes', array(
-            'post' => 'posts',
-            'page' => 'pages',
+            'post' => _x( 'posts', 'plural post type', 'hypothesis' ),
+            'page' => _x( 'pages', 'plural post type', 'hypothesis' ),
         ) );
     }
@@ -102 +101 @@
         add_settings_section(
             'hypothesis_settings_section', // ID.
-            'Hypothesis Settings', // Title.
+            __( 'Hypothesis Settings', 'hypothesis' ), // Title.
             array( $this, 'settings_section_info' ), // Callback.
             'hypothesis-setting-admin' // Page.
@@ -109 +108 @@
         add_settings_field(
             'highlights-on-by-default',
-            'Highlights on by default',
+            __( 'Highlights on by default', 'hypothesis' ),
             array( $this, 'highlights_on_by_default_callback' ),
             'hypothesis-setting-admin',
@@ -117 +116 @@
         add_settings_field(
             'sidebar-open-by-default',
-            'Sidebar open by default',
+            __( 'Sidebar open by default', 'hypothesis' ),
             array( $this, 'sidebar_open_by_default_callback' ),
             'hypothesis-setting-admin',
@@ -125 +124 @@
         add_settings_field(
             'serve-pdfs-with-via',
-            'Enable annotation for PDFs in Media Library',
+            __( 'Enable annotation for PDFs in Media Library', 'hypothesis' ),
             array( $this, 'serve_pdfs_with_via_default_callback' ),
             'hypothesis-setting-admin',
@@ -137 +136 @@
         add_settings_section(
             'hypothesis_content_section', // ID.
-            'Content Settings', // Title.
+            __( 'Content Settings', 'hypothesis' ), // Title.
             array( $this, 'content_section_info' ), // Callback.
             'hypothesis-setting-admin' // Page.
@@ -144 +143 @@
         add_settings_field(
             'allow-on-front-page',
-            'Allow on front page',
+            __( 'Allow on front page', 'hypothesis' ),
             array( $this, 'allow_on_front_page_callback' ),
             'hypothesis-setting-admin',
@@ -152 +151 @@
         add_settings_field(
             'allow-on-blog-page',
-            'Allow on blog page',
+            __( 'Allow on blog page', 'hypothesis' ),
             array( $this, 'allow_on_blog_page_callback' ),
             'hypothesis-setting-admin',
@@ -167 +166 @@
             add_settings_field(
                 "allow-on-$slug",
-                "Allow on $name",
+                sprintf( __( 'Allow on %s', 'hypothesis' ), $name ),
                 array( $this, 'allow_on_posttype_callback' ),
                 'hypothesis-setting-admin',
@@ -181 +180 @@
             add_settings_field(
                 $slug . '_ids_show_h', // ID.
-                "Allow on specific $name (list of comma-separated $slug IDs, no spaces)", // Title.
+                sprintf(
+                    __( 'Allow on specific %1$s (list of comma-separated %1$s IDs, no spaces)', 'hypothesis' ),
+                    $name,
+                    $slug
+                ), // Title.
                 array( $this, 'posttype_ids_show_h_callback' ), // Callback.
                 'hypothesis-setting-admin', // Page.
@@ -195 +198 @@
             add_settings_field(
                 $slug . '_ids_override', // ID.
-                "Disallow on specific $name (list of comma-separated $slug IDs, no spaces)", // Title.
+                sprintf(
+                    __( 'Disallow on specific %1$s (list of comma-separated %1$s IDs, no spaces)', 'hypothesis' ),
+                    $name,
+                    $slug
+                ), // Title.
                 array( $this, 'posttype_ids_override_callback' ), // Callback.
                 'hypothesis-setting-admin', // Page.
@@ -253 +260 @@
             }
 
-            if ( isset( $input[ $slug . '_ids_show_h' ] ) ) {
+            if ( isset( $input[ $slug . '_ids_show_h' ] ) && '' != $input[ $slug . '_ids_show_h' ] ) {
                 $new_input[ $slug . '_ids_show_h' ] = explode( ',', esc_attr( $input[ $slug . '_ids_show_h' ] ) );
             }
 
-            if ( isset( $input[ $slug . '_ids_override' ] ) ) {
+            if ( isset( $input[ $slug . '_ids_override' ] ) && '' != $input[ $slug . '_ids_override' ] ) {
                 $new_input[ $slug . '_ids_override' ] = explode( ',', esc_attr( $input[ $slug . '_ids_override' ] ) );
             }
@@ -269 +276 @@
      */
     public function settings_section_info() {
-        print 'Customize Hypothesis defaults and behavior.';
-    }
+    ?>
+        <p><?php esc_attr_e( 'Customize Hypothesis defaults and behavior.', 'hypothesis' ); ?></p>
+    <?php }
 
     /**
@@ -276 +284 @@
      */
     public function content_section_info() {
-        print 'Control where Hypothesis is loaded.';
-    }
+    ?>
+        <p><?php esc_attr_e( 'Control where Hypothesis is loaded.', 'hypothesis' ); ?></p>
+    <?php }
 
     /**
@@ -398 +407 @@
  */
 function enqueue_hypothesis() {
-    wp_enqueue_script( 'hypothesis', 'https://hypothes.is/embed.js', array(), false, true );
+    wp_enqueue_script( 'hypothesis', 'https://hypothes.is/embed.js', [], false, true );
 }
 
@@ -417 +426 @@
 
     // Otherwise highlighting is on by default.
-    wp_enqueue_script( 'nohighlights', '/wp-content/plugins/hypothesis/js/nohighlights.js', '', false, true );
+    wp_enqueue_script( 'nohighlights', plugins_url( 'js/nohighlights.js', __FILE__ ), [], false, true );
 
         // Embed options.
     if ( isset( $options['highlights-on-by-default'] ) ) :
-        wp_enqueue_script( 'showhighlights', '/wp-content/plugins/hypothesis/js/showhighlights.js', '', false, true );
+        wp_enqueue_script( 'showhighlights', plugins_url( 'js/showhighlights.js', __FILE__ ), [], false, true );
     endif;
 
     if ( isset( $options['sidebar-open-by-default'] ) ) :
-        wp_enqueue_script( 'sidebaropen', '/wp-content/plugins/hypothesis/js/sidebaropen.js', '', false, true );
+        wp_enqueue_script( 'sidebaropen', plugins_url( 'js/sidebaropen.js', __FILE__ ), [], false, true );
     endif;
 
     if ( isset( $options['serve-pdfs-with-via'] ) ) :
-        wp_enqueue_script( 'pdfs-with-via', '/wp-content/plugins/hypothesis/js/via-pdf.js', '', false, true );
+        wp_enqueue_script( 'pdfs-with-via', plugins_url( 'js/via-pdf.js', __FILE__ ), [], false, true );
     endif;
 
@@ -450 +459 @@
                 if ( isset( $options[ $posttype . '_ids_override' ] ) && ! is_single( $options[ $posttype . '_ids_override' ] ) ) { // Make sure this post isn't in the override list if it exists.
                     enqueue_hypothesis();
+                } elseif ( ! isset( $options[ $posttype . '_ids_override' ] ) ) {
+                    enqueue_hypothesis();
                 }
             } elseif ( ! isset( $options[ "allow-on-$slug" ] ) && isset( $options[ $posttype . '_ids_show_h' ] ) && is_single( $options[ $posttype . '_ids_show_h' ] ) ) { // Check if Hypothesis is allowed on this specific post.
@@ -458 +469 @@
                 if ( isset( $options['page_ids_override'] ) && ! is_page( $options['page_ids_override'] ) ) { // Make sure this page isn't in the override list if it exists.
                     enqueue_hypothesis();
+                } elseif ( ! isset( $options['page_ids_override'] ) ) {
+                    enqueue_hypothesis();
                 }
             } elseif ( ! isset( $options['allow-on-pages'] ) && isset( $options['page_ids_show_h'] ) && is_page( $options['page_ids_show_h'] ) ) { // Check if Hypothesis is allowed on this specific page.

hypothesis/trunk/license.txt

@@ -1 @@
-Copyright (c) 2013-2015 Hypothes.is Project and contributors
+Copyright (c) 2013-2016 Hypothes.is Project and contributors
 
 Redistribution and use in source and binary forms, with or without

hypothesis/trunk/readme.txt

@@ -3 +3 @@
 Tags: hypothesis, annotation, comments
 Requires at least: 3.0.1
-Tested up to: 4.6.1
-Stable tag: 0.4.8
+Tested up to: 4.7
+Stable tag: 0.4.9
 License: BSD
 License URI: http://opensource.org/licenses/BSD-2-Clause
@@ -21 +21 @@
 
 == Changelog ==
+
+= 0.4.9 =
+- Add localization support.
+- Fix an error in options sanitization routine.
 
 = 0.4.8 =