From 01236dcaf04654aff25a39cad17d7b633dd089c5 Mon Sep 17 00:00:00 2001 From: vrana Date: Thu, 31 Jan 2013 08:44:21 -0800 Subject: [PATCH] Use PhutilNumber in translations Summary: It's a little bit confusing that you couldn't use %d but kind of expected taken that the number will be formatted so it's not a number anymore. Test Plan: /paste/ Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D4764 --- .../DifferentialRevisionViewController.php | 5 ++--- .../controller/DiffusionBrowseFileController.php | 7 +++---- .../controller/PhabricatorPasteListController.php | 5 ++--- .../PhabricatorBaseEnglishTranslation.php | 12 ++++++------ 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php index 1dffc8ff1b..5593053e22 100644 --- a/src/applications/differential/controller/DifferentialRevisionViewController.php +++ b/src/applications/differential/controller/DifferentialRevisionViewController.php @@ -182,10 +182,9 @@ final class DifferentialRevisionViewController extends DifferentialController { $warning->setSeverity(AphrontErrorView::SEVERITY_WARNING); $warning->appendChild( pht( - 'This diff is very large and affects %2$s files. Load each file '. + 'This diff is very large and affects %s files. Load each file '. 'individually.', - $count, - PhutilTranslator::getInstance()->formatNumber($count)). + new PhutilNumber($count)). " ". phutil_render_tag( 'a', diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php index e3f5592426..ac1e0abb80 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php @@ -807,10 +807,9 @@ final class DiffusionBrowseFileController extends DiffusionController { $size = strlen($data); $properties->addTextContent( - pht('This is a binary file. It is %2$s byte(s) in length.', - $size, - PhutilTranslator::getInstance()->formatNumber($size)) - ); + pht( + 'This is a binary file. It is %s byte(s) in length.', + new PhutilNumber($size))); $actions = id(new PhabricatorActionListView()) ->setUser($this->getRequest()->getUser()) diff --git a/src/applications/paste/controller/PhabricatorPasteListController.php b/src/applications/paste/controller/PhabricatorPasteListController.php index 32194daed1..d6c6b8eb4a 100644 --- a/src/applications/paste/controller/PhabricatorPasteListController.php +++ b/src/applications/paste/controller/PhabricatorPasteListController.php @@ -94,9 +94,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()) diff --git a/src/infrastructure/internationalization/PhabricatorBaseEnglishTranslation.php b/src/infrastructure/internationalization/PhabricatorBaseEnglishTranslation.php index 8b102e0822..ced807deff 100644 --- a/src/infrastructure/internationalization/PhabricatorBaseEnglishTranslation.php +++ b/src/infrastructure/internationalization/PhabricatorBaseEnglishTranslation.php @@ -167,9 +167,9 @@ abstract class PhabricatorBaseEnglishTranslation '%d Lint Messages', ), - 'This is a binary file. It is %2$s byte(s) in length.' => array( - 'This is a binary file. It is %2$s byte in length.', - 'This is a binary file. It is %2$s bytes in length.', + 'This is a binary file. It is %s byte(s) in length.' => array( + 'This is a binary file. It is %s byte in length.', + 'This is a binary file. It is %s bytes in length.', ), '%d Action(s) Have No Effect' => array( @@ -226,9 +226,9 @@ abstract class PhabricatorBaseEnglishTranslation ), ), - '%2$s Line(s)' => array( - '%2$s Line', - '%2$s Lines', + '%s Line(s)' => array( + '%s Line', + '%s Lines', ), "Indexing %d object(s) of type %s." => array(