@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Remove flavor text for action buttons
Summary: A small but appreciable number of users find flavor on buttons confusing. Remove this flavor. This retains flavor in headers, error messages, etc., which doesn't cause confusion.
Test Plan: Looked at a revision, task, paste, macro, etc.
Reviewers: chad, btrahan
Reviewed By: btrahan
Subscribers: epriestley
Differential Revision: https://secure.phabricator.com/D8812
+27
-81
-7
conf/default.conf.php
-7
conf/default.conf.php
···
638
638
'https' => true,
639
639
),
640
640
641
-
// By default, Phabricator includes some silly nonsense in the UI, such as
642
-
// a submit button called "Clowncopterize" in Differential and a call to
643
-
// "Leap Into Action". If you'd prefer more traditional UI strings like
644
-
// "Submit", you can set this flag to disable most of the jokes and easter
645
-
// eggs.
646
-
'phabricator.serious-business' => false,
647
-
648
641
// Should Phabricator show beta applications on the homepage
649
642
'phabricator.show-beta-applications' => false,
650
643
+2
-4
src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
+2
-4
src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
···
103
103
return $response;
104
104
}
105
105
106
-
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
107
-
108
106
$user = $request->getUser();
109
107
if (!$user) {
110
108
// If we hit an exception very early, we won't have a user.
···
175
173
->appendChild($content);
176
174
177
175
if ($this->getRequest()->isAjax()) {
178
-
$dialog->addCancelButton('/', 'Close');
176
+
$dialog->addCancelButton('/', pht('Close'));
179
177
} else {
180
-
$dialog->addCancelButton('/', $is_serious ? 'OK' : 'Away With Thee');
178
+
$dialog->addCancelButton('/', pht('OK'));
181
179
}
182
180
183
181
$response = new AphrontDialogResponse();
+5
-5
src/applications/config/option/PhabricatorCoreConfigOptions.php
+5
-5
src/applications/config/option/PhabricatorCoreConfigOptions.php
···
112
112
pht("Should Phabricator be serious?"))
113
113
->setDescription(
114
114
pht(
115
-
"By default, Phabricator includes some silly nonsense in the UI, ".
116
-
"such as a submit button called 'Clowncopterize' in Differential ".
117
-
"and a call to 'Leap Into Action'. If you'd prefer more ".
118
-
"traditional UI strings like 'Submit', you can set this flag to ".
119
-
"disable most of the jokes and easter eggs.")),
115
+
'By default, Phabricator includes some flavor text in the UI, '.
116
+
'like a prompt to "Weigh In" rather than "Add Comment" in '.
117
+
'Maniphest. If you\'d prefer more traditional UI strings like '.
118
+
'"Add Comment", you can set this flag to disable most of the '.
119
+
'extra flavor.')),
120
120
$this->newOption('environment.append-paths', 'list<string>', $paths)
121
121
->setSummary(
122
122
pht("These paths get appended to your \$PATH envrionment variable."))
+1
-5
src/applications/conpherence/controller/ConpherenceViewController.php
+1
-5
src/applications/conpherence/controller/ConpherenceViewController.php
···
133
133
$update_uri = $this->getApplicationURI('update/'.$conpherence->getID().'/');
134
134
135
135
$this->initBehavior('conpherence-pontificate');
136
-
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
137
136
138
137
$form =
139
138
id(new AphrontFormView())
···
149
148
->setValue($draft->getDraft()))
150
149
->appendChild(
151
150
id(new AphrontFormSubmitControl())
152
-
->setValue(
153
-
$is_serious
154
-
? pht('Send')
155
-
: pht('Pontificate')))
151
+
->setValue(pht('Send Message')))
156
152
->appendChild(
157
153
javelin_tag(
158
154
'input',
+7
-5
src/applications/differential/view/DifferentialAddCommentView.php
+7
-5
src/applications/differential/view/DifferentialAddCommentView.php
···
52
52
public function render() {
53
53
54
54
$this->requireResource('differential-revision-add-comment-css');
55
-
56
-
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
57
-
58
55
$revision = $this->revision;
59
56
60
57
$action = null;
···
109
106
->setUser($this->user))
110
107
->appendChild(
111
108
id(new AphrontFormSubmitControl())
112
-
->setValue($is_serious ? pht('Submit') : pht('Clowncopterize')));
109
+
->setValue(pht('Submit')));
113
110
114
111
Javelin::initBehavior(
115
112
'differential-add-reviewers-and-ccs',
···
157
154
'inline' => 'inline-comment-preview',
158
155
));
159
156
157
+
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
158
+
$header_text = $is_serious
159
+
? pht('Add Comment')
160
+
: pht('Leap Into Action');
161
+
160
162
$header = id(new PHUIHeaderView())
161
-
->setHeader($is_serious ? pht('Add Comment') : pht('Leap Into Action'));
163
+
->setHeader($header_text);
162
164
163
165
$anchor = id(new PhabricatorAnchorView())
164
166
->setAnchorName('comment')
+1
-1
src/applications/diffusion/controller/DiffusionCommitController.php
+1
-1
src/applications/diffusion/controller/DiffusionCommitController.php
+1
-5
src/applications/files/controller/PhabricatorFileInfoController.php
+1
-5
src/applications/files/controller/PhabricatorFileInfoController.php
···
99
99
? pht('Add Comment')
100
100
: pht('Question File Integrity');
101
101
102
-
$submit_button_name = $is_serious
103
-
? pht('Add Comment')
104
-
: pht('Debate the Bits');
105
-
106
102
$draft = PhabricatorDraft::newFromUserAndKey($user, $file->getPHID());
107
103
108
104
$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
···
111
107
->setDraft($draft)
112
108
->setHeaderText($add_comment_header)
113
109
->setAction($this->getApplicationURI('/comment/'.$file->getID().'/'))
114
-
->setSubmitButtonName($submit_button_name);
110
+
->setSubmitButtonName(pht('Add Comment'));
115
111
116
112
return array(
117
113
$timeline,
+1
-5
src/applications/legalpad/controller/LegalpadDocumentViewController.php
+1
-5
src/applications/legalpad/controller/LegalpadDocumentViewController.php
···
210
210
? pht('Add Comment')
211
211
: pht('Debate Legislation');
212
212
213
-
$button_name = $is_serious
214
-
? pht('Add Comment')
215
-
: pht('Commence Filibuster');
216
-
217
213
$form = id(new PhabricatorApplicationTransactionCommentView())
218
214
->setUser($user)
219
215
->setObjectPHID($document->getPHID())
220
216
->setFormID($comment_form_id)
221
217
->setHeaderText($title)
222
218
->setDraft($draft)
223
-
->setSubmitButtonName($button_name)
219
+
->setSubmitButtonName(pht('Add Comment'))
224
220
->setAction($this->getApplicationURI('/comment/'.$document->getID().'/'))
225
221
->setRequestURI($this->getRequest()->getRequestURI());
226
222
+1
-5
src/applications/macro/controller/PhabricatorMacroViewController.php
+1
-5
src/applications/macro/controller/PhabricatorMacroViewController.php
···
87
87
? pht('Add Comment')
88
88
: pht('Grovel in Awe');
89
89
90
-
$submit_button_name = $is_serious
91
-
? pht('Add Comment')
92
-
: pht('Lavish Praise');
93
-
94
90
$draft = PhabricatorDraft::newFromUserAndKey($user, $macro->getPHID());
95
91
96
92
$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
···
99
95
->setDraft($draft)
100
96
->setHeaderText($comment_header)
101
97
->setAction($this->getApplicationURI('/comment/'.$macro->getID().'/'))
102
-
->setSubmitButtonName($submit_button_name);
98
+
->setSubmitButtonName(pht('Add Comment'));
103
99
104
100
$object_box = id(new PHUIObjectBoxView())
105
101
->setHeader($header)
+3
-12
src/applications/maniphest/controller/ManiphestTaskDetailController.php
+3
-12
src/applications/maniphest/controller/ManiphestTaskDetailController.php
···
205
205
$draft_text = null;
206
206
}
207
207
208
-
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
209
-
210
-
$submit_text = $is_serious
211
-
? pht('Submit')
212
-
: pht('Avast!');
213
-
214
-
$close_text = $is_serious
215
-
? pht('Close Task')
216
-
: pht('Scuttle Task');
217
-
218
208
$submit_control = id(new PHUIFormMultiSubmitControl());
219
209
if (!$task->isClosed()) {
220
210
$close_image = id(new PHUIIconView())
···
224
214
id(new PHUIButtonView())
225
215
->setColor(PHUIButtonView::GREY)
226
216
->setIcon($close_image)
227
-
->setText($close_text)
217
+
->setText(pht('Close Task'))
228
218
->setName('scuttle')
229
219
->addSigil('alternate-submit-button'));
230
220
}
231
-
$submit_control->addSubmitButton($submit_text);
221
+
$submit_control->addSubmitButton(pht('Submit'));
232
222
233
223
$comment_form = new AphrontFormView();
234
224
$comment_form
···
343
333
));
344
334
}
345
335
336
+
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
346
337
$comment_header = $is_serious
347
338
? pht('Add Comment')
348
339
: pht('Weigh In');
+1
-5
src/applications/paste/controller/PhabricatorPasteViewController.php
+1
-5
src/applications/paste/controller/PhabricatorPasteViewController.php
···
118
118
? pht('Add Comment')
119
119
: pht('Debate Paste Accuracy');
120
120
121
-
$submit_button_name = $is_serious
122
-
? pht('Add Comment')
123
-
: pht('Pity the Fool');
124
-
125
121
$draft = PhabricatorDraft::newFromUserAndKey($user, $paste->getPHID());
126
122
127
123
$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
···
130
126
->setDraft($draft)
131
127
->setHeaderText($add_comment_header)
132
128
->setAction($this->getApplicationURI('/comment/'.$paste->getID().'/'))
133
-
->setSubmitButtonName($submit_button_name);
129
+
->setSubmitButtonName(pht('Add Comment'));
134
130
135
131
return $this->buildApplicationPage(
136
132
array(
+1
-6
src/applications/pholio/controller/PholioMockViewController.php
+1
-6
src/applications/pholio/controller/PholioMockViewController.php
···
235
235
$draft = PhabricatorDraft::newFromUserAndKey($user, $mock->getPHID());
236
236
237
237
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
238
-
239
238
$title = $is_serious
240
239
? pht('Add Comment')
241
240
: pht('History Beckons');
242
241
243
-
$button_name = $is_serious
244
-
? pht('Add Comment')
245
-
: pht('Answer The Call');
246
-
247
242
$form = id(new PhabricatorApplicationTransactionCommentView())
248
243
->setUser($user)
249
244
->setObjectPHID($mock->getPHID())
250
245
->setFormID($comment_form_id)
251
246
->setDraft($draft)
252
247
->setHeaderText($title)
253
-
->setSubmitButtonName($button_name)
248
+
->setSubmitButtonName(pht('Add Comment'))
254
249
->setAction($this->getApplicationURI('/comment/'.$mock->getID().'/'))
255
250
->setRequestURI($this->getRequest()->getRequestURI());
256
251
+1
-6
src/applications/phriction/controller/PhrictionMoveController.php
+1
-6
src/applications/phriction/controller/PhrictionMoveController.php
···
15
15
public function processRequest() {
16
16
$request = $this->getRequest();
17
17
$user = $request->getUser();
18
-
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
19
18
20
19
if ($this->id) {
21
20
$document = id(new PhrictionDocument())->load($this->id);
···
114
113
->setErrors($errors);
115
114
}
116
115
117
-
$descr_caption = $is_serious ? pht('A reason for the move.') :
118
-
pht('You better give a good reason for this.');
119
-
120
116
$form = id(new PHUIFormLayoutView())
121
117
->setUser($user)
122
118
->appendChild(
···
135
131
->setLabel(pht('Edit Notes'))
136
132
->setValue($content->getDescription())
137
133
->setError(null)
138
-
->setName('description')
139
-
->setCaption($descr_caption));
134
+
->setName('description'));
140
135
141
136
$dialog = id(new AphrontDialogView())
142
137
->setUser($user)
+1
-5
src/applications/ponder/view/PonderAddAnswerView.php
+1
-5
src/applications/ponder/view/PonderAddAnswerView.php
···
17
17
}
18
18
19
19
public function render() {
20
-
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
21
-
22
20
$question = $this->question;
23
21
24
22
$header = id(new PHUIHeaderView())
···
39
37
->setUser($this->user))
40
38
->appendChild(
41
39
id(new AphrontFormSubmitControl())
42
-
->setValue($is_serious ?
43
-
pht('Add Answer') :
44
-
pht('Bequeath Wisdom')));
40
+
->setValue(pht('Add Answer')));
45
41
46
42
return id(new PHUIObjectBoxView())
47
43
->setHeader($header)
+1
-5
src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
+1
-5
src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
···
164
164
? pht('Add Comment')
165
165
: pht('Enter Deliberations');
166
166
167
-
$submit_button_name = $is_serious
168
-
? pht('Add Comment')
169
-
: pht('Perhaps');
170
-
171
167
$draft = PhabricatorDraft::newFromUserAndKey($viewer, $poll->getPHID());
172
168
173
169
return id(new PhabricatorApplicationTransactionCommentView())
···
176
172
->setDraft($draft)
177
173
->setHeaderText($add_comment_header)
178
174
->setAction($this->getApplicationURI('/comment/'.$poll->getID().'/'))
179
-
->setSubmitButtonName($submit_button_name);
175
+
->setSubmitButtonName(pht('Add Comment'));
180
176
181
177
}
182
178