Refs #1320. Updated core to use elgg_echo()'s native string replacement.

git-svn-id: http://code.elgg.org/elgg/trunk@7227 36083f99-b078-4883-b0ff-0f9b5a30f544

7 files changed, 13 insertions, 12 deletions

diff --git a/actions/admin/plugins/disable.php b/actions/admin/plugins/disable.php
index 48116e43a..9db5aec11 100644
--- a/actions/admin/plugins/disable.php
+++ b/actions/admin/plugins/disable.php
@@ -20,10 +20,11 @@ if (!is_array($plugin)) {
 
 foreach ($plugin as $p) {
 	if (disable_plugin($p)) {
-		system_message(sprintf(elgg_echo('admin:plugins:disable:yes'), $p));
+		system_message(elgg_echo('admin:plugins:disable:yes', array($p)));
+
 		elgg_delete_admin_notice('first_installation_plugin_reminder');
 	} else {
-		register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p));
+		register_error(elgg_echo('admin:plugins:disable:no', array($p)));
 	}
 }
 
diff --git a/actions/admin/plugins/disableall.php b/actions/admin/plugins/disableall.php
index bd68c17b1..21938727e 100644
--- a/actions/admin/plugins/disableall.php
+++ b/actions/admin/plugins/disableall.php
@@ -16,9 +16,9 @@ $plugins = get_installed_plugins();
 foreach ($plugins as $p => $data) {
 	if (disable_plugin($p)) {
 		elgg_delete_admin_notice('first_installation_plugin_reminder');
-		system_message(sprintf(elgg_echo('admin:plugins:disable:yes'), $p));
+		system_message(elgg_echo('admin:plugins:disable:yes', array($p)));
 	} else {
-		register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p));
+		register_error(elgg_echo('admin:plugins:disable:no', array($p)));
 	}
 }
 
diff --git a/actions/admin/plugins/enable.php b/actions/admin/plugins/enable.php
index b15666093..d3ad5606d 100644
--- a/actions/admin/plugins/enable.php
+++ b/actions/admin/plugins/enable.php
@@ -22,9 +22,9 @@ if (!is_array($plugin)) {
 foreach ($plugin as $p) {
 	if (enable_plugin($p)) {
 		elgg_delete_admin_notice('first_installation_plugin_reminder');
-		system_message(sprintf(elgg_echo('admin:plugins:enable:yes'), $p));
+		system_message(elgg_echo('admin:plugins:enable:yes', array($p)));
 	} else {
-		register_error(sprintf(elgg_echo('admin:plugins:enable:no'), $p));
+		register_error(elgg_echo('admin:plugins:enable:no', array($p)));
 	}
 }
 
diff --git a/actions/admin/plugins/enableall.php b/actions/admin/plugins/enableall.php
index b959c235f..9a2df00dc 100644
--- a/actions/admin/plugins/enableall.php
+++ b/actions/admin/plugins/enableall.php
@@ -16,9 +16,9 @@ $plugins = get_installed_plugins();
 foreach ($plugins as $p => $data) {
 	if (enable_plugin($p)) {
 		elgg_delete_admin_notice('first_installation_plugin_reminder');
-		system_message(sprintf(elgg_echo('admin:plugins:enable:yes'), $p));
+		system_message(elgg_echo('admin:plugins:enable:yes', array($p)));
 	} else {
-		register_error(sprintf(elgg_echo('admin:plugins:enable:no'), $p));
+		register_error(elgg_echo('admin:plugins:enable:no', array($p)));
 	}
 }
 
diff --git a/actions/admin/plugins/reorder.php b/actions/admin/plugins/reorder.php
index e3c65f6e5..2158653e1 100644
--- a/actions/admin/plugins/reorder.php
+++ b/actions/admin/plugins/reorder.php
@@ -40,9 +40,9 @@ if ($key = array_search($mod, $plugins)) {
 // Disable
 if (regenerate_plugin_list($plugins)) {
 	elgg_delete_admin_notice('first_installation_plugin_reminder');
-	system_message(sprintf(elgg_echo('admin:plugins:reorder:yes'), $plugin));
+	system_message(elgg_echo('admin:plugins:reorder:yes', array($plugin)));
 } else {
-	register_error(sprintf(elgg_echo('admin:plugins:reorder:no'), $plugin));
+	register_error(elgg_echo('admin:plugins:reorder:no', array($plugin)));
 }
 
 // don't regenerate the simplecache because the plugin won't be
diff --git a/actions/admin/user/delete.php b/actions/admin/user/delete.php
index 375f8b809..e8d835722 100644
--- a/actions/admin/user/delete.php
+++ b/actions/admin/user/delete.php
@@ -22,7 +22,7 @@ $username = $obj->username;
 
 if (($obj instanceof ElggUser) && ($obj->canEdit())) {
 	if ($obj->delete()) {
-		system_message(sprintf(elgg_echo('admin:user:delete:yes'), $name));
+		system_message(elgg_echo('admin:user:delete:yes', array($name)));
 	} else {
 		register_error(elgg_echo('admin:user:delete:no'));
 	}
diff --git a/actions/admin/user/resetpassword.php b/actions/admin/user/resetpassword.php
index 46a983c86..24127eb8b 100644
--- a/actions/admin/user/resetpassword.php
+++ b/actions/admin/user/resetpassword.php
@@ -32,7 +32,7 @@ if (($obj instanceof ElggUser) && ($obj->canEdit())) {
 		notify_user($obj->guid,
 			$CONFIG->site->guid,
 			elgg_echo('email:resetpassword:subject'),
-			sprintf(elgg_echo('email:resetpassword:body'), $obj->username, $password),
+			elgg_echo('email:resetpassword:body', array($obj->username, $password)),
 			NULL,
 			'email');
 	} else {