makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12692] Cleanup language file

Browse source 
PHPBB3-12692
This commit is contained in:
Tristan Darricau 2014-08-30 18:17:23 +02:00 • committed by Tristan Darricau
parent 96c5165a65
commit e3e293f5a6
4 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/language/en/cli.php
View file

@ -93,13 +93,12 @@ $lang = array_merge($lang, array(
// In all the case %1$s is the logical name of the file and %2$s the real name on the filesystem // In all the case %1$s is the logical name of the file and %2$s the real name on the filesystem
// eg: big_image.png (2_a51529ae7932008cf8454a95af84cacd) generated. // eg: big_image.png (2_a51529ae7932008cf8454a95af84cacd) generated.
'THUMBNAIL_DELETED' => '%1$s (%2$s) deleted.', 'CLI_THUMBNAIL_DELETED' => '%1$s (%2$s) deleted.',
'THUMBNAIL_SKIPPED' => '%1$s (%2$s) skipped.', 'CLI_THUMBNAIL_DELETING' => 'Deleting thumbnails…',
'THUMBNAIL_GENERATED' => '%1$s (%2$s) generated.', 'CLI_THUMBNAIL_SKIPPED' => '%1$s (%2$s) skipped.',
'CLI_THUMBNAIL_GENERATED' => '%1$s (%2$s) generated.',
'CLI_THUMBNAIL_GENERATING' => 'Generating thumbnails…',
'THUMBNAIL_DELETING' => 'Deleting thumbnails…', 'CLI_THUMBNAIL_NOTHING_TO_GENERATE' => 'No thumbnails to generate.',
'THUMBNAIL_GENERATING' => 'Generating thumbnails…', 'CLI_THUMBNAIL_NOTHING_TO_DELETE' => 'No thumbnails to delete.',
'NO_THUMBNAIL_TO_GENERATE' => 'No thumbnails to generate.',
'NO_THUMBNAIL_TO_DELETE' => 'No thumbnails to delete.',
)); ));

6
phpBB/phpbb/console/command/thumbnail/delete.php
View file

@ -77,7 +77,7 @@ class delete extends \phpbb\console\command\command
if ($nb_missing_thumbnails === 0) if ($nb_missing_thumbnails === 0)
{ {
$output->writeln('<info>' . $this->user->lang('NO_THUMBNAIL_TO_DELETE') . '</info>'); $output->writeln('<info>' . $this->user->lang('CLI_THUMBNAIL_NOTHING_TO_DELETE') . '</info>');
return 0; return 0;
} }
@ -110,7 +110,7 @@ class delete extends \phpbb\console\command\command
if ($input->getOption('verbose')) if ($input->getOption('verbose'))
{ {
$output->writeln($this->user->lang('THUMBNAIL_DELETED', $row['real_filename'], $row['physical_filename'])); $output->writeln($this->user->lang('CLI_THUMBNAIL_DELETED', $row['real_filename'], $row['physical_filename']));
} }
} }
else else
@ -118,7 +118,7 @@ class delete extends \phpbb\console\command\command
if ($input->getOption('verbose')) if ($input->getOption('verbose'))
{ {
$return = 1; $return = 1;
$output->writeln('<error>' . $this->user->lang('THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . '</error>'); $output->writeln('<error>' . $this->user->lang('CLI_THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . '</error>');
} }
} }

6
phpBB/phpbb/console/command/thumbnail/generate.php
View file

@ -93,7 +93,7 @@ class generate extends \phpbb\console\command\command
if ($nb_missing_thumbnails === 0) if ($nb_missing_thumbnails === 0)
{ {
$output->writeln('<info>' . $this->user->lang('NO_THUMBNAIL_TO_GENERATE') . '</info>'); $output->writeln('<info>' . $this->user->lang('CLI_THUMBNAIL_NOTHING_TO_GENERATE') . '</info>');
return 0; return 0;
} }
@ -135,14 +135,14 @@ class generate extends \phpbb\console\command\command
if ($input->getOption('verbose')) if ($input->getOption('verbose'))
{ {
$output->writeln($this->user->lang('THUMBNAIL_GENERATED', $row['real_filename'], $row['physical_filename'])); $output->writeln($this->user->lang('CLI_THUMBNAIL_GENERATED', $row['real_filename'], $row['physical_filename']));
} }
} }
else else
{ {
if ($input->getOption('verbose')) if ($input->getOption('verbose'))
{ {
$output->writeln('<info>' . $this->user->lang('THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . '</info>'); $output->writeln('<info>' . $this->user->lang('CLI_THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . '</info>');
} }
} }
} }

4
phpBB/phpbb/console/command/thumbnail/recreate.php
View file

@ -54,7 +54,7 @@ class recreate extends \phpbb\console\command\command
$this->getApplication()->setAutoExit(false); $this->getApplication()->setAutoExit(false);
$output->writeln('<comment>' . $this->user->lang('THUMBNAIL_DELETING') . '</comment>'); $output->writeln('<comment>' . $this->user->lang('CLI_THUMBNAIL_DELETING') . '</comment>');
$input_delete = new ArrayInput($parameters); $input_delete = new ArrayInput($parameters);
$return = $this->getApplication()->run($input_delete, $output); $return = $this->getApplication()->run($input_delete, $output);
@ -63,7 +63,7 @@ class recreate extends \phpbb\console\command\command
$parameters['command'] = 'thumbnail:generate'; $parameters['command'] = 'thumbnail:generate';
$output->writeln(''); $output->writeln('');
$output->writeln('<comment>' . $this->user->lang('THUMBNAIL_GENERATING') . '</comment>'); $output->writeln('<comment>' . $this->user->lang('CLI_THUMBNAIL_GENERATING') . '</comment>');
$input_create = new ArrayInput($parameters); $input_create = new ArrayInput($parameters);
$return = $this->getApplication()->run($input_create, $output); $return = $this->getApplication()->run($input_create, $output);
} }