revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-12-23 05:50:54 +01:00
Code Issues Releases Wiki Activity

Various translation improvements

Browse source 
Summary: Depends on D14070.

Test Plan: Eyeball it.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D14072
This commit is contained in:
Joshua Spence 2015-11-02 21:28:15 +11:00
parent d12bcdc683
commit 2db40f9953
8 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/internationalization/ArcanistUSEnglishTranslation.php
View file

@ -34,7 +34,7 @@ final class ArcanistUSEnglishTranslation extends PhutilTranslation {
'these files, or continue. If you continue, these files will be '.
'marked as binary.',
),
'%d AFFECTED FILE(S)' => array('AFFECTED FILE', 'AFFECTED FILES'),
'%s 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?',
@ -57,11 +57,9 @@ final class ArcanistUSEnglishTranslation extends PhutilTranslation {
'%s line(s)' => array('line', 'lines'),
'%d test(s)' => array('%d test', '%d tests'),
'%d assertion(s) passed.' => array(
'%d assertion passed.',
'%d assertions passed.',
'%s assertion(s) passed.' => array(
'%s assertion passed.',
'%s assertions passed.',
),
'Ignore these %s untracked file(s) and continue?' => array(

5
src/unit/engine/phutil/PhutilTestCase.php
View file

@ -490,7 +490,10 @@ abstract class PhutilTestCase extends Phobject {
call_user_func_array(
array($this, $name),
array());
$this->passTest(pht('%d assertion(s) passed.', $this->assertions));
$this->passTest(
pht(
'%s assertion(s) passed.',
new PhutilNumber($this->assertions)));
} catch (Exception $ex) {
$exceptions['Execution'] = $ex;
}

10
src/upload/ArcanistFileUploader.php
View file

@ -245,14 +245,14 @@ final class ArcanistFileUploader extends Phobject {
if ($done) {
$this->writeStatus(
pht(
'Resuming upload (%d of %d chunks remain).',
new PhutilNumber(count($remaining)),
new PhutilNumber(count($chunks))));
'Resuming upload (%s of %s chunks remain).',
phutil_count($remaining),
phutil_count($chunks)));
} else {
$this->writeStatus(
pht(
'Uploading chunks (%d chunks to upload).',
new PhutilNumber(count($remaining))));
'Uploading chunks (%s chunks to upload).',
phutil_count($remaining)));
}
$progress = new PhutilConsoleProgressBar();

6
src/workflow/ArcanistCommitWorkflow.php
View file

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

2
src/workflow/ArcanistCoverWorkflow.php
View file

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

10
src/workflow/ArcanistDiffWorkflow.php
View file

@ -962,7 +962,7 @@ EOTEXT
'works best for changes which will receive detailed human review, '.
'and not as well for large automated changes or bulk checkins. '.
'See %s for information about reviewing big checkins. Continue anyway?',
new PhutilNumber(count($changes)),
phutil_count($changes),
'https://secure.phabricator.com/book/phabricator/article/'.
'differential_large_changes/');
@ -1070,18 +1070,18 @@ EOTEXT
'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))),
phutil_count($utf8_problems)),
pht(
"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."),
pht(
'%d AFFECTED FILE(S)',
count($utf8_problems)));
'%s AFFECTED FILE(S)',
phutil_count($utf8_problems)));
$confirm = pht(
'Do you want to mark these %s file(s) as binary and continue?',
new PhutilNumber(count($utf8_problems)));
phutil_count($utf8_problems));
echo phutil_console_format(
"**%s**\n",

10
src/workflow/ArcanistUploadWorkflow.php
View file

@ -143,14 +143,14 @@ EOTEXT
if ($done) {
$this->writeStatus(
pht(
'Resuming upload (%d of %d chunks remain).',
new PhutilNumber(count($remaining)),
new PhutilNumber(count($chunks))));
'Resuming upload (%s of %s chunks remain).',
phutil_count($remaining),
phutil_count($chunks)));
} else {
$this->writeStatus(
pht(
'Uploading chunks (%d chunks to upload).',
new PhutilNumber(count($remaining))));
'Uploading chunks (%s chunks to upload).',
phutil_count($remaining)));
}
$progress = new PhutilConsoleProgressBar();

12
src/workflow/ArcanistWorkflow.php
View file

@ -938,17 +938,17 @@ abstract class ArcanistWorkflow extends Phobject {
if ($api instanceof ArcanistGitAPI) {
$hint = pht(
'(To ignore these %s change(s), add them to "%s".)',
new PhutilNumber(count($untracked)),
phutil_count($untracked),
'.git/info/exclude');
} else if ($api instanceof ArcanistSubversionAPI) {
$hint = pht(
'(To ignore these %s change(s), add them to "%s".)',
new PhutilNumber(count($untracked)),
phutil_count($untracked),
'svn:ignore');
} else if ($api instanceof ArcanistMercurialAPI) {
$hint = pht(
'(To ignore these %s change(s), add them to "%s".)',
new PhutilNumber(count($untracked)),
phutil_count($untracked),
'.hgignore');
}
@ -961,7 +961,7 @@ abstract class ArcanistWorkflow extends Phobject {
$prompt = pht(
'Ignore these %s untracked file(s) and continue?',
new PhutilNumber(count($untracked)));
phutil_count($untracked));
if (!phutil_console_confirm($prompt)) {
throw new ArcanistUserAbortException();
@ -1150,11 +1150,11 @@ abstract class ArcanistWorkflow extends Phobject {
if ($this->getShouldAmend()) {
$prompt = pht(
'Do you want to amend these %s change(s) to the current commit?',
new PhutilNumber(count($files)));
phutil_count($files));
} else {
$prompt = pht(
'Do you want to create a new commit with these %s change(s)?',
new PhutilNumber(count($files)));
phutil_count($files));
}
return $prompt;
}