1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-08 16:02:39 +01:00

Fix pht method calls

Summary: Ref T7046. This is mainly a proof-of-concept for D11661.

Test Plan: `arc lint`

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin, epriestley

Maniphest Tasks: T7046

Differential Revision: https://secure.phabricator.com/D11683
This commit is contained in:
Joshua Spence 2015-02-10 18:45:30 +11:00
parent d8ba7e6f71
commit 17ec3859cd
6 changed files with 38 additions and 34 deletions

View file

@ -53,20 +53,21 @@ if (!@constant('__LIBPHUTIL__')) {
PhutilTranslator::getInstance()
->addTranslations(array(
'Locally modified path(s) are not included in this revision:' => array(
'%s locally modified path(s) are not included in this revision:' => array(
'A locally modified path is not included in this revision:',
'Locally modified paths are not included in this revision:',
),
'They will NOT be committed. Commit this revision anyway?' => array(
'It will NOT be committed. Commit this revision anyway?',
'They will NOT be committed. Commit this revision anyway?',
'These %s path(s) will NOT be committed. Commit this revision '.
'anyway?' => array(
'This path will NOT be committed. Commit this revision anyway?',
'These paths will NOT be committed. Commit this revision anyway?',
),
'Revision includes changes to path(s) that do not exist:' => array(
'Revision includes changes to %s path(s) that do not exist:' => array(
'Revision includes changes to a path that does not exist:',
'Revision includes changes to paths that do not exist:',
),
'This diff includes file(s) which are not valid UTF-8 (they contain '.
'This diff includes %s file(s) which are not valid UTF-8 (they contain '.
'invalid byte sequences). You can either stop this workflow and fix '.
'these files, or continue. If you continue, these files will be '.
'marked as binary.' => array(
@ -78,23 +79,23 @@ PhutilTranslator::getInstance()
'these files, or continue. If you continue, these files will be '.
'marked as binary.',
),
'AFFECTED FILE(S)' => array('AFFECTED FILE', 'AFFECTED FILES'),
'Do you want to mark these files as binary and continue?' => array(
'%d AFFECTED FILE(S)' => array('AFFECTED FILE', 'AFFECTED FILES'),
'Do you want to mark these %s file(s) as binary and continue?' => array(
'Do you want to mark this file as binary and continue?',
'Do you want to mark these files as binary and continue?',
),
'Do you want to amend these files to the commit?' => array(
'Do you want to amend these %s file(s) to the commit?' => array(
'Do you want to amend this file to the commit?',
'Do you want to amend these files to the commit?',
),
'Do you want to add these files to the commit?' => array(
'Do you want to add these %s file(s) to the commit?' => array(
'Do you want to add this file to the commit?',
'Do you want to add these files to the commit?',
),
'line(s)' => array('line', 'lines'),
'%s line(s)' => array('line', 'lines'),
'%d test(s)' => array('%d test', '%d tests'),

View file

@ -40,7 +40,7 @@ final class ArcanistConfigurationDrivenLintEngine extends ArcanistLintEngine {
));
} catch (PhutilTypeCheckException $ex) {
throw new PhutilProxyException(
pht("Error in parsing '%s' file."),
pht("Error in parsing '%s' file.", $config_path),
$ex);
}

View file

@ -212,11 +212,11 @@ EOTEXT
if ($modified_but_not_included) {
$prefix = pht(
'Locally modified path(s) are not included in this revision:',
count($modified_but_not_included));
'%s locally modified path(s) are not included in this revision:',
new PhutilNumber(count($modified_but_not_included)));
$prompt = pht(
'They will NOT be committed. Commit this revision anyway?',
count($modified_but_not_included));
'These %s path(s) will NOT be committed. Commit this revision anyway?',
new PhutilNumber(count($modified_but_not_included)));
$this->promptFileWarning($prefix, $prompt, $modified_but_not_included);
}
@ -238,8 +238,8 @@ EOTEXT
if ($do_not_exist) {
$prefix = pht(
'Revision includes changes to path(s) that do not exist:',
count($do_not_exist));
'Revision includes changes to %s path(s) that do not exist:',
new PhutilNumber(count($do_not_exist)));
$prompt = 'Commit this revision anyway?';
$this->promptFileWarning($prefix, $prompt, $do_not_exist);
}

View file

@ -118,7 +118,9 @@ EOTEXT
"**%s**\n",
$author);
foreach ($files as $file => $info) {
$line_noun = pht('line(s)', count($info['lines']));
$line_noun = pht(
'%s line(s)',
new PhutilNumber(count($info['lines'])));
$lines = $this->readableSequenceFromLineNumbers($info['lines']);
echo " {$file}: {$line_noun} {$lines}\n";
}

View file

@ -1042,19 +1042,20 @@ EOTEXT
if ($utf8_problems) {
$utf8_warning =
pht(
'This diff includes file(s) which are not valid UTF-8 (they contain '.
'invalid byte sequences). You can either stop this workflow and '.
'fix these files, or continue. If you continue, these files will '.
'be marked as binary.',
count($utf8_problems))."\n\n".
'This diff includes %s file(s) which are not valid UTF-8 (they '.
'contain invalid byte sequences). You can either stop this workflow '.
'and fix these files, or continue. If you continue, these files '.
'will be marked as binary.',
new PhutilNumber(count($utf8_problems))).
"\n\n".
"You can learn more about how Phabricator handles character encodings ".
"(and how to configure encoding settings and detect and correct ".
"encoding problems) by reading 'User Guide: UTF-8 and Character ".
"Encoding' in the Phabricator documentation.\n\n".
" ".pht('AFFECTED FILE(S)', count($utf8_problems))."\n";
" ".pht('%d AFFECTED FILE(S)', count($utf8_problems))."\n";
$confirm = pht(
'Do you want to mark these files as binary and continue?',
count($utf8_problems));
'Do you want to mark these %s file(s) as binary and continue?',
new PhutilNumber(count($utf8_problems)));
echo phutil_console_format("**Invalid Content Encoding (Non-UTF8)**\n");
echo phutil_console_wrap($utf8_warning);

View file

@ -1049,12 +1049,12 @@ abstract class ArcanistWorkflow extends Phobject {
private function getAskForAddPrompt(array $files) {
if ($this->getShouldAmend()) {
$prompt = pht(
'Do you want to amend these files to the commit?',
count($files));
'Do you want to amend these %s file(s) to the commit?',
new PhutilNumber(count($files)));
} else {
$prompt = pht(
'Do you want to add these files to the commit?',
count($files));
'Do you want to add these %s file(s) to the commit?',
new PhutilNumber(count($files)));
}
return $prompt;
}