[ticket/12656] Use lang keys for all CLI strings

PHPBB3-12656
author: Dhruv <dhruv.goel92@gmail.com> 2014-07-23 01:23:44 +0530
committer: Dhruv <dhruv.goel92@gmail.com> 2014-07-23 01:23:44 +0530
commit: c81438e1f85633dd770fcddd8e332b278338732f (patch)
tree: 87e588947878a0f3c036b91cbe7b15e594cfe913 /phpBB
parent: 4092b63be39453f9a7ce4f985217099ab10aae90 (diff)
download: forums-c81438e1f85633dd770fcddd8e332b278338732f.tar
forums-c81438e1f85633dd770fcddd8e332b278338732f.tar.gz
forums-c81438e1f85633dd770fcddd8e332b278338732f.tar.bz2
forums-c81438e1f85633dd770fcddd8e332b278338732f.tar.xz
forums-c81438e1f85633dd770fcddd8e332b278338732f.zip
11 files changed, 55 insertions, 32 deletions
diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index ea6952d5e4..0c6ee1f1f0 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -35,6 +35,18 @@ if (empty($lang) || !is_array($lang))
 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
 
 $lang = array_merge($lang, array(
+	'CLI_CONFIG_CANNOT_CACHED'			=> 'Set this option if the configuration option changes too frequently to be efficiently cached.',
+	'CLI_CONFIG_CURRENT'				=> 'Current configuration value, use 0 and 1 to specify boolean values',
+	'CLI_CONFIG_DELETE_SUCCESS'			=> 'Successfully deleted config %s.',
+	'CLI_CONFIG_NEW'					=> 'New configuration value, use 0 and 1 to specify boolean values',
+	'CLI_CONFIG_NOT_EXISTS'				=> 'Config %s does not exist',
+	'CLI_CONFIG_OPTION_NAME'			=> 'The configuration option\'s name',
+	'CLI_CONFIG_PRINT_WITHOUT_NEWLINE'	=> 'Set this option if the value should be printed without a new line at the end.',
+	'CLI_CONFIG_INCREMENT_BY'			=> 'Amount to increment by',
+	'CLI_CONFIG_INCREMENT_SUCCESS'		=> 'Successfully incremented config %s',
+	'CLI_CONFIG_SET_FAILURE'			=> 'Could not set config %s',
+	'CLI_CONFIG_SET_SUCCESS'			=> 'Successfully set config %s',
+
 	'CLI_DESCRIPTION_CRON_LIST'					=> 'Prints a list of ready and unready cron jobs.',
 	'CLI_DESCRIPTION_CRON_RUN'					=> 'Runs all ready cron tasks.',
 	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'		=> 'Name of the task to be run',
@@ -51,5 +63,16 @@ $lang = array_merge($lang, array(
 	'CLI_DESCRIPTION_PURGE_EXTENSION'			=> 'Purges the specified extension.',
 	'CLI_DESCRIPTION_RECALCULATE_EMAIL_HASH'	=> 'Recalculates the user_email_hash column of the users table.',
 	'CLI_DESCRIPTION_SET_ATOMIC_CONFIG'			=> 'Sets a configuration option\'s value only if the old matches the current value',
-	'CLI_DESCRIPTION_SET_CONFIG'				=> 'Sets a configuration option\'s value'
+	'CLI_DESCRIPTION_SET_CONFIG'				=> 'Sets a configuration option\'s value',
+
+	'CLI_EXTENSION_DISABLE_FAILURE'		=> 'Could not disable extension %s',
+	'CLI_EXTENSION_DISABLE_SUCCESS'		=> 'Successfully disabled extension %s',
+	'CLI_EXTENSION_ENABLE_FAILURE'		=> 'Could not enable extension %s',
+	'CLI_EXTENSION_ENABLE_SUCCESS'		=> 'Successfully enabled extension %s',
+	'CLI_EXTENSION_NAME'				=> 'Name of the extension',
+	'CLI_EXTENSION_PURGE_FAILURE'		=> 'Could not purge extension %s',
+	'CLI_EXTENSION_PURGE_SUCCESS'		=> 'Successfully purge extension %s',
+	'CLI_EXTENSION_NOT_FOUND'			=> 'No extensions were found.'
+
+	'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS'	=> 'Successfully recalculated all email hashes.'
 ));
diff --git a/phpBB/phpbb/console/command/config/delete.php b/phpBB/phpbb/console/command/config/delete.php
index 2fca8f6831..7923afd182 100644
--- a/phpBB/phpbb/console/command/config/delete.php
+++ b/phpBB/phpbb/console/command/config/delete.php
@@ -29,7 +29,7 @@ class delete extends command
 			->addArgument(
 				'key',
 				InputArgument::REQUIRED,
-				"The configuration option's name"
+				$this->user->lang('CLI_CONFIG_OPTION_NAME')
 			)
 		;
 	}
@@ -53,11 +53,11 @@ class delete extends command
 		{
 			$this->config->delete($key);
 
-			$output->writeln("<info>Successfully deleted config $key</info>");
+			$output->writeln('<info>' . $this->user->lang('CLI_CONFIG_DELETE_SUCCESS', $key) . '</info>');
 		}
 		else
 		{
-			$output->writeln("<error>Config $key does not exist</error>");
+			$output->writeln('<error>' . $this->user->lang('CLI_CONFIG_NOT_EXISTS', $key) . '</error>'');
 		}
 	}
 }
