From c2642c8a40f824b97c23c5d50d70d4c643eff943 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 17 Feb 2013 09:13:40 -0800
Subject: [PATCH] Remove redundant translations

Summary:
  - Remove some redundant copies of translations after D4985.
  - Make some %d more grammatical, "run this command" reads better than "run this 1 command". In context, these numbers are always very small, so counting them even in the >1 variants aren't useful.
  - Fix subscriber(s).

Test Plan: Looked at an unsubscribe story, saw translation.

Reviewers: chad

Reviewed By: chad

CC: aran

Differential Revision: https://secure.phabricator.com/D4989
---
 .../PhabricatorApplicationTransaction.php     |  2 +-
 .../PhabricatorBaseEnglishTranslation.php     | 42 ++++++-------------
 2 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index 62d7757b0a..7779f3313c 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -248,7 +248,7 @@ abstract class PhabricatorApplicationTransaction
             $this->renderHandleList($add));
         } else {
           return pht(
-            '%s removed %d subscribers: %s.',
+            '%s removed %d subscriber(s): %s.',
             $this->renderHandleLink($author_phid),
             count($rem),
             $this->renderHandleList($rem));
diff --git a/src/infrastructure/internationalization/PhabricatorBaseEnglishTranslation.php b/src/infrastructure/internationalization/PhabricatorBaseEnglishTranslation.php
index ced807deff..e5fa1e6eb3 100644
--- a/src/infrastructure/internationalization/PhabricatorBaseEnglishTranslation.php
+++ b/src/infrastructure/internationalization/PhabricatorBaseEnglishTranslation.php
@@ -187,10 +187,6 @@ abstract class PhabricatorBaseEnglishTranslation
           '%s added a subscriber: %3$s.',
           '%s added subscribers: %3$s.',
         ),
-        array(
-          '%s added a subscriber: %3$s.',
-          '%s added subscribers: %3$s.',
-        ),
       ),
 
       '%s removed %d subscriber(s): %s.' => array(
@@ -198,10 +194,6 @@ abstract class PhabricatorBaseEnglishTranslation
           '%s removed a subscriber: %3$s.',
           '%s removed subscribers: %3$s.',
         ),
-        array(
-          '%s removed a subscriber: %3$s.',
-          '%s removed subscribers: %3$s.',
-        ),
       ),
 
       '%s added %d participant(s): %s.' => array(
@@ -209,10 +201,6 @@ abstract class PhabricatorBaseEnglishTranslation
           '%s added a participant: %3$s.',
           '%s added participants: %3$s.',
         ),
-        array(
-          '%s added a participant: %3$s.',
-          '%s added participants: %3$s.',
-        ),
       ),
 
       '%s removed %d participant(s): %s.' => array(
@@ -220,10 +208,6 @@ abstract class PhabricatorBaseEnglishTranslation
           '%s removed a participant: %3$s.',
           '%s removed participants: %3$s.',
         ),
-        array(
-          '%s removed a participant: %3$s.',
-          '%s removed participants: %3$s.',
-        ),
       ),
 
       '%s Line(s)' => array(
@@ -242,29 +226,29 @@ abstract class PhabricatorBaseEnglishTranslation
       ),
 
       'Install these %d PHP extension(s):' => array(
-        'Install this %d PHP extension:',
-        'Install these %d PHP extensions:',
+        'Install this PHP extension:',
+        'Install these PHP extensions:',
       ),
 
       'The current Phabricator configuration has these %d value(s):' => array(
-        'The current Phabricator configuration has this %d value:',
-        'The current Phabricator configuration has these %d values:',
+        'The current Phabricator configuration has this value:',
+        'The current Phabricator configuration has these values:',
       ),
 
       'To update these %d value(s), run these command(s) from the command line:'
       => array(
-        'To update this %d value, run this command from the command line:',
-        'To update these %d values, run these commands from the command line:',
+        'To update this value, run this command from the command line:',
+        'To update these values, run these commands from the command line:',
       ),
 
       'You can update these %d value(s) here:' => array(
-        'You can update this %d value here:',
-        'You can update these %d values here:',
+        'You can update this value here:',
+        'You can update these values here:',
       ),
 
       'The current PHP configuration has these %d value(s):' => array(
-        'The current PHP configuration has this %d value:',
-        'The current PHP configuration has these %d values:',
+        'The current PHP configuration has this value:',
+        'The current PHP configuration has these values:',
       ),
 
       'To update these %d value(s), edit your PHP configuration file.' => array(
@@ -274,9 +258,9 @@ abstract class PhabricatorBaseEnglishTranslation
 
       'To update these %d value(s), edit your PHP configuration file, located '.
       'here:' => array(
-        'To update this %d value, edit your PHP configuration file, located '.
+        'To update this value, edit your PHP configuration file, located '.
         'here:',
-        'To update these %d values, edit your PHP configuration file, located '.
+        'To update these values, edit your PHP configuration file, located '.
         'here:',
       ),
 
@@ -286,7 +270,7 @@ abstract class PhabricatorBaseEnglishTranslation
       ),
 
       'You have %d unresolved setup issue(s)...' => array(
-        'You have %d unresolved setup issue...',
+        'You have an unresolved setup issue...',
         'You have %d unresolved setup issues...',
       ),