From 71ef48b3e519481b8026c20d7d705b9ef9ba727b Mon Sep 17 00:00:00 2001 From: epriestley Date: Fri, 18 Apr 2014 17:52:11 -0700 Subject: [PATCH] When a diff has 12,345 lines, render "12,345 lines" instead of "12 lines" Summary: This `%d` should be a `%s`, since the `PhutilNumber` value may get formatted according to locale settings. Test Plan: will make @zeeg Reviewers: btrahan Reviewed By: btrahan Subscribers: epriestley, zeeg Differential Revision: https://secure.phabricator.com/D8814 --- .../differential/editor/DifferentialTransactionEditor.php | 2 +- .../translation/PhabricatorBaseEnglishTranslation.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php index f7bf8230ac..c26899e4ea 100644 --- a/src/applications/differential/editor/DifferentialTransactionEditor.php +++ b/src/applications/differential/editor/DifferentialTransactionEditor.php @@ -1070,7 +1070,7 @@ final class DifferentialTransactionEditor switch ($strongest->getTransactionType()) { case DifferentialTransaction::TYPE_UPDATE: $count = new PhutilNumber($object->getLineCount()); - $action = pht('%s, %d line(s)', $action, $count); + $action = pht('%s, %s line(s)', $action, $count); break; } diff --git a/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php index a9f9395358..1aa34b1d43 100644 --- a/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php +++ b/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php @@ -856,9 +856,9 @@ abstract class PhabricatorBaseEnglishTranslation '%d older changes are hidden.', ), - '%s, %d line(s)' => array( - '%s, %d line', - '%s, %d lines', + '%s, %s line(s)' => array( + '%s, %s line', + '%s, %s lines', ), '%s pushed %d commit(s) to %s.' => array(