Merge branch 'master' into wp55-auto-updates

YahnisElsts · Aug 21, 2020 · 9788564 · 9788564
2 parents 9ff0a29 + 8c4a998
commit 9788564
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 1 deletion.
diff --git a/Puc/v4p10/DebugBar/Extension.php b/Puc/v4p10/DebugBar/Extension.php
@@ -142,6 +142,15 @@ protected function preAjaxRequest() {
 			@ini_set('display_errors', 'On');
 		}
 
+		/**
+		 * Remove hooks that were added by this extension.
+		 */
+		public function removeHooks() {
+			remove_filter('debug_bar_panels', array($this, 'addDebugBarPanel'));
+			remove_action('debug_bar_enqueue_scripts', array($this, 'enqueuePanelDependencies'));
+			remove_action('wp_ajax_puc_v4_debug_check_now', array($this, 'ajaxCheckNow'));
+		}
+
 		/**
 		 * @param string $filePath
 		 * @return string

diff --git a/Puc/v4p10/UpdateChecker.php b/Puc/v4p10/UpdateChecker.php
@@ -65,6 +65,11 @@ abstract class Puc_v4p10_UpdateChecker {
 		 */
 		protected $cachedMetadataHost = 0;
 
+		/**
+		 * @var Puc_v4p9_DebugBar_Extension|null
+		 */
+		protected $debugBarExtension = null;
+
 		public function __construct($metadataUrl, $directoryName, $slug = null, $checkPeriod = 12, $optionName = '') {
 			$this->debugMode = (bool)(constant('WP_DEBUG'));
 			$this->metadataUrl = $metadataUrl;
@@ -168,6 +173,10 @@ public function removeHooks() {
 			if ( $this->scheduler ) {
 				$this->scheduler->removeHooks();
 			}
+
+			if ( $this->debugBarExtension ) {
+				$this->debugBarExtension->removeHooks();
+			}
 		}
 
 		/**
@@ -963,7 +972,7 @@ protected function isBadDirectoryStructure($remoteSource) {
 		 */
 		public function maybeInitDebugBar() {
 			if ( class_exists('Debug_Bar', false) && file_exists(dirname(__FILE__) . '/DebugBar') ) {
-				$this->createDebugBarExtension();
+				$this->debugBarExtension = $this->createDebugBarExtension();
 			}
 		}
 

diff --git a/languages/plugin-update-checker-zh_CN.mo b/languages/plugin-update-checker-zh_CN.mo
diff --git a/languages/plugin-update-checker-zh_CN.po b/languages/plugin-update-checker-zh_CN.po
@@ -0,0 +1,48 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: plugin-update-checker\n"
+"POT-Creation-Date: 2017-11-24 17:02+0200\n"
+"PO-Revision-Date: 2020-08-04 08:10+0800\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.4\n"
+"X-Poedit-Basepath: ..\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: __;_e;_x:1,2c;_x\n"
+"Last-Translator: Seaton Jiang <[email protected]>\n"
+"Language: zh_CN\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: Puc/v4p3/Plugin/UpdateChecker.php:395
+msgid "Check for updates"
+msgstr "检查更新"
+
+#: Puc/v4p3/Plugin/UpdateChecker.php:548
+#, php-format
+msgctxt "the plugin title"
+msgid "The %s plugin is up to date."
+msgstr "%s 目前是最新版本。"
+
+#: Puc/v4p3/Plugin/UpdateChecker.php:550
+#, php-format
+msgctxt "the plugin title"
+msgid "A new version of the %s plugin is available."
+msgstr "%s 当前有可用的更新。"
+
+#: Puc/v4p3/Plugin/UpdateChecker.php:552
+#, php-format
+msgctxt "the plugin title"
+msgid "Could not determine if updates are available for %s."
+msgstr "%s 无法确定是否有可用的更新。"
+
+#: Puc/v4p3/Plugin/UpdateChecker.php:558
+#, php-format
+msgid "Unknown update checker status \"%s\""
+msgstr "未知的更新检查状态：%s"
+
+#: Puc/v4p3/Vcs/PluginUpdateChecker.php:95
+msgid "There is no changelog available."
+msgstr "没有可用的更新日志。"