pht all the things

Summary: `pht`ize almost all strings in rARC. Test Plan: ¯\_(ツ)_/¯ Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: aurelijus, Korvin, epriestley Differential Revision: https://secure.phabricator.com/D12607
chundongwang · May 13, 2015 · d2b38cd · d2b38cd
1 parent 9090efc
commit d2b38cd
Show file tree

Hide file tree

Showing 110 changed files with 1,784 additions and 1,151 deletions.
diff --git a/src/configuration/ArcanistConfiguration.php b/src/configuration/ArcanistConfiguration.php
@@ -46,8 +46,11 @@ public function buildAllWorkflows() {
       if (isset($workflows_by_name[$name])) {
         $other = get_class($workflows_by_name[$name]);
         throw new Exception(
-          "Workflows {$class} and {$other} both implement workflows named ".
-          "{$name}.");
+          pht(
+            'Workflows %s and %s both implement workflows named %s.',
+            $class,
+            $other,
+            $name));
       }
 
       $workflows_by_name[$name] = $workflow;
@@ -109,7 +112,8 @@ final public function selectWorkflow(
       $shell_cmd = substr($full_alias, 1);
 
       $console->writeLog(
-        "[alias: 'arc %s' -> $ %s]",
+        "[%s: 'arc %s' -> $ %s]",
+        pht('alias'),
         $command,
         $shell_cmd);
 
@@ -127,7 +131,8 @@ final public function selectWorkflow(
       $workflow = $this->buildWorkflow($new_command);
       if ($workflow) {
         $console->writeLog(
-          "[alias: 'arc %s' -> 'arc %s']\n",
+          "[%s: 'arc %s' -> 'arc %s']\n",
+          pht('alias'),
           $command,
           $full_alias);
         $command = $new_command;
@@ -168,7 +173,7 @@ final public function selectWorkflow(
   }
 
   private function raiseUnknownCommand($command, array $maybe = array()) {
-    $message = pht("Unknown command '%s'. Try 'arc help'.", $command);
+    $message = pht("Unknown command '%s'. Try '%s'.", $command, 'arc help');
     if ($maybe) {
       $message .= "\n\n".pht('Did you mean:')."\n";
       sort($maybe);

diff --git a/src/configuration/ArcanistConfigurationManager.php b/src/configuration/ArcanistConfigurationManager.php
@@ -180,11 +180,13 @@ public function readUserConfigurationFile() {
           }
           if ($mode & 0177) {
             // Mode should allow only owner access.
-            $prompt = "File permissions on your ~/.arcrc are too open. ".
-                      "Fix them by chmod'ing to 600?";
+            $prompt = pht(
+              "File permissions on your %s are too open. ".
+              "Fix them by chmod'ing to 600?",
+              '~/.arcrc');
             if (!phutil_console_confirm($prompt, $default_no = false)) {
               throw new ArcanistUsageException(
-                'Set ~/.arcrc to file mode 600.');
+                pht('Set %s to file mode 600.', '~/.arcrc'));
             }
             execx('chmod 600 %s', $user_config_path);
 
@@ -200,7 +202,7 @@ public function readUserConfigurationFile() {
           $user_config = phutil_json_decode($user_config_data);
         } catch (PhutilJSONParserException $ex) {
           throw new PhutilProxyException(
-            "Your '~/.arcrc' file is not a valid JSON file.",
+            pht("Your '%s' file is not a valid JSON file.", '~/.arcrc'),
             $ex);
         }
       } else {
@@ -236,7 +238,7 @@ public function writeUserConfigurationFile($config) {
   public function setUserConfigurationFileLocation($custom_arcrc) {
     if (!Filesystem::pathExists($custom_arcrc)) {
       throw new Exception(
-        'Custom arcrc file was specified, but it was not found!');
+        pht('Custom %s file was specified, but it was not found!', 'arcrc'));
     }
 
     $this->customArcrcFilename = $custom_arcrc;
@@ -318,8 +320,12 @@ public function applyRuntimeArcConfig($args) {
     foreach ($options as $opt) {
       $opt_config = preg_split('/=/', $opt, 2);
       if (count($opt_config) !== 2) {
-        throw new ArcanistUsageException("Argument was '{$opt}', but must be ".
-        "'name=value'. For example, history.immutable=true");
+        throw new ArcanistUsageException(
+          pht(
+            "Argument was '%s', but must be '%s'. For example, %s",
+            $opt,
+            'name=value',
+            'history.immutable=true'));
       }
 
       list($key, $value) = $opt_config;

diff --git a/src/configuration/ArcanistSettings.php b/src/configuration/ArcanistSettings.php
@@ -86,7 +86,7 @@ private function getOptions() {
         'help' => pht(
           'The name of the default branch to land changes onto when '.
           '`%s` is run.',
-            'arc land'),
+          'arc land'),
         'example' => '"develop"',
       ),
       'arc.land.update.default' => array(

diff --git a/src/configuration/__tests__/ArcanistBritishTestCase.php b/src/configuration/__tests__/ArcanistBritishTestCase.php
@@ -53,7 +53,7 @@ private function assertCommandCompletion($expect, $input, $commands) {
     $this->assertEqual(
       $expect,
       $result,
-      "Correction of {$input} against: {$commands}");
+      pht('Correction of %s against: %s', $input, $commands));
   }
 
   public function testArgumentCompletion() {
@@ -91,7 +91,7 @@ private function assertArgumentCompletion($expect, $input, $arguments) {
     $this->assertEqual(
       $expect,
       $result,
-      "Correction of {$input} against: {$arguments}");
+      pht('Correction of %s against: %s', $input, $arguments));
   }
 
 }
diff --git a/src/difference/ArcanistDiffUtils.php b/src/difference/ArcanistDiffUtils.php
@@ -26,7 +26,7 @@ public static function renderDifferences(
     $diff_options  = "-L 'Old Value' -L 'New Value'") {
 
     if ((string)$old === (string)$new) {
-      $new .= "\n(Old and new values are identical.)";
+      $new .= "\n".pht('(Old and new values are identical.)');
     }
 
     $file_old = new TempFile();

diff --git a/src/differential/constants/ArcanistDifferentialRevisionStatus.php b/src/differential/constants/ArcanistDifferentialRevisionStatus.php
@@ -21,7 +21,7 @@ public static function getNameForRevisionStatus($status) {
       self::IN_PREPARATION    => pht('In Preparation'),
     );
 
-    return idx($map, coalesce($status, '?'), 'Unknown');
+    return idx($map, coalesce($status, '?'), pht('Unknown'));
   }
 
 }
diff --git a/src/exception/usage/ArcanistUserAbortException.php b/src/exception/usage/ArcanistUserAbortException.php
@@ -7,7 +7,7 @@
 final class ArcanistUserAbortException extends ArcanistUsageException {
 
   public function __construct() {
-    parent::__construct('User aborted the workflow.');
+    parent::__construct(pht('User aborted the workflow.'));
   }
 
 }
diff --git a/src/hgdaemon/ArcanistHgClientChannel.php b/src/hgdaemon/ArcanistHgClientChannel.php
@@ -57,7 +57,7 @@ final class ArcanistHgClientChannel extends PhutilProtocolChannel {
    */
   protected function encodeMessage($argv) {
     if (!is_array($argv) || count($argv) !== 2) {
-      throw new Exception('Message should be <channel, data>.');
+      throw new Exception(pht('Message should be %s.', '<channel, data>'));
     }
 
     $channel = head($argv);

diff --git a/src/hgdaemon/ArcanistHgProxyClient.php b/src/hgdaemon/ArcanistHgProxyClient.php
@@ -163,7 +163,10 @@ private function connectToDaemon() {
 
     if ($errno || !$socket) {
       throw new Exception(
-        "Unable to connect socket! Error #{$errno}: {$errstr}");
+        pht(
+          'Unable to connect socket! Error #%d: %s',
+          $errno,
+          $errstr));
     }
 
     $channel = new PhutilSocketChannel($socket);

diff --git a/src/hgdaemon/ArcanistHgProxyServer.php b/src/hgdaemon/ArcanistHgProxyServer.php
@@ -168,7 +168,7 @@ public function start() {
     $hg = $this->startMercurialProcess();
     $clients = array();
 
-    $this->log(null, 'Listening');
+    $this->log(null, pht('Listening'));
     $this->idleSince = time();
     while (true) {
       // Wait for activity on any active clients, the Mercurial process, or
@@ -181,7 +181,7 @@ public function start() {
         ));
 
       if (!$hg->update()) {
-        throw new Exception('Server exited unexpectedly!');
+        throw new Exception(pht('Server exited unexpectedly!'));
       }
 
       // Accept any new clients.
@@ -190,7 +190,7 @@ public function start() {
         $key = last_key($clients);
         $client->setName($key);
 
-        $this->log($client, 'Connected');
+        $this->log($client, pht('Connected'));
         $this->idleSince = time();
 
         // Check if we've hit the client limit. If there's a configured
@@ -216,15 +216,15 @@ public function start() {
           continue;
         }
 
-        $this->log($client, 'Disconnected');
+        $this->log($client, pht('Disconnected'));
         unset($clients[$key]);
 
         // If we have a client limit and we've served that many clients, exit.
 
         if ($this->clientLimit) {
           if ($this->lifetimeClientCount >= $this->clientLimit) {
             if (!$clients) {
-              $this->log(null, 'Exiting (Client Limit)');
+              $this->log(null, pht('Exiting (Client Limit)'));
               return;
             }
           }
@@ -236,11 +236,11 @@ public function start() {
       if ($this->idleLimit) {
         $remaining = $this->idleLimit - (time() - $this->idleSince);
         if ($remaining <= 0) {
-          $this->log(null, 'Exiting (Idle Limit)');
+          $this->log(null, pht('Exiting (Idle Limit)'));
           return;
         }
         if ($remaining <= 5) {
-          $this->log(null, 'Exiting in '.$remaining.' seconds');
+          $this->log(null, pht('Exiting in %d seconds', $remaining));
         }
       }
     }
@@ -312,7 +312,7 @@ private function updateClient(
     // Log the elapsed time.
     $t_end = microtime(true);
     $t = 1000000 * ($t_end - $t_start);
-    $this->log($client, '< '.number_format($t, 0).'us');
+    $this->log($client, pht('< %sus', number_format($t, 0)));
 
     $this->idleSince = time();
 
@@ -349,12 +349,15 @@ private function startWorkingCopySocket() {
 
     if ($errno || !$socket) {
       throw new Exception(
-        "Unable to start socket! Error #{$errno}: {$errstr}");
+        pht(
+          'Unable to start socket! Error #%d: %s',
+          $errno,
+          $errstr));
     }
 
     $ok = stream_set_blocking($socket, 0);
     if ($ok === false) {
-      throw new Exception('Unable to set socket nonblocking!');
+      throw new Exception(pht('Unable to set socket nonblocking!'));
     }
 
     return $socket;
@@ -438,9 +441,15 @@ private function log($client, $message) {
     }
 
     if ($client) {
-      $message = '[Client '.$client->getName().'] '.$message;
+      $message = sprintf(
+        '[%s] %s',
+        pht('Client %s', $client->getName()),
+        $message);
     } else {
-      $message = '[Server] '.$message;
+      $message = sprintf(
+        '[%s] %s',
+        pht('Server'),
+        $message);
     }
 
     echo $message."\n";
@@ -461,7 +470,7 @@ private function daemonize() {
 
     $pid = pcntl_fork();
     if ($pid === -1) {
-      throw new Exception('Unable to fork!');
+      throw new Exception(pht('Unable to fork!'));
     } else if ($pid) {
       // We're the parent; exit. First, drop our reference to the socket so
       // our __destruct() doesn't tear it down; the child will tear it down

diff --git a/src/hgdaemon/ArcanistHgServerChannel.php b/src/hgdaemon/ArcanistHgServerChannel.php
@@ -86,7 +86,8 @@ final class ArcanistHgServerChannel extends PhutilProtocolChannel {
    */
   protected function encodeMessage($argv) {
     if (!is_array($argv)) {
-      throw new Exception('Message to Mercurial server should be an array.');
+      throw new Exception(
+        pht('Message to Mercurial server should be an array.'));
     }
 
     $command = head($argv);

diff --git a/src/lint/ArcanistLintPatcher.php b/src/lint/ArcanistLintPatcher.php
@@ -49,8 +49,10 @@ public function writePatchToDisk() {
     list($err) = exec_manual('mv -f %s %s', $lint, $path);
     if ($err) {
       throw new Exception(
-        "Unable to overwrite path `{$path}', patched version was left ".
-        "at `{$lint}'.");
+        pht(
+          "Unable to overwrite path '%s', patched version was left at '%s'.",
+          $path,
+          $lint));
     }
 
     foreach ($this->applyMessages as $message) {
@@ -114,7 +116,7 @@ private function getCharacterOffset($line_num) {
     }
 
     if ($line_num >= count($this->lineOffsets)) {
-      throw new Exception("Data has fewer than `{$line}' lines.");
+      throw new Exception(pht('Data has fewer than %d lines.', $line));
     }
 
     return idx($this->lineOffsets, $line_num);

diff --git a/src/lint/ArcanistLintSeverity.php b/src/lint/ArcanistLintSeverity.php
@@ -13,19 +13,19 @@ final class ArcanistLintSeverity {
 
   public static function getLintSeverities() {
     return array(
-      self::SEVERITY_ADVICE   => 'Advice',
-      self::SEVERITY_AUTOFIX  => 'Auto-Fix',
-      self::SEVERITY_WARNING  => 'Warning',
-      self::SEVERITY_ERROR    => 'Error',
-      self::SEVERITY_DISABLED => 'Disabled',
+      self::SEVERITY_ADVICE   => pht('Advice'),
+      self::SEVERITY_AUTOFIX  => pht('Auto-Fix'),
+      self::SEVERITY_WARNING  => pht('Warning'),
+      self::SEVERITY_ERROR    => pht('Error'),
+      self::SEVERITY_DISABLED => pht('Disabled'),
     );
   }
 
   public static function getStringForSeverity($severity_code) {
     $map = self::getLintSeverities();
 
     if (!array_key_exists($severity_code, $map)) {
-      throw new Exception("Unknown lint severity '{$severity_code}'!");
+      throw new Exception(pht("Unknown lint severity '%s'!", $severity_code));
     }
 
     return $map[$severity_code];

diff --git a/src/lint/engine/ArcanistLintEngine.php b/src/lint/engine/ArcanistLintEngine.php
@@ -168,7 +168,7 @@ final public function setMinimumSeverity($severity) {
   final public function run() {
     $linters = $this->buildLinters();
     if (!$linters) {
-      throw new ArcanistNoEffectException('No linters to run.');
+      throw new ArcanistNoEffectException(pht('No linters to run.'));
     }
 
     foreach ($linters as $key => $linter) {
@@ -189,7 +189,7 @@ final public function run() {
     }
 
     if (!$have_paths) {
-      throw new ArcanistNoEffectException('No paths are lintable.');
+      throw new ArcanistNoEffectException(pht('No paths are lintable.'));
     }
 
     $versions = array($this->getCacheVersion());
@@ -272,7 +272,9 @@ final public function run() {
     }
 
     if ($exceptions) {
-      throw new PhutilAggregateException('Some linters failed:', $exceptions);
+      throw new PhutilAggregateException(
+        pht('Some linters failed:'),
+        $exceptions);
     }
 
     return $this->results;

diff --git a/src/lint/linter/ArcanistBaseXHPASTLinter.php b/src/lint/linter/ArcanistBaseXHPASTLinter.php
@@ -132,8 +132,9 @@ final protected function releaseSharedFutures(array $paths) {
         throw new Exception(
           pht(
             'Imbalanced calls to shared futures: each call to '.
-            'buildSharedFutures() for a path must be paired with a call to '.
-            'releaseSharedFutures().'));
+            '%s for a path must be paired with a call to %s.',
+            'buildSharedFutures()',
+            'releaseSharedFutures()'));
       }
 
       $this->refcount[$path]--;