Merge branch 'master' into phutil_tag

(Sync.)
2013-02-04 06:19:16 -08:00
parent 8e7af64dd6 5a2be27045
commit 0f1bdbe147
59 changed files with 876 additions and 346 deletions
--- a/src/applications/paste/controller/PhabricatorPasteListController.php
+++ b/src/applications/paste/controller/PhabricatorPasteListController.php
@@ -95,9 +95,8 @@ final class PhabricatorPasteListController extends PhabricatorPasteController {

      $line_count = count(explode("\n", $paste->getContent()));
      $line_count = pht(
-        '%2$s Line(s)',
-        $line_count,
-        PhutilTranslator::getInstance()->formatNumber($line_count));
+        '%s Line(s)',
+        new PhutilNumber($line_count));

      $item = id(new PhabricatorObjectItemView())
        ->setHeader($paste->getFullName())