Merge branch 'master' into redesign-2015

2015-05-28 11:56:49 -07:00
parent f1dd3d0e9c 5aa4044a9d
commit 3699253e49
127 changed files with 3234 additions and 2575 deletions
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -240,10 +240,10 @@ final class DiffusionCommitController extends DiffusionController {

      $change_panel = new PHUIObjectBoxView();
      $header = new PHUIHeaderView();
-      $header->setHeader(pht('Changes (%d', number_format($count)));
+      $header->setHeader(pht('Changes (%s)', new PhutilNumber($count)));
      $change_panel->setID('toc');
-      if ($count > self::CHANGES_LIMIT && !$show_all_details) {

+      if ($count > self::CHANGES_LIMIT && !$show_all_details) {
        $icon = id(new PHUIIconView())
          ->setIconFont('fa-files-o');