This system does not have PHPExcel installed. This software '. + $inst1 = pht( + 'This system does not have PHPExcel installed. This software '. 'component is required to export tasks to Excel. Have your system '. - 'administrator install it from:
'. + 'administrator install it from:'); + + $inst2 = pht( + 'Your PHP "include_path" needs to be updated to include the '. + 'PHPExcel Classes directory.'); + + $dialog->setTitle(pht('Excel Export Not Configured')); + $dialog->appendChild(hsprintf( + '%s
'. ''. 'http://www.phpexcel.net/'. '
'. 'Your PHP "include_path" needs to be updated to include the '. - 'PHPExcel Classes/ directory.
')); + '%s
', + $inst1, + $inst2)); $dialog->addCancelButton('/maniphest/'); return id(new AphrontDialogResponse())->setDialog($dialog); @@ -58,12 +66,12 @@ final class ManiphestExportController extends ManiphestController { $dialog = new AphrontDialogView(); $dialog->setUser($user); - $dialog->setTitle('Export Tasks to Excel'); + $dialog->setTitle(pht('Export Tasks to Excel')); $dialog->appendChild(phutil_tag('p', array(), pht( 'Do you want to export the query results to Excel?'))); $dialog->addCancelButton('/maniphest/'); - $dialog->addSubmitButton('Export to Excel'); + $dialog->addSubmitButton(pht('Export to Excel')); return id(new AphrontDialogResponse())->setDialog($dialog); } @@ -85,7 +93,7 @@ final class ManiphestExportController extends ManiphestController { $workbook = new PHPExcel(); $sheet = $workbook->setActiveSheetIndex(0); - $sheet->setTitle('Tasks'); + $sheet->setTitle(pht('Tasks')); $widths = array( null, @@ -113,16 +121,16 @@ final class ManiphestExportController extends ManiphestController { $rows = array(); $rows[] = array( - 'ID', - 'Owner', - 'Status', - 'Priority', - 'Date Created', - 'Date Updated', - 'Title', - 'Projects', - 'URI', - 'Description', + pht('ID'), + pht('Owner'), + pht('Status'), + pht('Priority'), + pht('Date Created'), + pht('Date Updated'), + pht('Title'), + pht('Projects'), + pht('URI'), + pht('Description'), ); $is_date = array( diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php index b5a1baf73d..ff5f6ba1f3 100644 --- a/src/applications/maniphest/controller/ManiphestReportController.php +++ b/src/applications/maniphest/controller/ManiphestReportController.php @@ -34,11 +34,11 @@ final class ManiphestReportController extends ManiphestController { $nav = new AphrontSideNavFilterView(); $nav->setBaseURI(new PhutilURI('/maniphest/report/')); - $nav->addLabel('Open Tasks'); - $nav->addFilter('user', 'By User'); - $nav->addFilter('project', 'By Project'); - $nav->addLabel('Burnup'); - $nav->addFilter('burn', 'Burnup Rate'); + $nav->addLabel(pht('Open Tasks')); + $nav->addFilter('user', pht('By User')); + $nav->addFilter('project', pht('By Project')); + $nav->addLabel(pht('Burnup')); + $nav->addFilter('burn', pht('Burnup Rate')); $this->view = $nav->selectFilter($this->view, 'user'); @@ -210,20 +210,20 @@ final class ManiphestReportController extends ManiphestController { if ($week) { $rows[] = $this->formatBurnRow( - 'Week To Date', + pht('Week To Date'), $week); $rowc[] = 'week'; } if ($month) { $rows[] = $this->formatBurnRow( - 'Month To Date', + pht('Month To Date'), $month); $rowc[] = 'month'; } $rows[] = $this->formatBurnRow( - 'All Time', + pht('All Time'), $period); $rowc[] = 'aggregate'; @@ -234,10 +234,10 @@ final class ManiphestReportController extends ManiphestController { $table->setRowClasses($rowc); $table->setHeaders( array( - 'Period', - 'Opened', - 'Closed', - 'Change', + pht('Period'), + pht('Opened'), + pht('Closed'), + pht('Change'), )); $table->setColumnClasses( array( @@ -248,16 +248,17 @@ final class ManiphestReportController extends ManiphestController { )); if ($handle) { - $header = pht("Task Burn Rate for Project %s", $handle->renderLink()); - $caption = hsprintf( - "NOTE: This table reflects tasks currently in ". + $inst = pht( + "NOTE: This table reflects tasks currently in ". "the project. If a task was opened in the past but added to ". "the project recently, it is counted on the day it was ". "opened, not the day it was categorized. If a task was part ". "of this project in the past but no longer is, it is not ". - "counted at all.
"); + "counted at all."); + $header = pht("Task Burn Rate for Project %s", $handle->renderLink()); + $caption = hsprintf("%s
", $inst); } else { - $header = "Task Burn Rate for All Tasks"; + $header = pht("Task Burn Rate for All Tasks"); $caption = null; } @@ -315,7 +316,7 @@ final class ManiphestReportController extends ManiphestController { ->appendChild( id(new AphrontFormTokenizerControl()) ->setDatasource('/typeahead/common/searchproject/') - ->setLabel('Project') + ->setLabel(pht('Project')) ->setLimit(1) ->setName('set_project') ->setValue($tokens)); @@ -325,10 +326,10 @@ final class ManiphestReportController extends ManiphestController { $form ->appendChild( id(new AphrontFormTextControl()) - ->setLabel('"Recently" Means') + ->setLabel(pht('Recently Means')) ->setName('set_window') ->setCaption( - 'Configure the cutoff for the "Recently Closed" column.') + pht('Configure the cutoff for the "Recently Closed" column.')) ->setValue($window_str) ->setError($window_error)); } @@ -336,7 +337,7 @@ final class ManiphestReportController extends ManiphestController { $form ->appendChild( id(new AphrontFormSubmitControl()) - ->setValue('Filter By Project')); + ->setValue(pht('Filter By Project'))); $filter = new AphrontListFilterView(); $filter->appendChild($form); @@ -419,9 +420,9 @@ final class ManiphestReportController extends ManiphestController { array( 'href' => $base_link.ManiphestTaskOwner::OWNER_UP_FOR_GRABS, ), - phutil_tag('em', array(), '(Up For Grabs)')); - $col_header = 'User'; - $header = 'Open Tasks by User and Priority ('.$date.')'; + phutil_tag('em', array(), pht('(Up For Grabs)'))); + $col_header = pht('User'); + $header = pht('Open Tasks by User and Priority (%s)', $date); break; case 'project': $result = array(); @@ -456,9 +457,9 @@ final class ManiphestReportController extends ManiphestController { array( 'href' => $base_link.ManiphestTaskOwner::PROJECT_NO_PROJECT, ), - phutil_tag('em', array(), '(No Project)')); - $col_header = 'Project'; - $header = 'Open Tasks by Project and Priority ('.$date.')'; + phutil_tag('em', array(), pht('(No Project)'))); + $col_header = pht('Project'); + $header = pht('Open Tasks by Project and Priority (%s)', $date); break; } @@ -584,36 +585,37 @@ final class ManiphestReportController extends ManiphestController { array( 'sigil' => 'has-tooltip', 'meta' => array( - 'tip' => 'Oldest open task.', + 'tip' => pht('Oldest open task.'), 'size' => 200, ), ), - 'Oldest (All)'); + pht('Oldest (All)')); $cclass[] = 'n'; $cname[] = javelin_tag( 'span', array( 'sigil' => 'has-tooltip', 'meta' => array( - 'tip' => 'Oldest open task, excluding those with Low or Wishlist '. - 'priority.', + 'tip' => pht('Oldest open task, excluding those with Low or '. + 'Wishlist priority.'), 'size' => 200, ), ), - 'Oldest (Pri)'); + pht('Oldest (Pri)')); $cclass[] = 'n'; list($ignored, $window_epoch) = $this->getWindow(); + $edate = phabricator_datetime($window_epoch, $user); $cname[] = javelin_tag( 'span', array( 'sigil' => 'has-tooltip', 'meta' => array( - 'tip' => 'Closed after '.phabricator_datetime($window_epoch, $user), + 'tip' => pht('Closed after %s', $edate), 'size' => 260 ), ), - 'Recently Closed'); + pht('Recently Closed')); $cclass[] = 'n'; $table = new AphrontTableView($rows); diff --git a/src/applications/maniphest/controller/ManiphestSavedQueryDeleteController.php b/src/applications/maniphest/controller/ManiphestSavedQueryDeleteController.php index 9fae6869aa..c4fa4d9123 100644 --- a/src/applications/maniphest/controller/ManiphestSavedQueryDeleteController.php +++ b/src/applications/maniphest/controller/ManiphestSavedQueryDeleteController.php @@ -30,15 +30,17 @@ final class ManiphestSavedQueryDeleteController extends ManiphestController { } $name = $query->getName(); + $inst = pht( + 'Really delete the query "%s"? It will be lost forever!', $name); $dialog = id(new AphrontDialogView()) ->setUser($user) - ->setTitle('Really delete this query?') + ->setTitle(pht('Really delete this query?')) ->appendChild(hsprintf( - 'Really delete the query "%s"? It will be lost forever!
', - $name)) + '%s
', + $inst)) ->addCancelButton('/maniphest/custom/') - ->addSubmitButton('Delete'); + ->addSubmitButton(pht('Delete')); return id(new AphrontDialogResponse())->setDialog($dialog); } diff --git a/src/applications/maniphest/controller/ManiphestSavedQueryEditController.php b/src/applications/maniphest/controller/ManiphestSavedQueryEditController.php index 8fd0e5b32d..fde8404934 100644 --- a/src/applications/maniphest/controller/ManiphestSavedQueryEditController.php +++ b/src/applications/maniphest/controller/ManiphestSavedQueryEditController.php @@ -42,8 +42,8 @@ final class ManiphestSavedQueryEditController extends ManiphestController { $e_name = null; $query->setName($request->getStr('name')); if (!strlen($query->getName())) { - $e_name = 'Required'; - $errors[] = 'Saved query name is required.'; + $e_name = pht('Required'); + $errors[] = pht('Saved query name is required.'); } if (!$errors) { @@ -54,17 +54,17 @@ final class ManiphestSavedQueryEditController extends ManiphestController { if ($errors) { $error_view = new AphrontErrorView(); - $error_view->setTitle('Form Errors'); + $error_view->setTitle(pht('Form Errors')); $error_view->setErrors($errors); } else { $error_view = null; } if ($query->getID()) { - $header = 'Edit Saved Query'; + $header = pht('Edit Saved Query'); $cancel_uri = '/maniphest/custom/'; } else { - $header = 'New Saved Query'; + $header = pht('New Saved Query'); $cancel_uri = '/maniphest/view/custom/?key='.$key; } @@ -74,14 +74,14 @@ final class ManiphestSavedQueryEditController extends ManiphestController { ->addHiddenInput('id', $query->getID()) ->appendChild( id(new AphrontFormTextControl()) - ->setLabel('Name') + ->setLabel(pht('Name')) ->setValue($query->getName()) ->setName('name') ->setError($e_name)) ->appendChild( id(new AphrontFormSubmitControl()) ->addCancelButton($cancel_uri) - ->setValue('Save')); + ->setValue(pht('Save'))); $panel = new AphrontPanelView(); $panel->setHeader($header); @@ -94,10 +94,11 @@ final class ManiphestSavedQueryEditController extends ManiphestController { $nav->appendChild($error_view); $nav->appendChild($panel); - return $this->buildStandardPageResponse( + return $this->buildApplicationPage( $nav, array( - 'title' => 'Saved Queries', + 'title' => pht('Saved Queries'), + 'device' => true, )); } diff --git a/src/applications/maniphest/controller/ManiphestSavedQueryListController.php b/src/applications/maniphest/controller/ManiphestSavedQueryListController.php index 2f80e6028d..c308739c3f 100644 --- a/src/applications/maniphest/controller/ManiphestSavedQueryListController.php +++ b/src/applications/maniphest/controller/ManiphestSavedQueryListController.php @@ -81,7 +81,7 @@ final class ManiphestSavedQueryListController extends ManiphestController { 'value' => 0, 'checked' => ($default === null ? 'checked' : null), )), - phutil_tag('em', array(), 'No Default'), + phutil_tag('em', array(), pht('No Default')), '', '', ); @@ -89,10 +89,10 @@ final class ManiphestSavedQueryListController extends ManiphestController { $table = new AphrontTableView($rows); $table->setHeaders( array( - 'Default', - 'Name', - 'Edit', - 'Delete', + pht('Default'), + pht('Name'), + pht('Edit'), + pht('Delete'), )); $table->setColumnClasses( array( @@ -103,12 +103,12 @@ final class ManiphestSavedQueryListController extends ManiphestController { )); $panel = new AphrontPanelView(); - $panel->setHeader('Saved Custom Queries'); + $panel->setHeader(pht('Saved Custom Queries')); $panel->addButton( phutil_tag( 'button', array(), - 'Save Default Query')); + pht('Save Default Query'))); $panel->appendChild($table); $form = phabricator_form( @@ -122,10 +122,11 @@ final class ManiphestSavedQueryListController extends ManiphestController { $nav->selectFilter('saved', 'saved'); $nav->appendChild($form); - return $this->buildStandardPageResponse( + return $this->buildApplicationPage( $nav, array( - 'title' => 'Saved Queries', + 'title' => pht('Saved Queries'), + 'device' => true, )); } diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php index d90643cc0c..ad7bda8316 100644 --- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php +++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php @@ -107,7 +107,7 @@ final class ManiphestTaskDetailController extends ManiphestController { 'href' => '/maniphest/task/create/?parent='.$parent_task->getID(), 'class' => 'green button', ), - 'Create Another Subtask')); + pht('Create Another Subtask'))); $context_bar->appendChild(hsprintf( 'Created a subtask of %s', $this->getHandle($parent_task->getPHID())->renderLink())); @@ -120,15 +120,15 @@ final class ManiphestTaskDetailController extends ManiphestController { 'href' => '/maniphest/task/create/?template='.$task->getID(), 'class' => 'green button', ), - 'Similar Task')); + pht('Similar Task'))); $context_bar->addButton(phutil_tag( 'a', array( 'href' => '/maniphest/task/create/', 'class' => 'green button', ), - 'Empty Task')); - $context_bar->appendChild('New task created.'); + pht('Empty Task'))); + $context_bar->appendChild(pht('New task created.')); } $engine = new PhabricatorMarkupEngine(); @@ -201,20 +201,20 @@ final class ManiphestTaskDetailController extends ManiphestController { ->addHiddenInput('taskID', $task->getID()) ->appendChild( id(new AphrontFormSelectControl()) - ->setLabel('Action') + ->setLabel(pht('Action')) ->setName('action') ->setOptions($transaction_types) ->setID('transaction-action')) ->appendChild( id(new AphrontFormSelectControl()) - ->setLabel('Resolution') + ->setLabel(pht('Resolution')) ->setName('resolution') ->setControlID('resolution') ->setControlStyle('display: none') ->setOptions($resolution_types)) ->appendChild( id(new AphrontFormTokenizerControl()) - ->setLabel('Assign To') + ->setLabel(pht('Assign To')) ->setName('assign_to') ->setControlID('assign_to') ->setControlStyle('display: none') @@ -222,7 +222,7 @@ final class ManiphestTaskDetailController extends ManiphestController { ->setDisableBehavior(true)) ->appendChild( id(new AphrontFormTokenizerControl()) - ->setLabel('CCs') + ->setLabel(pht('CCs')) ->setName('ccs') ->setControlID('ccs') ->setControlStyle('display: none') @@ -230,7 +230,7 @@ final class ManiphestTaskDetailController extends ManiphestController { ->setDisableBehavior(true)) ->appendChild( id(new AphrontFormSelectControl()) - ->setLabel('Priority') + ->setLabel(pht('Priority')) ->setName('priority') ->setOptions($priority_map) ->setControlID('priority') @@ -238,7 +238,7 @@ final class ManiphestTaskDetailController extends ManiphestController { ->setValue($task->getPriority())) ->appendChild( id(new AphrontFormTokenizerControl()) - ->setLabel('Projects') + ->setLabel(pht('Projects')) ->setName('projects') ->setControlID('projects') ->setControlStyle('display: none') @@ -246,25 +246,25 @@ final class ManiphestTaskDetailController extends ManiphestController { ->setDisableBehavior(true)) ->appendChild( id(new AphrontFormFileControl()) - ->setLabel('File') + ->setLabel(pht('File')) ->setName('file') ->setControlID('file') ->setControlStyle('display: none')) ->appendChild( id(new PhabricatorRemarkupControl()) - ->setLabel('Comments') + ->setLabel(pht('Comments')) ->setName('comments') ->setValue($draft_text) ->setID('transaction-comments') ->setUser($user)) ->appendChild( id(new AphrontFormDragAndDropUploadControl()) - ->setLabel('Attached Files') + ->setLabel(pht('Attached Files')) ->setName('files') ->setActivatedClass('aphront-panel-view-drag-and-drop')) ->appendChild( id(new AphrontFormSubmitControl()) - ->setValue($is_serious ? 'Submit' : 'Avast!')); + ->setValue($is_serious ? pht('Submit') : pht('Avast!'))); $control_map = array( ManiphestTransactionType::TYPE_STATUS => 'resolution', @@ -280,7 +280,7 @@ final class ManiphestTaskDetailController extends ManiphestController { 'id' => 'projects-tokenizer', 'src' => '/typeahead/common/projects/', 'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'), - 'placeholder' => 'Type a project name...', + 'placeholder' => pht('Type a project name...'), ), ManiphestTransactionType::TYPE_OWNER => array( 'id' => 'assign-tokenizer', @@ -288,13 +288,13 @@ final class ManiphestTaskDetailController extends ManiphestController { 'value' => $default_claim, 'limit' => 1, 'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'), - 'placeholder' => 'Type a user name...', + 'placeholder' => pht('Type a user name...'), ), ManiphestTransactionType::TYPE_CCS => array( 'id' => 'cc-tokenizer', 'src' => '/typeahead/common/mailable/', 'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'), - 'placeholder' => 'Type a user or mailing list...', + 'placeholder' => pht('Type a user or mailing list...'), ), ); diff --git a/src/applications/maniphest/controller/ManiphestTaskEditController.php b/src/applications/maniphest/controller/ManiphestTaskEditController.php index 10e1e1a20b..77e4be866a 100644 --- a/src/applications/maniphest/controller/ManiphestTaskEditController.php +++ b/src/applications/maniphest/controller/ManiphestTaskEditController.php @@ -112,15 +112,15 @@ final class ManiphestTaskEditController extends ManiphestController { $aux_field->setValueFromRequest($request); if ($aux_field->isRequired() && !$aux_field->getValue()) { - $errors[] = $aux_field->getLabel() . ' is required.'; - $aux_field->setError('Required'); + $errors[] = pht('%s is required.', $aux_field->getLabel()); + $aux_field->setError(pht('Required')); } try { $aux_field->validate(); } catch (Exception $e) { $errors[] = $e->getMessage(); - $aux_field->setError('Invalid'); + $aux_field->setError(pht('Invalid')); } } @@ -501,18 +501,22 @@ final class ManiphestTaskEditController extends ManiphestController { $panel->setHeader($header_name); $panel->appendChild($form); $panel->setNoBackground(); + $inst1 = pht('Description Preview'); + $inst2 = pht('Loading preview...'); $description_preview_panel = hsprintf( '| %s%s | '. '%s | '. - '0 Selected Tasks | '. + '%s | '. '%s | '. '
| %s | '. - '
| %s | '. + '