From 0ca4484525f69ea5e7c5cd28f671364604725e40 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 29 Feb 2016 21:03:32 -0800
Subject: [PATCH] [ticket/12684] Move all lang keys to cli
PHPBB3-12684
---
phpBB/language/en/acp/common.php | 2 --
phpBB/language/en/cli.php | 2 ++
phpBB/phpbb/console/command/user/add.php | 2 +-
tests/console/user/add_test.php | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 300f1c2626..4a70aafc6f 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -309,8 +309,6 @@ $lang = array_merge($lang, array(
'SHOW_ALL_OPERATIONS' => 'Show all operations',
- 'SUCCESS_ADD_USER' => 'Successfully added user %s.',
-
'TASKS_NOT_READY' => 'Not ready tasks:',
'TASKS_READY' => 'Ready tasks:',
'TOTAL_SIZE' => 'Total size',
diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index 6fb637f3c1..dab7e2efdd 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -124,6 +124,8 @@ $lang = array_merge($lang, array(
'CLI_THUMBNAIL_NOTHING_TO_GENERATE' => 'No thumbnails to generate.',
'CLI_THUMBNAIL_NOTHING_TO_DELETE' => 'No thumbnails to delete.',
+
+ 'CLI_USER_ADD_SUCCESS' => 'Successfully added user %s.',
));
// Additional help for commands.
diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php
index 59d9eaa117..6edd214d14 100644
--- a/phpBB/phpbb/console/command/user/add.php
+++ b/phpBB/phpbb/console/command/user/add.php
@@ -197,7 +197,7 @@ class add extends \phpbb\console\command\command
$this->send_activation_email($user_id, $data);
}
- $io->success($this->language->lang('SUCCESS_ADD_USER', $data['username']));
+ $io->success($this->language->lang('CLI_USER_ADD_SUCCESS', $data['username']));
return 0;
}
diff --git a/tests/console/user/add_test.php b/tests/console/user/add_test.php
index 8fc921babf..de146ef6ec 100644
--- a/tests/console/user/add_test.php
+++ b/tests/console/user/add_test.php
@@ -102,7 +102,7 @@ class phpbb_console_command_user_add_test extends phpbb_database_test_case
));
$this->assertNotEquals(null, $this->get_user_id('foo'));
- $this->assertContains('SUCCESS_ADD_USER', $command_tester->getDisplay());
+ $this->assertContains('CLI_USER_ADD_SUCCESS', $command_tester->getDisplay());
}
public function test_add_dialog()
@@ -118,7 +118,7 @@ class phpbb_console_command_user_add_test extends phpbb_database_test_case
));
$this->assertNotEquals(null, $this->get_user_id('bar'));
- $this->assertContains('SUCCESS_ADD_USER', $command_tester->getDisplay());
+ $this->assertContains('CLI_USER_ADD_SUCCESS', $command_tester->getDisplay());
}