Page MenuHomePhabricator
Files F14036402

D11555.diff
No OneTemporary
Actions

D11555.diff
View Options

diff --git a/src/workflow/ArcanistPhrequentWorkflow.php b/src/workflow/ArcanistPhrequentWorkflow.php
--- a/src/workflow/ArcanistPhrequentWorkflow.php
+++ b/src/workflow/ArcanistPhrequentWorkflow.php
@@ -1,7 +1,7 @@
<?php
/**
- * Base workflow for Phrequent workflows
+ * Base workflow for Phrequent workflows.
*/
abstract class ArcanistPhrequentWorkflow extends ArcanistWorkflow {
@@ -10,14 +10,13 @@
$results = $conduit->callMethodSynchronous(
'phrequent.tracking',
- array(
- ));
+ array());
$results = $results['data'];
if (count($results) === 0) {
echo phutil_console_format(
- "Not currently tracking time against any object\n");
-
+ "%s\n",
+ pht('Not currently tracking time against any object.'));
return 0;
}
@@ -37,22 +36,22 @@
if (array_key_exists($lookup, $phid_query)) {
$phid_map[$lookup] = $phid_query[$lookup]['fullName'];
} else {
- $phid_map[$lookup] = 'Unknown Object';
+ $phid_map[$lookup] = pht('Unknown Object');
}
}
$table = id(new PhutilConsoleTable())
- ->addColumn('type', array('title' => 'Status'))
- ->addColumn('time', array('title' => 'Tracked', 'align' => 'right'))
- ->addColumn('name', array('title' => 'Name'))
+ ->addColumn('type', array('title' => pht('Status')))
+ ->addColumn('time', array('title' => pht('Tracked'), 'align' => 'right'))
+ ->addColumn('name', array('title' => pht('Name')))
->setBorders(false);
$i = 0;
foreach ($results as $result) {
if ($i === 0) {
- $column_type = 'In Progress';
+ $column_type = pht('In Progress');
} else {
- $column_type = 'Suspended';
+ $column_type = pht('Suspended');
}
$table->addRow(array(
@@ -65,7 +64,6 @@
}
$table->draw();
-
return 0;
}
diff --git a/src/workflow/ArcanistStartWorkflow.php b/src/workflow/ArcanistStartWorkflow.php
--- a/src/workflow/ArcanistStartWorkflow.php
+++ b/src/workflow/ArcanistStartWorkflow.php
@@ -1,7 +1,7 @@
<?php
/**
- * Start time tracking on an object
+ * Start time tracking on an object.
*/
final class ArcanistStartWorkflow extends ArcanistPhrequentWorkflow {
@@ -18,7 +18,7 @@
public function getCommandHelp() {
return phutil_console_format(<<<EOTEXT
-Start tracking work in Phrequent.
+ Start tracking work in Phrequent.
EOTEXT
);
}
@@ -27,10 +27,6 @@
return true;
}
- public function desiresWorkingCopy() {
- return false;
- }
-
public function requiresAuthentication() {
return true;
}
@@ -46,6 +42,7 @@
$started_phids = array();
$short_name = $this->getArgument('name');
+
foreach ($short_name as $object_name) {
$object_lookup = $conduit->callMethodSynchronous(
'phid.lookup',
@@ -54,7 +51,9 @@
));
if (!array_key_exists($object_name, $object_lookup)) {
- echo "No such object '".$object_name."' found.\n";
+ echo phutil_console_format(
+ "%s\n",
+ pht("No such object '%s' found.", $object_name));
return 1;
}
@@ -73,19 +72,10 @@
'phids' => $started_phids,
));
- $name = '';
- foreach ($phid_query as $ref) {
- if ($name === '') {
- $name = $ref['fullName'];
- } else {
- $name .= ', '.$ref['fullName'];
- }
- }
-
echo phutil_console_format(
- "Started: %s\n\n",
- $name);
-
+ "%s: %s\n\n",
+ pht('Started'),
+ implode(', ', ipull($phid_query, 'fullName')));
$this->printCurrentTracking(true);
}
diff --git a/src/workflow/ArcanistStopWorkflow.php b/src/workflow/ArcanistStopWorkflow.php
--- a/src/workflow/ArcanistStopWorkflow.php
+++ b/src/workflow/ArcanistStopWorkflow.php
@@ -1,7 +1,7 @@
<?php
/**
- * Stop time tracking on an object
+ * Stop time tracking on an object.
*/
final class ArcanistStopWorkflow extends ArcanistPhrequentWorkflow {
@@ -18,7 +18,7 @@
public function getCommandHelp() {
return phutil_console_format(<<<EOTEXT
-Start tracking work in Phrequent.
+ Start tracking work in Phrequent.
EOTEXT
);
}
@@ -27,10 +27,6 @@
return true;
}
- public function desiresWorkingCopy() {
- return false;
- }
-
public function requiresAuthentication() {
return true;
}
@@ -39,8 +35,7 @@
return array(
'note' => array(
'param' => 'note',
- 'help' =>
- 'A note to attach to the tracked time.',
+ 'help' => pht('A note to attach to the tracked time.'),
),
'*' => 'name',
);
@@ -48,7 +43,6 @@
public function run() {
$conduit = $this->getConduit();
-
$names = $this->getArgument('name');
$object_lookup = $conduit->callMethodSynchronous(
@@ -60,14 +54,14 @@
foreach ($names as $object_name) {
if (!array_key_exists($object_name, $object_lookup)) {
throw new ArcanistUsageException(
- "No such object '".$object_name."' found.");
+ pht("No such object '%s' found.", $object_name));
return 1;
}
}
if (count($names) === 0) {
// Implicit stop; add an entry so the loop will call
- // phrequent.pop with a null objectPHID.
+ // `phrequent.pop` with a null `objectPHID`.
$object_lookup[] = array('phid' => null);
}
@@ -89,20 +83,14 @@
if (count($stopped_phids) === 0) {
if (count($names) === 0) {
echo phutil_console_format(
- "Not currently tracking time against any object\n");
+ "%s\n",
+ pht('Not currently tracking time against any object.'));
} else {
- $name = '';
- foreach ($object_lookup as $ref) {
- if ($name === '') {
- $name = $ref['fullName'];
- } else {
- $name = ', '.$ref['fullName'];
- }
- }
-
echo phutil_console_format(
- "Not currently tracking time against %s\n",
- $name);
+ "%s\n",
+ pht(
+ 'Not currently tracking time against %s.',
+ implode(', ', ipull($object_lookup, 'fullName'))));
}
return 1;
}
@@ -113,19 +101,10 @@
'phids' => $stopped_phids,
));
- $name = '';
- foreach ($phid_query as $ref) {
- if ($name === '') {
- $name = $ref['fullName'];
- } else {
- $name .= ', '.$ref['fullName'];
- }
- }
-
echo phutil_console_format(
- "Stopped: %s\n\n",
- $name);
-
+ "%s %s\n\n",
+ pht('Stopped:'),
+ implode(', ', ipull($phid_query, 'fullName')));
$this->printCurrentTracking(true);
}
diff --git a/src/workflow/ArcanistTimeWorkflow.php b/src/workflow/ArcanistTimeWorkflow.php
--- a/src/workflow/ArcanistTimeWorkflow.php
+++ b/src/workflow/ArcanistTimeWorkflow.php
@@ -1,7 +1,7 @@
<?php
/**
- * Show time being tracked in Phrequent
+ * Show time being tracked in Phrequent.
*/
final class ArcanistTimeWorkflow extends ArcanistPhrequentWorkflow {
@@ -18,7 +18,7 @@
public function getCommandHelp() {
return phutil_console_format(<<<EOTEXT
-Show what you're currently tracking in Phrequent.
+ Show what you're currently tracking in Phrequent.
EOTEXT
);
}
@@ -27,19 +27,10 @@
return true;
}
- public function desiresWorkingCopy() {
- return false;
- }
-
public function requiresAuthentication() {
return true;
}
- public function getArguments() {
- return array(
- );
- }
-
public function run() {
$this->printCurrentTracking();
}

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 11, 10:06 AM (1 d, 17 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6715480
Default Alt Text
D11555.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility