Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F14611635
D11683.id28248.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
7 KB
Referenced Files
None
Subscribers
None
D11683.id28248.diff
View Options
diff --git a/scripts/__init_script__.php b/scripts/__init_script__.php
--- a/scripts/__init_script__.php
+++ b/scripts/__init_script__.php
@@ -53,23 +53,24 @@
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 '.
- '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(
+ '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(
'This diff includes a file which is not valid UTF-8 (it has invalid '.
'byte sequences). You can either stop this workflow and fix it, or '.
'continue. If you continue, this file will be marked as binary.',
@@ -78,23 +79,23 @@
'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'),
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
@@ -1042,19 +1042,20 @@
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);
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 %s file(s) to the commit?',
+ new PhutilNumber(count($files)));
}
return $prompt;
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Jan 10, 11:52 AM (13 h, 28 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6982637
Default Alt Text
D11683.id28248.diff (7 KB)
Attached To
Mode
D11683: Fix `pht` method calls
Attached
Detach File
Event Timeline
Log In to Comment