From fdd5500fec64725c593311ff44fd81b3baf8dd80 Mon Sep 17 00:00:00 2001 From: epriestley Date: Wed, 13 Jan 2016 06:19:31 -0800 Subject: [PATCH] Change wording of "Show Entire File" to "Show All Context" Summary: Fixes T10139. This clarification seems reasonable to me. Test Plan: - Viewed a revision with context. - Clicked "Show All Context". - Saw "All Context Shown". {F1060624} {F1060625} Reviewers: chad Reviewed By: chad Maniphest Tasks: T10139 Differential Revision: https://secure.phabricator.com/D15009 --- resources/celerity/map.php | 54 +++++++++---------- .../view/DifferentialChangesetListView.php | 4 +- .../differential/ChangesetViewManager.js | 4 +- .../differential/behavior-dropdown-menus.js | 4 +- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 73f2a74cb6..6b09a388f3 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -11,7 +11,7 @@ return array( 'core.pkg.js' => '6ae03393', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '2de124c9', - 'differential.pkg.js' => '64e69521', + 'differential.pkg.js' => 'f83532f8', 'diffusion.pkg.css' => 'f45955ed', 'diffusion.pkg.js' => '3a9a8bfa', 'maniphest.pkg.css' => '4845691a', @@ -375,13 +375,13 @@ return array( 'rsrc/js/application/dashboard/behavior-dashboard-move-panels.js' => '82439934', 'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375', 'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63', - 'rsrc/js/application/differential/ChangesetViewManager.js' => '58562350', + 'rsrc/js/application/differential/ChangesetViewManager.js' => 'a2828756', 'rsrc/js/application/differential/DifferentialInlineCommentEditor.js' => '64a5550f', 'rsrc/js/application/differential/behavior-add-reviewers-and-ccs.js' => 'e10f8e18', 'rsrc/js/application/differential/behavior-comment-jump.js' => '4fdb476d', 'rsrc/js/application/differential/behavior-comment-preview.js' => 'b064af76', 'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1', - 'rsrc/js/application/differential/behavior-dropdown-menus.js' => '2035b9cb', + 'rsrc/js/application/differential/behavior-dropdown-menus.js' => '9a6b9324', 'rsrc/js/application/differential/behavior-edit-inline-comments.js' => '65ef6074', 'rsrc/js/application/differential/behavior-keyboard-nav.js' => '2c426492', 'rsrc/js/application/differential/behavior-populate.js' => '8694b1df', @@ -523,7 +523,7 @@ return array( 'aphront-typeahead-control-css' => '0e403212', 'auth-css' => '0877ed6e', 'bulk-job-css' => 'df9c1d4a', - 'changeset-view-manager' => '58562350', + 'changeset-view-manager' => 'a2828756', 'conduit-api-css' => '7bc725c4', 'config-options-css' => '0ede4c9b', 'config-welcome-css' => '6abd79be', @@ -588,7 +588,7 @@ return array( 'javelin-behavior-differential-add-reviewers-and-ccs' => 'e10f8e18', 'javelin-behavior-differential-comment-jump' => '4fdb476d', 'javelin-behavior-differential-diff-radios' => 'e1ff79b1', - 'javelin-behavior-differential-dropdown-menus' => '2035b9cb', + 'javelin-behavior-differential-dropdown-menus' => '9a6b9324', 'javelin-behavior-differential-edit-inline-comments' => '65ef6074', 'javelin-behavior-differential-feedback-preview' => 'b064af76', 'javelin-behavior-differential-keyboard-navigation' => '2c426492', @@ -978,18 +978,6 @@ return array( 'phuix-icon-view', 'javelin-behavior-phabricator-gesture', ), - '2035b9cb' => array( - 'javelin-behavior', - 'javelin-dom', - 'javelin-util', - 'javelin-stratcom', - 'javelin-workflow', - 'phuix-dropdown-menu', - 'phuix-action-list-view', - 'phuix-action-view', - 'phabricator-phtize', - 'changeset-view-manager', - ), '21ba5861' => array( 'javelin-behavior', 'javelin-dom', @@ -1210,16 +1198,6 @@ return array( 'javelin-request', 'javelin-util', ), - 58562350 => array( - 'javelin-dom', - 'javelin-util', - 'javelin-stratcom', - 'javelin-install', - 'javelin-workflow', - 'javelin-router', - 'javelin-behavior-device', - 'javelin-vector', - ), '59a7976a' => array( 'javelin-install', 'javelin-dom', @@ -1571,6 +1549,18 @@ return array( 'javelin-dom', 'javelin-reactor-dom', ), + '9a6b9324' => array( + 'javelin-behavior', + 'javelin-dom', + 'javelin-util', + 'javelin-stratcom', + 'javelin-workflow', + 'phuix-dropdown-menu', + 'phuix-action-list-view', + 'phuix-action-view', + 'phabricator-phtize', + 'changeset-view-manager', + ), '9e54692d' => array( 'javelin-install', 'javelin-dom', @@ -1610,6 +1600,16 @@ return array( 'javelin-vector', 'javelin-install', ), + 'a2828756' => array( + 'javelin-dom', + 'javelin-util', + 'javelin-stratcom', + 'javelin-install', + 'javelin-workflow', + 'javelin-router', + 'javelin-behavior-device', + 'javelin-vector', + ), 'a464fe03' => array( 'javelin-behavior', 'javelin-uri', diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php index 83815cda82..ec509d62dd 100644 --- a/src/applications/differential/view/DifferentialChangesetListView.php +++ b/src/applications/differential/view/DifferentialChangesetListView.php @@ -129,8 +129,8 @@ final class DifferentialChangesetListView extends AphrontView { array( 'pht' => array( 'Open in Editor' => pht('Open in Editor'), - 'Show Entire File' => pht('Show Entire File'), - 'Entire File Shown' => pht('Entire File Shown'), + 'Show All Context' => pht('Show All Context'), + 'All Context Shown' => pht('All Context Shown'), "Can't Toggle Unloaded File" => pht("Can't Toggle Unloaded File"), 'Expand File' => pht('Expand File'), 'Collapse File' => pht('Collapse File'), diff --git a/webroot/rsrc/js/application/differential/ChangesetViewManager.js b/webroot/rsrc/js/application/differential/ChangesetViewManager.js index 588403e9ae..0c23e18737 100644 --- a/webroot/rsrc/js/application/differential/ChangesetViewManager.js +++ b/webroot/rsrc/js/application/differential/ChangesetViewManager.js @@ -141,7 +141,7 @@ JX.install('ChangesetViewManager', { * Load missing context in a changeset. * * We do this when the user clicks "Show X Lines". We also expand all of - * the missing context when they "Show Entire File". + * the missing context when they "Show All Context". * * @param string Line range specification, like "0-40/0-20". * @param node Row where the context should be rendered after loading. @@ -162,7 +162,7 @@ JX.install('ChangesetViewManager', { if (bulk) { // If we're loading a bunch of these because the viewer clicked - // "Show Entire File Content" or similar, use lower-priority requests + // "Show All Context" or similar, use lower-priority requests // and draw a progress bar. this._startContentWorkflow(workflow); } else { diff --git a/webroot/rsrc/js/application/differential/behavior-dropdown-menus.js b/webroot/rsrc/js/application/differential/behavior-dropdown-menus.js index 434a057c07..1905e3a433 100644 --- a/webroot/rsrc/js/application/differential/behavior-dropdown-menus.js +++ b/webroot/rsrc/js/application/differential/behavior-dropdown-menus.js @@ -180,7 +180,7 @@ JX.behavior('differential-dropdown-menus', function(config) { if (nodes.length) { reveal_item .setDisabled(false) - .setName(pht('Show Entire File')) + .setName(pht('Show All Context')) .setIcon('fa-file-o') .setHandler(function(e) { show_more(JX.$(data.containerID)); @@ -191,7 +191,7 @@ JX.behavior('differential-dropdown-menus', function(config) { reveal_item .setDisabled(true) .setIcon('fa-file') - .setName(pht('Entire File Shown')) + .setName(pht('All Context Shown')) .setHandler(function(e) { e.prevent(); }); }