diff --git a/phpBB/phpbb/console/command/config/get.php b/phpBB/phpbb/console/command/config/get.php
index 9734833d23..9c03b49a3d 100644
--- a/phpBB/phpbb/console/command/config/get.php
+++ b/phpBB/phpbb/console/command/config/get.php
@@ -30,13 +30,13 @@ class get extends command
 			->addArgument(
 				'key',
 				InputArgument::REQUIRED,
-				"The configuration option's name"
+				$this->user->lang('CLI_CONFIG_OPTION_NAME')
 			)
 			->addOption(
 				'no-newline',
 				null,
 				InputOption::VALUE_NONE,
-				'Set this option if the value should be printed without a new line at the end.'
+				$this->user->lang('CLI_CONFIG_PRINT_WITHOUT_NEWLINE')
 			)
 		;
 	}
@@ -66,7 +66,7 @@ class get extends command
 		}
 		else
 		{
-			$output->writeln("<error>Could not get config $key</error>");
+			$output->writeln('<error>' . $this->user->lang('CLI_CONFIG_NOT_EXISTS', $key) . '</error>');
 		}
 	}
 }
diff --git a/phpBB/phpbb/console/command/config/increment.php b/phpBB/phpbb/console/command/config/increment.php
index a77b3ab912..0c25075ce8 100644
--- a/phpBB/phpbb/console/command/config/increment.php
+++ b/phpBB/phpbb/console/command/config/increment.php
@@ -30,18 +30,18 @@ class increment extends command
 			->addArgument(
 				'key',
 				InputArgument::REQUIRED,
-				"The configuration option's name"
+				$this->user->lang('CLI_CONFIG_OPTION_NAME')
 			)
 			->addArgument(
 				'increment',
 				InputArgument::REQUIRED,
-				'Amount to increment by'
+				$this->user->lang('CLI_CONFIG_INCREMENT_BY')
 			)
 			->addOption(
 				'dynamic',
 				'd',
 				InputOption::VALUE_NONE,
-				'Set this option if the configuration option changes too frequently to be efficiently cached.'
+				$this->user-lang('CLI_CONFIG_CANNOT_CACHED')
 			)
 		;
 	}
@@ -65,6 +65,6 @@ class increment extends command
 
 		$this->config->increment($key, $increment, $use_cache);
 
-		$output->writeln("<info>Successfully incremented config $key</info>");
+		$output->writeln('<info>' . $this->user->lang('CLI_CONFIG_INCREMENT_SUCCESS', $key) . '</info>');
 	}
 }
diff --git a/phpBB/phpbb/console/command/config/set.php b/phpBB/phpbb/console/command/config/set.php
index a0cc36e02f..695de31013 100644
--- a/phpBB/phpbb/console/command/config/set.php
+++ b/phpBB/phpbb/console/command/config/set.php
@@ -30,18 +30,18 @@ class set extends command
 			->addArgument(
 				'key',
 				InputArgument::REQUIRED,
-				"The configuration option's name"
+				$this->user->lang('CLI_CONFIG_OPTION_NAME')
 			)
 			->addArgument(
 				'value',
 				InputArgument::REQUIRED,
-				'New configuration value, use 0 and 1 to specify boolean values'
+				$this->user->lang('CLI_CONFIG_NEW')
 			)
 			->addOption(
 				'dynamic',
 				'd',
 				InputOption::VALUE_NONE,
-				'Set this option if the configuration option changes too frequently to be efficiently cached.'
+				$this->user->lang('CLI_CONFIG_CANNOT_CACHED')
 			)
 		;
 	}
