From 0911777bc15876ba2d548eb2503b44d020e88366 Mon Sep 17 00:00:00 2001
From: pewgeuges <73141620+pewgeuges@users.noreply.github.com>
Date: Thu, 10 Dec 2020 12:29:50 +0000
Subject: [PATCH] =?UTF-8?q?development=20update=202.2.0d6=20to=20check=20r?=
=?UTF-8?q?emaining=20translated=20strings=20=E2=80=94=20internal=20use=20?=
=?UTF-8?q?only,=20no=20other=20added=20value=20compared=20to=20current=20?=
=?UTF-8?q?2.1.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
git-svn-id: https://plugins.svn.wordpress.org/footnotes/trunk@2436526 b8457f37-d9ea-0310-8a92-e5e31aec5664
---
class/dashboard/subpage-main.php | 17 +++++++++--------
class/language.php | 6 +++---
class/task.php | 14 +++++++-------
css/public.css | 4 ++--
css/settings.css | 4 ++--
footnotes.php | 4 ++--
readme.txt | 3 +++
templates/dashboard/expert-lookup.html | 4 ++--
8 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/class/dashboard/subpage-main.php b/class/dashboard/subpage-main.php
index 28d49b1..d02c9be 100644
--- a/class/dashboard/subpage-main.php
+++ b/class/dashboard/subpage-main.php
@@ -505,11 +505,11 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine {
"label-color" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_COLOR, __("Text color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)),
"color" => $this->addColorSelection(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_COLOR),
- "notice-color" => __("To use the current theme’s default text color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME) . ' ' . __("Clear and leave empty.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
+ "notice-color" => __("To use the current theme’s default text color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME) . ' ' . __("Clear or leave empty.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
"label-background" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_BACKGROUND, __("Background color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)),
"background" => $this->addColorSelection(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_BACKGROUND),
- "notice-background" => __("To use the current theme’s default background color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME) . ' ' . __("Clear and leave empty.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
+ "notice-background" => __("To use the current theme’s default background color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME) . ' ' . __("Clear or leave empty.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
"label-border-width" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_BORDER_WIDTH, __("Border width:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)),
"border-width" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_BORDER_WIDTH, 0, 4, true),
@@ -517,7 +517,7 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine {
"label-border-color" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_BORDER_COLOR, __("Border color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)),
"border-color" => $this->addColorSelection(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_BORDER_COLOR),
- "notice-border-color" => __("To use the current theme’s default border color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME) . ' ' . __("Clear and leave empty.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
+ "notice-border-color" => __("To use the current theme’s default border color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME) . ' ' . __("Clear or leave empty.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
"label-border-radius" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_BORDER_RADIUS, __("Rounded corner radius:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)),
"border-radius" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_BORDER_RADIUS, 0, 500),
@@ -525,7 +525,7 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine {
"label-box-shadow-color" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_SHADOW_COLOR, __("Box shadow color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)),
"box-shadow-color" => $this->addColorSelection(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_SHADOW_COLOR),
- "notice-box-shadow-color" => __("To use the current theme’s default box shadow color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME) . ' ' . __("Clear and leave empty.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
+ "notice-box-shadow-color" => __("To use the current theme’s default box shadow color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME) . ' ' . __("Clear or leave empty.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
)
);
@@ -615,10 +615,11 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine {
array(
"description-1" => __("The priority level determines whether Footnotes is executed timely before other plugins, and how the reference container is positioned relative to other features.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
- "description-2" => __("Default 9223372036854775807 is lowest priority, 0 is highest.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
- "description-3" => __("To restore default priority, set to -1, interpreted as 9223372036854775807, the constant PHP_INT_MAX.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
- "description-4" => __("For the_content, this figure needs to be lower than 1200 to make sure that the reference container displays above features inserted by other plugins running at 1200 or a greater/lower level, later in the process.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
- "description-5" => __("The widget_text hook must be disabled, because a footnotes container is inserted at the bottom of each widget, but multiple containers in a page are not disambiguated.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
+ "description-2" => __("For the_content, this figure must be lower than 99 so that a string added by a plugin running at 99 may not be mistaken as a footnote.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
+ "description-3" => __("This makes also sure that the reference container displays above a feature inserted by a plugin running at 1200.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
+ "description-4" => __("Default 9223372036854775807 is lowest priority, 0 is highest.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
+ "description-5" => __("To restore default priority, set to -1, interpreted as 9223372036854775807, the constant PHP_INT_MAX.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
+ "description-6" => __("The widget_text hook must be disabled, because a footnotes container is inserted at the bottom of each widget, but multiple containers in a page are not disambiguated.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
"head-hook" => __("WordPress hook function name", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
"head-checkbox" => __("Activate", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
diff --git a/class/language.php b/class/language.php
index df3111b..9e2730e 100644
--- a/class/language.php
+++ b/class/language.php
@@ -57,15 +57,15 @@ class MCI_Footnotes_Language {
* @return bool
*
* Edited for:
- * 2.2.0 conform to WordPress plugin language file name scheme by using load_plugin_textdomain()
+ * 2.1.6 conform to WordPress plugin language file name scheme by using load_plugin_textdomain()
* @see wp-includes/l10n.php:857
- * “ The .mo file should be named based on the text domain with a dash, and then the locale exactly.”
+ * “The .mo file should be named based on the text domain with a dash, and then the locale exactly.”
*/
private static function load($p_str_LanguageCode) {
return load_plugin_textdomain(
MCI_Footnotes_Config::C_STR_PLUGIN_NAME,
false, // This argument only fills the gap left by a deprecated argument (since WP2.7).
- MCI_Footnotes_Config::C_STR_PLUGIN_NAME . '/languages/' . MCI_Footnotes_Config::C_STR_PLUGIN_NAME . $p_str_LanguageCode . '.mo'
+ MCI_Footnotes_Config::C_STR_PLUGIN_NAME . '/languages' // The plugin basedir is provided.
);
}
}
diff --git a/class/task.php b/class/task.php
index f2affc8..1c53169 100644
--- a/class/task.php
+++ b/class/task.php
@@ -28,7 +28,7 @@
* 2.1.6 option to disable URL line wrapping 2020-12-09T1606+0100
* 2.1.6 add catch-all exclusion to fix URL line wrapping 2020-12-09T1921+0100
*
- * Last modified: 2020-12-10T0448+0100
+ * Last modified: 2020-12-10T1006+0100
*/
// If called directly, abort:
@@ -519,12 +519,12 @@ class MCI_Footnotes_Task {
// fix line wrapping of URLs (hyperlinked or not) based on pattern, not link element,
// to prevent them from hanging out of the tooltip in non-Unicode-compliant user agents
- // spare however values of the href and the src arguments!
- // Even ARIA labels may take an URL as value, so use \w=. as a catch-all.
- // see public.css
- if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_FOOTNOTE_URL_WRAP_ENABLED))) {
- $l_str_FootnoteText = preg_replace( '#(?$1', $l_str_FootnoteText );
- }
+ // spare however values of the href and the src arguments!
+ // Even ARIA labels may take an URL as value, so use \w=[\'"] as a catch-all 2020-12-10T1005+0100
+ // see public.css
+ if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_FOOTNOTE_URL_WRAP_ENABLED))) {
+ $l_str_FootnoteText = preg_replace( '#(?$1', $l_str_FootnoteText );
+ }
// Text to be displayed instead of the footnote
$l_str_FootnoteReplaceText = "";
diff --git a/css/public.css b/css/public.css
index 3b9db84..14ce23c 100755
--- a/css/public.css
+++ b/css/public.css
@@ -5,9 +5,9 @@
* Created-Time: 16:21
* Since: 1.0
*
- * Version: 2.1.6
+ * Version: 2.2.0d6
*
- * Last modified: 2020-12-10T0449+0100
+ * Last modified: 2020-12-10T1320+0100
*/
diff --git a/css/settings.css b/css/settings.css
index 86e6564..39122d0 100755
--- a/css/settings.css
+++ b/css/settings.css
@@ -5,9 +5,9 @@
* Created-Time: 16:21
* Since: 1.0
*
- * Version: 2.1.6
+ * Version: 2.2.0d6
*
- * Last modified: 2020-12-10T0449+0100
+ * Last modified: 2020-12-10T1320+0100
*/
diff --git a/footnotes.php b/footnotes.php
index ebbee88..77f3c71 100755
--- a/footnotes.php
+++ b/footnotes.php
@@ -4,12 +4,12 @@
Plugin URI: https://wordpress.org/plugins/footnotes/
Description: time to bring footnotes to your website! footnotes are known from offline publishing and everybody takes them for granted when reading a magazine.
Author: Mark Cheret
- Version: 2.1.6
+ Version: 2.2.0d6
Author URI: http://cheret.de/plugins/footnotes-2/
Text Domain: footnotes
Domain Path: /languages
*/
-define( 'FOOTNOTES_VERSION', '2.1.6' );
+define( 'FOOTNOTES_VERSION', '2.2.0d6' );
/*
Copyright 2020 Mark Cheret (email: mark@cheret.de)
diff --git a/readme.txt b/readme.txt
index 8e8e73b..ae4ad91 100755
--- a/readme.txt
+++ b/readme.txt
@@ -80,6 +80,9 @@ Visit this swift write-up from a **footnotes** user by the name of **Southwest**
== Changelog ==
+= 2.2.0d6 =
+- Bugfix: Localization: correct arguments for plugin textdomain load function
+
= 2.1.6 =
- Bugfix: Priority levels: set the_content priority level to 98 to prevent plugin conflict
- Bugfix: Tooltips: set z-index to maximum 2147483647 to address display issues with overlay content
diff --git a/templates/dashboard/expert-lookup.html b/templates/dashboard/expert-lookup.html
index 34fe762..9eda1e6 100644
--- a/templates/dashboard/expert-lookup.html
+++ b/templates/dashboard/expert-lookup.html
@@ -1,7 +1,7 @@