diff --git a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php --- a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php +++ b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php @@ -69,9 +69,9 @@ } $message = $message."\n\n".pht( - 'This configuration value is defined in these %d '. + 'This configuration value is defined in these %s '. 'configuration source(s): %s.', - count($found), + phutil_count($found), implode(', ', $found)); $issue->setMessage($message); diff --git a/src/applications/config/view/PhabricatorSetupIssueView.php b/src/applications/config/view/PhabricatorSetupIssueView.php --- a/src/applications/config/view/PhabricatorSetupIssueView.php +++ b/src/applications/config/view/PhabricatorSetupIssueView.php @@ -259,9 +259,9 @@ 'p', array(), pht( - 'To update these %d value(s), run these command(s) from the command '. + 'To update these %s value(s), run these command(s) from the command '. 'line:', - count($configs))); + phutil_count($configs))); $update = array(); foreach ($configs as $key) { @@ -291,12 +291,16 @@ $update_info = phutil_tag( 'p', array(), - pht('You can update these %d value(s) here:', count($configs))); + pht( + 'You can update these %d value(s) here:', + count($configs))); } else { $update_info = phutil_tag( 'p', array(), - pht('These %d configuration value(s) are related:', count($configs))); + pht( + 'These %s configuration value(s) are related:', + phutil_count($configs))); } } else { $update = null; @@ -386,8 +390,8 @@ 'p', array(), pht( - 'PHP also loaded these %s configuration file(s):', - phutil_count($more_loc))); + 'PHP also loaded these %d configuration file(s):', + count($more_loc))); $info[] = phutil_tag( 'pre', array(), diff --git a/src/applications/differential/mail/DifferentialCreateMailReceiver.php b/src/applications/differential/mail/DifferentialCreateMailReceiver.php --- a/src/applications/differential/mail/DifferentialCreateMailReceiver.php +++ b/src/applications/differential/mail/DifferentialCreateMailReceiver.php @@ -76,8 +76,8 @@ PhabricatorEnv::getEnvConfig('metamta.differential.subject-prefix'); if (count($diffs)) { $subject = pht( - 'You successfully created %d diff(s).', - count($diffs)); + 'You successfully created %s diff(s).', + phutil_count($diffs)); } else { $subject = pht( 'Diff creation failed; see body for %s error(s).', diff --git a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php --- a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php +++ b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php @@ -498,9 +498,11 @@ if ($is_large_block) { $is_first_block = ($top == 0); if ($is_first_block) { - $text = pht('Show First %d Line(s)', $block_size); + $text = pht('Show First %s Line(s)', new PhutilNumber($block_size)); } else { - $text = pht("\xE2\x96\xB2 Show %d Line(s)", $block_size); + $text = pht( + "\xE2\x96\xB2 Show %s Line(s)", + new PhutilNumber($block_size)); } $links[] = $this->renderShowContextLink( @@ -512,14 +514,16 @@ $links[] = $this->renderShowContextLink( true, "{$top}-{$len}/{$top}-{$len}", - pht('Show All %d Line(s)', $len)); + pht('Show All %s Line(s)', new PhutilNumber($len))); if ($is_large_block) { $is_last_block = (($top + $len) >= $changeset_length); if ($is_last_block) { - $text = pht('Show Last %d Line(s)', $block_size); + $text = pht('Show Last %s Line(s)', new PhutilNumber($block_size)); } else { - $text = "\xE2\x96\xBC ".pht('Show %d Line(s)', $block_size); + $text = "\xE2\x96\xBC ".pht( + 'Show %s Line(s)', + new PhutilNumber($block_size)); } $links[] = $this->renderShowContextLink( diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php --- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php @@ -400,15 +400,17 @@ $href = null; if ($this->getRequest()->getStr('lint') !== null) { - $lint_text = pht('Hide %d Lint Message(s)', count($this->lintMessages)); + $lint_text = pht( + 'Hide %s Lint Message(s)', + phutil_count($this->lintMessages)); $href = $base_uri->alter('lint', null); } else if ($this->lintCommit === null) { $lint_text = pht('Lint not Available'); } else { $lint_text = pht( - 'Show %d Lint Message(s)', - count($this->lintMessages)); + 'Show %s Lint Message(s)', + phutil_count($this->lintMessages)); $href = $this->getDiffusionRequest()->generateURI(array( 'action' => 'browse', 'commit' => $this->lintCommit, diff --git a/src/applications/fact/management/PhabricatorFactManagementStatusWorkflow.php b/src/applications/fact/management/PhabricatorFactManagementStatusWorkflow.php --- a/src/applications/fact/management/PhabricatorFactManagementStatusWorkflow.php +++ b/src/applications/fact/management/PhabricatorFactManagementStatusWorkflow.php @@ -27,14 +27,14 @@ 'SELECT COUNT(*) N FROM %T', $name); - $n = $row['N']; + $n = new PhutilNumber($row['N']); switch ($type) { case 'raw': - $desc = pht('There are %d raw fact(s) in storage.', $n); + $desc = pht('There are %s raw fact(s) in storage.', $n); break; case 'agg': - $desc = pht('There are %d aggregate fact(s) in storage.', $n); + $desc = pht('There are %s aggregate fact(s) in storage.', $n); break; } diff --git a/src/applications/ponder/view/PonderFooterView.php b/src/applications/ponder/view/PonderFooterView.php --- a/src/applications/ponder/view/PonderFooterView.php +++ b/src/applications/ponder/view/PonderFooterView.php @@ -42,7 +42,7 @@ } else { $icon = id(new PHUIIconView()) ->setIconFont('fa-comments msr'); - $text = pht('Show %d Comment(s)', new PhutilNumber($this->count)); + $text = pht('Show %s Comment(s)', new PhutilNumber($this->count)); } $actions = array(); diff --git a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php --- a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php +++ b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php @@ -316,8 +316,8 @@ $type, pht('Invalid'), pht( - '%d project hashtag(s) are already used: %s.', - count($used_slug_strs), + '%s project hashtag(s) are already used: %s.', + phutil_count($used_slug_strs), implode(', ', $used_slug_strs)), $slug_xaction); $errors[] = $error; diff --git a/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php b/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php --- a/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php +++ b/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php @@ -72,9 +72,9 @@ if ($commit_count) { $overview = pht( - '%s pushed %d commit(s) to %s.', + '%s pushed %s commit(s) to %s.', $pusher_name, - $commit_count, + new PhutilNumber($commit_count), $repo_name); } else { $overview = pht( diff --git a/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php b/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php --- a/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php +++ b/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php @@ -87,7 +87,10 @@ foreach ($groups as $group_type => $group) { $console->writeOut( "%s\n", - pht('Indexing %d object(s) of type %s.', count($group), $group_type)); + pht( + 'Indexing %s object(s) of type %s.', + phutil_count($group), + $group_type)); } $bar = id(new PhutilConsoleProgressBar()) diff --git a/src/applications/subscriptions/view/SubscriptionListStringBuilder.php b/src/applications/subscriptions/view/SubscriptionListStringBuilder.php --- a/src/applications/subscriptions/view/SubscriptionListStringBuilder.php +++ b/src/applications/subscriptions/view/SubscriptionListStringBuilder.php @@ -64,7 +64,7 @@ $show = array_values($show); $not_shown_count = $subscribers_count - $show_count; - $not_shown_txt = pht('%d other(s)', $not_shown_count); + $not_shown_txt = pht('%s other(s)', new PhutilNumber($not_shown_count)); $not_shown_link = javelin_tag( 'a', array( diff --git a/src/infrastructure/diff/view/PHUIDiffTableOfContentsItemView.php b/src/infrastructure/diff/view/PHUIDiffTableOfContentsItemView.php --- a/src/infrastructure/diff/view/PHUIDiffTableOfContentsItemView.php +++ b/src/infrastructure/diff/view/PHUIDiffTableOfContentsItemView.php @@ -200,7 +200,7 @@ return null; } - return ' '.pht('(%d line(s))', $line_count); + return ' '.pht('(%s line(s))', new PhutilNumber($line_count)); } private function renderCoverage() { diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php --- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php +++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php @@ -13,46 +13,32 @@ 'No daemon with id %s exists!', 'No daemons with ids %s exist!', ), - 'These %d configuration value(s) are related:' => array( + 'These %s configuration value(s) are related:' => array( 'This configuration value is related:', 'These configuration values are related:', ), '%s Task(s)' => array('Task', 'Tasks'), '%s ERROR(S)' => array('ERROR', 'ERRORS'), - '%d Error(s)' => array('%d Error', '%d Errors'), - '%d Warning(s)' => array('%d Warning', '%d Warnings'), - '%d Auto-Fix(es)' => array('%d Auto-Fix', '%d Auto-Fixes'), - '%d Advice(s)' => array('%d Advice', '%d Pieces of Advice'), - '%d Detail(s)' => array('%d Detail', '%d Details'), - '(%d line(s))' => array('(%d line)', '(%d lines)'), - - '%d line(s)' => array('%d line', '%d lines'), - '%d path(s)' => array('%d path', '%d paths'), - '%d diff(s)' => array('%d diff', '%d diffs'), + '(%s line(s))' => array('(%s line)', '(%s lines)'), '%s Answer(s)' => array('%s Answer', '%s Answers'), - 'Show %d Comment(s)' => array('Show %d Comment', 'Show %d Comments'), + 'Show %s Comment(s)' => array('Show %s Comment', 'Show %s Comments'), '%s DIFF LINK(S)' => array('DIFF LINK', 'DIFF LINKS'), - 'You successfully created %d diff(s).' => array( - 'You successfully created %d diff.', - 'You successfully created %d diffs.', + 'You successfully created %s diff(s).' => array( + 'You successfully created %s diff.', + 'You successfully created %s diffs.', ), 'Diff creation failed; see body for %s error(s).' => array( 'Diff creation failed; see body for error.', 'Diff creation failed; see body for errors.', ), - 'There are %d raw fact(s) in storage.' => array( - 'There is %d raw fact in storage.', - 'There are %d raw facts in storage.', - ), - - 'There are %d aggregate fact(s) in storage.' => array( - 'There is %d aggregate fact in storage.', - 'There are %d aggregate facts in storage.', + 'There are %s aggregate fact(s) in storage.' => array( + 'There is %s aggregate fact in storage.', + 'There are %s aggregate facts in storage.', ), '%d Commit(s) Awaiting Audit' => array( @@ -100,17 +86,17 @@ '%d Assigned Tasks', ), - 'Show %d Lint Message(s)' => array( - 'Show %d Lint Message', - 'Show %d Lint Messages', + 'Show %s Lint Message(s)' => array( + 'Show %s Lint Message', + 'Show %s Lint Messages', ), - 'Hide %d Lint Message(s)' => array( - 'Hide %d Lint Message', - 'Hide %d Lint Messages', + 'Hide %s Lint Message(s)' => array( + 'Hide %s Lint Message', + 'Hide %s Lint Messages', ), '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 byte in length.', 'This is a binary file. It is %s bytes in length.', ), @@ -129,16 +115,6 @@ 'Some of your actions have no effect:', ), - 'Apply remaining %d action(s)?' => array( - 'Apply remaining action?', - 'Apply remaining actions?', - ), - - 'Apply %d Other Action(s)' => array( - 'Apply Remaining Action', - 'Apply Remaining Actions', - ), - 'The %s action(s) you are taking have no effect:' => array( 'The action you are taking has no effect:', 'The actions you are taking have no effect:', @@ -407,9 +383,9 @@ ), ), - '%d other(s)' => array( + '%s other(s)' => array( '1 other', - '%d others', + '%s others', ), '%s edited subscriber(s), added %d: %s; removed %d: %s.' => @@ -485,9 +461,9 @@ '%s Lines', ), - 'Indexing %d object(s) of type %s.' => array( - 'Indexing %d object of type %s.', - 'Indexing %d object of type %s.', + 'Indexing %s object(s) of type %s.' => array( + 'Indexing %s object of type %s.', + 'Indexing %s object of type %s.', ), 'Run these %d command(s):' => array( @@ -510,7 +486,7 @@ 'The current MySQL configuration has these values:', ), - 'You can update these %d value(s) here:' => array( + 'You can update these %s value(s) here:' => array( 'You can update this value here:', 'You can update these values here:', ), @@ -521,8 +497,8 @@ ), 'To update these %d value(s), edit your PHP configuration file.' => array( - 'To update this %d value, edit your PHP configuration file.', - 'To update these %d values, edit your PHP configuration file.', + 'To update this value, edit your PHP configuration file.', + 'To update these values, edit your PHP configuration file.', ), 'To update these %d value(s), edit your PHP configuration file, located '. @@ -533,14 +509,14 @@ 'here:', ), - 'PHP also loaded these %s configuration file(s):' => array( + 'PHP also loaded these %d configuration file(s):' => array( 'PHP also loaded this configuration file:', 'PHP also loaded these configuration files:', ), - 'You have %d unresolved setup issue(s)...' => array( + 'You have %s unresolved setup issue(s)...' => array( 'You have an unresolved setup issue...', - 'You have %d unresolved setup issues...', + 'You have %s unresolved setup issues...', ), '%s added %d inline comment(s).' => array( @@ -554,11 +530,11 @@ '%s rejection(s)' => array('%s rejection', '%s rejections'), '%s update(s)' => array('%s update', '%s updates'), - 'This configuration value is defined in these %d '. + 'This configuration value is defined in these %s '. 'configuration source(s): %s.' => array( 'This configuration value is defined in this '. 'configuration source: %2$s.', - 'This configuration value is defined in these %d '. + 'This configuration value is defined in these %s '. 'configuration sources: %s.', ), @@ -766,9 +742,9 @@ ), ), - '%d project hashtag(s) are already used: %s.' => array( - 'Project hashtag %2$s is already used.', - '%d project hashtags are already used: %2$s.', + '%s project hashtag(s) are already used: %s.' => array( + 'Project hashtag %2$s is already used.', + '%s project hashtags are already used: %2$s.', ), '%s changed project hashtag(s), added %d: %s; removed %d: %s.' => @@ -810,11 +786,6 @@ '%d Users Need Approval', ), - '%s older changes(s) are hidden.' => array( - '%d older change is hidden.', - '%d older changes are hidden.', - ), - '%s, %s line(s)' => array( array( '%s, %s line', @@ -822,10 +793,10 @@ ), ), - '%s pushed %d commit(s) to %s.' => array( + '%s pushed %s commit(s) to %s.' => array( array( '%s pushed a commit to %3$s.', - '%s pushed %d commits to %s.', + '%s pushed %s commits to %s.', ), ), @@ -1065,29 +1036,29 @@ ), ), - 'Show First %d Line(s)' => array( + 'Show First %s Line(s)' => array( 'Show First Line', - 'Show First %d Lines', + 'Show First %s Lines', ), - "\xE2\x96\xB2 Show %d Line(s)" => array( + "\xE2\x96\xB2 Show %s Line(s)" => array( "\xE2\x96\xB2 Show Line", - "\xE2\x96\xB2 Show %d Lines", + "\xE2\x96\xB2 Show %s Lines", ), - 'Show All %d Line(s)' => array( + 'Show All %s Line(s)' => array( 'Show Line', - 'Show All %d Lines', + 'Show All %s Lines', ), - "\xE2\x96\xBC Show %d Line(s)" => array( + "\xE2\x96\xBC Show %s Line(s)" => array( "\xE2\x96\xBC Show Line", - "\xE2\x96\xBC Show %d Lines", + "\xE2\x96\xBC Show %s Lines", ), - 'Show Last %d Line(s)' => array( + 'Show Last %s Line(s)' => array( 'Show Last Line', - 'Show Last %d Lines', + 'Show Last %s Lines', ), '%s marked %s inline comment(s) as done and %s inline comment(s) as '. diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php --- a/src/view/page/PhabricatorStandardPageView.php +++ b/src/view/page/PhabricatorStandardPageView.php @@ -423,7 +423,9 @@ 'href' => '/config/issue/', 'title' => implode(', ', $open), ), - pht('You have %d unresolved setup issue(s)...', count($open)))); + pht( + 'You have %s unresolved setup issue(s)...', + phutil_count($open)))); } }