@@ -65,6 +65,6 @@ class set extends command
 
 		$this->config->set($key, $value, $use_cache);
 
-		$output->writeln("<info>Successfully set config $key</info>");
+		$output->writeln('<info>' . $this->user->lang('CLI_CONFIG_SET_SUCCESS', $key) . '</info>');
 	}
 }
diff --git a/phpBB/phpbb/console/command/config/set_atomic.php b/phpBB/phpbb/console/command/config/set_atomic.php
index 31460d5137..e8c69a0885 100644
--- a/phpBB/phpbb/console/command/config/set_atomic.php
+++ b/phpBB/phpbb/console/command/config/set_atomic.php
@@ -30,23 +30,23 @@ class set_atomic extends command
 			->addArgument(
 				'key',
 				InputArgument::REQUIRED,
-				"The configuration option's name"
+				$this->user->lang('CLI_CONFIG_OPTION_NAME')
 			)
 			->addArgument(
 				'old',
 				InputArgument::REQUIRED,
-				'Current configuration value, use 0 and 1 to specify boolean values'
+				$this->user->lang('CLI_CONFIG_CURRENT')
 			)
 			->addArgument(
 				'new',
 				InputArgument::REQUIRED,
-				'New configuration value, use 0 and 1 to specify boolean values'
+				$this->user->lang('CLI_CONFIG_NEW')
 			)
 			->addOption(
 				'dynamic',
 				'd',
 				InputOption::VALUE_NONE,
-				'Set this option if the configuration option changes too frequently to be efficiently cached.'
+				$this->user->lang('CLI_CONFIG_CANNOT_CACHED')
 			)
 		;
 	}
@@ -72,12 +72,12 @@ class set_atomic extends command
 
 		if ($this->config->set_atomic($key, $old_value, $new_value, $use_cache))
 		{
-			$output->writeln("<info>Successfully set config $key</info>");
+			$output->writeln('<info>' . $this->user->lang('CLI_CONFIG_SET_SUCCESS', $key) . '</info>');
 			return 0;
 		}
 		else
 		{
-			$output->writeln("<error>Could not set config $key</error>");
+			$output->writeln('<error>' . $this->user->lang('CLI_CONFIG_SET_FAILURE', $key) . '</error>');
 			return 1;
 		}
 	}
diff --git a/phpBB/phpbb/console/command/extension/disable.php b/phpBB/phpbb/console/command/extension/disable.php
index ce32105ed5..1eee16cbd9 100644
--- a/phpBB/phpbb/console/command/extension/disable.php
+++ b/phpBB/phpbb/console/command/extension/disable.php
@@ -26,7 +26,7 @@ class disable extends command
 			->addArgument(
 				'extension-name',
 				InputArgument::REQUIRED,
-				'Name of the extension'
+				$this->user->lang('CLI_EXTENSION_NAME')
 			)
 		;
 	}
@@ -39,13 +39,13 @@ class disable extends command
 
 		if ($this->manager->is_enabled($name))
 		{
-			$output->writeln("<error>Could not disable extension $name</error>");
+			$output->writeln('<error>' . $this->user->lang('CLI_EXTENSION_DISABLE_FAILURE', $name) . '</error>');
 			return 1;
 		}
 		else
 		{
 			$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_DISABLE', time(), array($name));
-			$output->writeln("<info>Successfully disabled extension $name</info>");
+			$output->writeln('<info>' . $this->user->lang('CLI_EXTENSION_DISABLE_SUCCESS', $name) . '</info>');
 			return 0;
 		}
 	}
diff --git a/phpBB/phpbb/console/command/extension/enable.php b/phpBB/phpbb/console/command/extension/enable.php
index 001b3e2158..cca4975aa6 100644
--- a/phpBB/phpbb/console/command/extension/enable.php
+++ b/phpBB/phpbb/console/command/extension/enable.php
@@ -26,7 +26,7 @@ class enable extends command
 			->addArgument(
 				'extension-name',
 				InputArgument::REQUIRED,
-				'Name of the extension'
+				$this->user->lang('CLI_EXTENSION_NAME')
 			)
 		;
 	}
