From bc16bc564eec228cfea92e33a1d0553ed6ee4b6a Mon Sep 17 00:00:00 2001
From: Nikolay Bachiyski
Date: Wed, 21 Apr 2010 10:58:06 +0000
Subject: [PATCH] Upgrader i18n fixes: add translator messages, take tags out
of a message and use the correct error text when including both the title and
the error message
git-svn-id: https://develop.svn.wordpress.org/trunk@14173 602fd350-edb4-49c9-b593-d223f7449a82
---
wp-admin/includes/class-wp-upgrader.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php
index b71d54ec05..56755b4060 100644
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -48,6 +48,7 @@ class WP_Upgrader {
$this->strings['fs_no_content_dir'] = __('Unable to locate WordPress Content directory (wp-content).');
$this->strings['fs_no_plugins_dir'] = __('Unable to locate WordPress Plugin directory.');
$this->strings['fs_no_themes_dir'] = __('Unable to locate WordPress Theme directory.');
+ /* translators: %s: directory name */
$this->strings['fs_no_folder'] = __('Unable to locate needed folder (%s).');
$this->strings['download_failed'] = __('Download failed.');
@@ -1055,7 +1056,7 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
function add_strings() {
$this->upgrader->strings['skin_update_failed_error'] = __('An error occured while updating %1$s: %2$s.');
$this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
- $this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully. Show DetailsHide Details.');
+ $this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully.').' '.__('Show Details').''.__('Hide Details').'.';
}
function feedback($string) {
@@ -1109,7 +1110,7 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
echo '
';
if ( $this->error || ! $this->result ) {
if ( $this->error )
- echo '' . sprintf($this->upgrader->strings['skin_update_failed'], $title, $this->error) . '
';
+ echo '' . sprintf($this->upgrader->strings['skin_update_failed_error'], $title, $this->error) . '
';
else
echo '' . sprintf($this->upgrader->strings['skin_update_failed'], $title) . '
';