Page MenuHomePhabricator
Files F15464697

D11683.id28219.diff
No OneTemporary
Actions

D11683.id28219.diff
View Options

diff --git a/src/lint/engine/ArcanistConfigurationDrivenLintEngine.php b/src/lint/engine/ArcanistConfigurationDrivenLintEngine.php
--- a/src/lint/engine/ArcanistConfigurationDrivenLintEngine.php
+++ b/src/lint/engine/ArcanistConfigurationDrivenLintEngine.php
@@ -40,7 +40,7 @@
));
} catch (PhutilTypeCheckException $ex) {
throw new PhutilProxyException(
- pht("Error in parsing '%s' file."),
+ pht("Error in parsing '%s' file.", $config_path),
$ex);
}
diff --git a/src/workflow/ArcanistCommitWorkflow.php b/src/workflow/ArcanistCommitWorkflow.php
--- a/src/workflow/ArcanistCommitWorkflow.php
+++ b/src/workflow/ArcanistCommitWorkflow.php
@@ -212,11 +212,11 @@
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 @@
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);
}
diff --git a/src/workflow/ArcanistCoverWorkflow.php b/src/workflow/ArcanistCoverWorkflow.php
--- a/src/workflow/ArcanistCoverWorkflow.php
+++ b/src/workflow/ArcanistCoverWorkflow.php
@@ -118,7 +118,9 @@
"**%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";
}
diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
--- a/src/workflow/ArcanistDiffWorkflow.php
+++ b/src/workflow/ArcanistDiffWorkflow.php
@@ -1051,10 +1051,10 @@
"(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);
diff --git a/src/workflow/ArcanistWorkflow.php b/src/workflow/ArcanistWorkflow.php
--- a/src/workflow/ArcanistWorkflow.php
+++ b/src/workflow/ArcanistWorkflow.php
@@ -1049,12 +1049,12 @@
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 file(s) to the commit?',
+ new PhutilNumber(count($files)));
}
return $prompt;
}

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 3, 12:32 PM (2 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7712965
Default Alt Text
D11683.id28219.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility