diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-08-30 18:17:23 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-07-09 09:21:51 +0200 |
| commit | e3e293f5a6b38bb85f57841756a362e26b09088b (patch) | |
| tree | 3d0a7f2fbd0a4359262aa845b3b87dd2c8e2de46 | |
| parent | 96c5165a655062bb12cf8150262459d883911d8c (diff) | |
| download | forums-e3e293f5a6b38bb85f57841756a362e26b09088b.tar forums-e3e293f5a6b38bb85f57841756a362e26b09088b.tar.gz forums-e3e293f5a6b38bb85f57841756a362e26b09088b.tar.bz2 forums-e3e293f5a6b38bb85f57841756a362e26b09088b.tar.xz forums-e3e293f5a6b38bb85f57841756a362e26b09088b.zip | |
[ticket/12692] Cleanup language file
PHPBB3-12692
| -rw-r--r-- | phpBB/language/en/cli.php | 15 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/thumbnail/delete.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/thumbnail/generate.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/thumbnail/recreate.php | 4 |
4 files changed, 15 insertions, 16 deletions
diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index 28fae83d5f..d494ef8c55 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -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 // eg: big_image.png (2_a51529ae7932008cf8454a95af84cacd) generated. - 'THUMBNAIL_DELETED' => '%1$s (%2$s) deleted.', - 'THUMBNAIL_SKIPPED' => '%1$s (%2$s) skipped.', - 'THUMBNAIL_GENERATED' => '%1$s (%2$s) generated.', + 'CLI_THUMBNAIL_DELETED' => '%1$s (%2$s) deleted.', + 'CLI_THUMBNAIL_DELETING' => 'Deleting thumbnails…', + '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…', - 'THUMBNAIL_GENERATING' => 'Generating thumbnails…', - - 'NO_THUMBNAIL_TO_GENERATE' => 'No thumbnails to generate.', - 'NO_THUMBNAIL_TO_DELETE' => 'No thumbnails to delete.', + 'CLI_THUMBNAIL_NOTHING_TO_GENERATE' => 'No thumbnails to generate.', + 'CLI_THUMBNAIL_NOTHING_TO_DELETE' => 'No thumbnails to delete.', )); diff --git a/phpBB/phpbb/console/command/thumbnail/delete.php b/phpBB/phpbb/console/command/thumbnail/delete.php index 3a60271fc2..fb63f7c510 100644 --- a/phpBB/phpbb/console/command/thumbnail/delete.php +++ b/phpBB/phpbb/console/command/thumbnail/delete.php @@ -77,7 +77,7 @@ class delete extends \phpbb\console\command\command 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; } @@ -110,7 +110,7 @@ class delete extends \phpbb\console\command\command 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 @@ -118,7 +118,7 @@ class delete extends \phpbb\console\command\command if ($input->getOption('verbose')) { $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>'); } } diff --git a/phpBB/phpbb/console/command/thumbnail/generate.php b/phpBB/phpbb/console/command/thumbnail/generate.php index d7530881f1..0f4a40bd9f 100644 --- a/phpBB/phpbb/console/command/thumbnail/generate.php +++ b/phpBB/phpbb/console/command/thumbnail/generate.php @@ -93,7 +93,7 @@ class generate extends \phpbb\console\command\command 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; } @@ -135,14 +135,14 @@ class generate extends \phpbb\console\command\command 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 { 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>'); } } } diff --git a/phpBB/phpbb/console/command/thumbnail/recreate.php b/phpBB/phpbb/console/command/thumbnail/recreate.php index ec093161af..5d3edbd699 100644 --- a/phpBB/phpbb/console/command/thumbnail/recreate.php +++ b/phpBB/phpbb/console/command/thumbnail/recreate.php @@ -54,7 +54,7 @@ class recreate extends \phpbb\console\command\command $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); $return = $this->getApplication()->run($input_delete, $output); @@ -63,7 +63,7 @@ class recreate extends \phpbb\console\command\command $parameters['command'] = 'thumbnail:generate'; $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); $return = $this->getApplication()->run($input_create, $output); } |