archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into redesign-2015

Browse Source
This commit is contained in:
epriestley
2015-05-22 12:57:32 -07:00
parent 11ed4e4f21 36e2d02d6e
commit bfca11dbba
1126 changed files with 9507 additions and 7076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/applications/diffusion/controller/DiffusionCommitController.php
View File

@@ -83,10 +83,12 @@ final class DiffusionCommitController extends DiffusionController {
$error_panel->setTitle(pht('Commit Not Tracked'));
$error_panel->setSeverity(PHUIInfoView::SEVERITY_WARNING);
$error_panel->appendChild(
pht("This Diffusion repository is configured to track only one ".
"subdirectory of the entire Subversion repository, and this commit ".
"didn't affect the tracked subdirectory ('%s'), so no ".
"information is available.", $subpath));
pht(
"This Diffusion repository is configured to track only one ".
"subdirectory of the entire Subversion repository, and this commit ".
"didn't affect the tracked subdirectory ('%s'), so no ".
"information is available.",
$subpath));
$content[] = $error_panel;
} else {
$engine = PhabricatorMarkupEngine::newDifferentialMarkupEngine();
@@ -238,7 +240,7 @@ final class DiffusionCommitController extends DiffusionController {
$change_panel = new PHUIObjectBoxView();
$header = new PHUIHeaderView();
$header->setHeader('Changes ('.number_format($count).')');
$header->setHeader(pht('Changes (%d', number_format($count)));
$change_panel->setID('toc');
if ($count > self::CHANGES_LIMIT && !$show_all_details) {
@@ -253,7 +255,7 @@ final class DiffusionCommitController extends DiffusionController {
$warning_view = id(new PHUIInfoView())
->setSeverity(PHUIInfoView::SEVERITY_WARNING)
->setTitle('Very Large Commit')
->setTitle(pht('Very Large Commit'))
->appendChild(
pht('This commit is very large. Load each file individually.'));
@@ -280,7 +282,7 @@ final class DiffusionCommitController extends DiffusionController {
$vcs_supports_directory_changes = false;
break;
default:
throw new Exception('Unknown VCS.');
throw new Exception(pht('Unknown VCS.'));
}
$references = array();
@@ -901,8 +903,8 @@ final class DiffusionCommitController extends DiffusionController {
$caption->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
$caption->appendChild(
pht(
'This commit merges a very large number of changes. Only the first '.
'%s are shown.',
'This commit merges a very large number of changes. '.
'Only the first %s are shown.',
new PhutilNumber($limit)));
}