From c6fa42b9c5c07f79d4b76f91b0378b9d9ffa7a00 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 14 May 2015 10:58:22 -0700
Subject: [PATCH] Improve translation of an "arc land" string

Summary: This lost formatting in a pht() conversion; give the bold back and make it properly translatable.

Test Plan: Will land.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Differential Revision: https://secure.phabricator.com/D12843
---
 src/workflow/ArcanistLandWorkflow.php | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/workflow/ArcanistLandWorkflow.php b/src/workflow/ArcanistLandWorkflow.php
index 8f72f439..98c804b6 100644
--- a/src/workflow/ArcanistLandWorkflow.php
+++ b/src/workflow/ArcanistLandWorkflow.php
@@ -25,6 +25,9 @@ final class ArcanistLandWorkflow extends ArcanistWorkflow {
   private $revision;
   private $messageFile;
 
+  const REFTYPE_BRANCH = 'branch';
+  const REFTYPE_BOOKMARK = 'bookmark';
+
   public function getRevisionDict() {
     return $this->revision;
   }
@@ -401,12 +404,21 @@ EOTEXT
       $repository_api->execxLocal('checkout %s', $this->branch);
     }
 
-    echo phutil_console_format(
-      "%s\n",
-      pht(
-        'Switched to %s **%s**. Identifying and merging...',
-        $this->branchType,
-        $this->branch));
+    switch ($this->branchType) {
+      case self::REFTYPE_BOOKMARK:
+        $message = pht(
+          'Switched to bookmark **%s**. Identifying and merging...',
+          $this->branch);
+        break;
+      case self::REFTYPE_BRANCH:
+      default:
+        $message = pht(
+          'Switched to branch **%s**. Identifying and merging...',
+          $this->branch);
+        break;
+    }
+
+    echo phutil_console_format($message."\n");
   }
 
   private function printPendingCommits() {