1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-17 22:28:46 +01:00

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

PHPBB3-12656
This commit is contained in:
Dhruv 2014-07-23 01:23:44 +05:30
parent 4092b63be3
commit c81438e1f8
11 changed files with 55 additions and 32 deletions

View File

@ -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.'
));

View File

@ -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>'');
}
}
}

View File

@ -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>');
}
}
}

View File

@ -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>');
}
}

View File

@ -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>');
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}

View File

@ -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>');
}
}