@@ -40,12 +40,12 @@ class enable extends command
 		if ($this->manager->is_enabled($name))
 		{
 			$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_ENABLE', time(), array($name));
-			$output->writeln("<info>Successfully enabled extension $name</info>");
+			$output->writeln('<error>' . $this->user->lang('CLI_EXTENSION_ENABLE_FAILURE', $name) . '</error>');
 			return 0;
 		}
 		else
 		{
-			$output->writeln("<error>Could not enable extension $name</error>");
+			$output->writeln('<info>' . $this->user->lang('CLI_EXTENSION_ENABLE_SUCCESS', $name) . '</info>');
 			return 1;
 		}
 	}
diff --git a/phpBB/phpbb/console/command/extension/purge.php b/phpBB/phpbb/console/command/extension/purge.php
index 81d687d07c..517e9a74c9 100644
--- a/phpBB/phpbb/console/command/extension/purge.php
+++ b/phpBB/phpbb/console/command/extension/purge.php
@@ -26,7 +26,7 @@ class purge extends command
 			->addArgument(
 				'extension-name',
 				InputArgument::REQUIRED,
-				'Name of the extension'
+				$this->user->lang('CLI_EXTENSION_NAME')
 			)
 		;
 	}
@@ -39,13 +39,13 @@ class purge extends command
 
 		if ($this->manager->is_enabled($name))
 		{
-			$output->writeln("<error>Could not purge extension $name</error>");
+			$output->writeln('<error>' . $this->user->lang('CLI_EXTENSION_PURGE_FAILURE', $name) . '</error>');
 			return 1;
 		}
 		else
 		{
 			$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_PURGE', time(), array($name));
-			$output->writeln("<info>Successfully purge extension $name</info>");
+			$output->writeln('<info>' . $this->user->lang('CLI_EXTENSION_PURGE_SUCCESS', $name) . '</info>');
 			return 0;
 		}
 	}
diff --git a/phpBB/phpbb/console/command/extension/show.php b/phpBB/phpbb/console/command/extension/show.php
index a6066818db..6ce9607098 100644
--- a/phpBB/phpbb/console/command/extension/show.php
+++ b/phpBB/phpbb/console/command/extension/show.php
@@ -32,7 +32,7 @@ class show extends command
 
 		if (empty($all))
 		{
-			$output->writeln('<comment>No extensions were found.</comment>');
+			$output->writeln('<comment>' . $this->user->lang('CLI_EXTENSION_NOT_FOUND') . '</comment>');
 			return 3;
 		}
 
diff --git a/phpBB/phpbb/console/command/fixup/recalculate_email_hash.php b/phpBB/phpbb/console/command/fixup/recalculate_email_hash.php
index 94f850240e..ec4e1b0ee7 100644
--- a/phpBB/phpbb/console/command/fixup/recalculate_email_hash.php
+++ b/phpBB/phpbb/console/command/fixup/recalculate_email_hash.php
@@ -70,6 +70,6 @@ class recalculate_email_hash extends \phpbb\console\command\command
 		}
 		$this->db->sql_freeresult($result);
 
-		$output->writeln('<info>Successfully recalculated all email hashes.</info>');
+		$output->writeln('<info>' . $this->user->lang('CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS') . '</info>');
 	}
 }
author	Dhruv <dhruv.goel92@gmail.com>	2014-07-23 01:23:44 +0530
committer	Dhruv <dhruv.goel92@gmail.com>	2014-07-23 01:23:44 +0530
commit	c81438e1f85633dd770fcddd8e332b278338732f (patch)
tree	87e588947878a0f3c036b91cbe7b15e594cfe913 /phpBB
parent	4092b63be39453f9a7ce4f985217099ab10aae90 (diff)
download	forums-c81438e1f85633dd770fcddd8e332b278338732f.tar forums-c81438e1f85633dd770fcddd8e332b278338732f.tar.gz forums-c81438e1f85633dd770fcddd8e332b278338732f.tar.bz2 forums-c81438e1f85633dd770fcddd8e332b278338732f.tar.xz forums-c81438e1f85633dd770fcddd8e332b278338732f.zip