Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13191336
D11683.id28118.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
3 KB
Referenced Files
None
Subscribers
None
D11683.id28118.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,9 @@
if ($modified_but_not_included) {
$prefix = pht(
- 'Locally modified path(s) are not included in this revision:',
- count($modified_but_not_included));
+ 'Locally modified path(s) are not included in this revision:');
$prompt = pht(
- 'They will NOT be committed. Commit this revision anyway?',
- count($modified_but_not_included));
+ 'They will NOT be committed. Commit this revision anyway?');
$this->promptFileWarning($prefix, $prompt, $modified_but_not_included);
}
@@ -237,9 +235,7 @@
}
if ($do_not_exist) {
- $prefix = pht(
- 'Revision includes changes to path(s) that do not exist:',
- count($do_not_exist));
+ $prefix = pht('Revision includes changes to path(s) that 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,7 @@
"**%s**\n",
$author);
foreach ($files as $file => $info) {
- $line_noun = pht('line(s)', count($info['lines']));
+ $line_noun = pht('%d line(s)', 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,8 @@
"(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";
- $confirm = pht(
- 'Do you want to mark these files as binary and continue?',
- count($utf8_problems));
+ " ".pht('%d AFFECTED FILE(S)', count($utf8_problems))."\n";
+ $confirm = pht('Do you want to mark these files as binary and continue?');
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
@@ -1048,13 +1048,9 @@
private function getAskForAddPrompt(array $files) {
if ($this->getShouldAmend()) {
- $prompt = pht(
- 'Do you want to amend these files to the commit?',
- count($files));
+ $prompt = pht('Do you want to amend these files to the commit?');
} else {
- $prompt = pht(
- 'Do you want to add these files to the commit?',
- count($files));
+ $prompt = pht('Do you want to add these files to the commit?');
}
return $prompt;
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, May 12, 7:36 PM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6291701
Default Alt Text
D11683.id28118.diff (3 KB)
Attached To
Mode
D11683: Fix `pht` method calls
Attached
Detach File
Event Timeline
Log In to Comment