@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 product literal strings in "pht()", part 12
Summary: Ref T13658.
Test Plan:
This is non-exhuastive.
- Poked around "Auth": edited a provider, toggled a provider.
Maniphest Tasks: T13658
Differential Revision: https://secure.phabricator.com/D21778
+52
-49
+23
-18
src/applications/auth/controller/PhabricatorAuthLoginController.php
+23
-18
src/applications/auth/controller/PhabricatorAuthLoginController.php
···
80
80
} else {
81
81
return $this->renderError(
82
82
pht(
83
-
'The external account ("%s") you just authenticated with is '.
84
-
'not configured to allow logins on this Phabricator install. '.
85
-
'An administrator may have recently disabled it.',
83
+
'The external service ("%s") you just authenticated with is '.
84
+
'not configured to allow logins on this server. An '.
85
+
'administrator may have recently disabled it.',
86
86
$provider->getProviderName()));
87
87
}
88
88
} else if ($viewer->getPHID() == $account->getUserPHID()) {
···
94
94
} else {
95
95
return $this->renderError(
96
96
pht(
97
-
'The external account ("%s") you just used to log in is already '.
98
-
'associated with another Phabricator user account. Log in to the '.
99
-
'other Phabricator account and unlink the external account before '.
100
-
'linking it to a new Phabricator account.',
101
-
$provider->getProviderName()));
97
+
'The external service ("%s") you just used to log in is already '.
98
+
'associated with another %s user account. Log in to the '.
99
+
'other %s account and unlink the external account before '.
100
+
'linking it to a new %s account.',
101
+
$provider->getProviderName(),
102
+
PlatformSymbols::getPlatformServerName(),
103
+
PlatformSymbols::getPlatformServerName(),
104
+
PlatformSymbols::getPlatformServerName()));
102
105
}
103
106
} else {
104
107
// The account is not yet attached to a Phabricator user, so this is
···
109
112
} else {
110
113
return $this->renderError(
111
114
pht(
112
-
'The external account ("%s") you just authenticated with is '.
113
-
'not configured to allow registration on this Phabricator '.
114
-
'install. An administrator may have recently disabled it.',
115
+
'The external service ("%s") you just authenticated with is '.
116
+
'not configured to allow registration on this server. An '.
117
+
'administrator may have recently disabled it.',
115
118
$provider->getProviderName()));
116
119
}
117
120
} else {
···
135
138
if ($existing_accounts) {
136
139
return $this->renderError(
137
140
pht(
138
-
'Your Phabricator account is already connected to an external '.
139
-
'account on this provider ("%s"), but you are currently logged '.
140
-
'in to the provider with a different account. Log out of the '.
141
+
'Your %s account is already connected to an external '.
142
+
'account on this service ("%s"), but you are currently logged '.
143
+
'in to the service with a different account. Log out of the '.
141
144
'external service, then log back in with the correct account '.
142
145
'before refreshing the account link.',
146
+
PlatformSymbols::getPlatformServerName(),
143
147
$provider->getProviderName()));
144
148
}
145
149
···
148
152
} else {
149
153
return $this->renderError(
150
154
pht(
151
-
'The external account ("%s") you just authenticated with is '.
152
-
'not configured to allow account linking on this Phabricator '.
153
-
'install. An administrator may have recently disabled it.',
155
+
'The external service ("%s") you just authenticated with is '.
156
+
'not configured to allow account linking on this server. An '.
157
+
'administrator may have recently disabled it.',
154
158
$provider->getProviderName()));
155
159
}
156
160
}
···
169
173
return $this->renderError(
170
174
pht(
171
175
'The external account you just logged in with is not associated '.
172
-
'with a valid Phabricator user.'));
176
+
'with a valid %s user account.',
177
+
PlatformSymbols::getPlatformServerName()));
173
178
}
174
179
175
180
return $this->loginUser($user);
+1
-1
src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
+1
-1
src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
···
202
202
$messages = array();
203
203
204
204
$messages[] = pht(
205
-
'Before you can use Phabricator, you need to add multi-factor '.
205
+
'Before you can use this software, you need to add multi-factor '.
206
206
'authentication to your account. Multi-factor authentication helps '.
207
207
'secure your account by making it more difficult for attackers to '.
208
208
'gain access or take sensitive actions.');
+3
-2
src/applications/auth/controller/PhabricatorAuthSetExternalController.php
+3
-2
src/applications/auth/controller/PhabricatorAuthSetExternalController.php
···
42
42
PhabricatorAuthLinkMessageType::MESSAGEKEY);
43
43
if (!strlen($text)) {
44
44
$text = pht(
45
-
'You can link your Phabricator account to an external account to '.
45
+
'You can link your %s account to an external account to '.
46
46
'allow you to log in more easily in the future. To continue, choose '.
47
47
'an account to link below. If you prefer not to link your account, '.
48
-
'you can skip this step.');
48
+
'you can skip this step.',
49
+
PlatformSymbols::getPlatformServerName());
49
50
}
50
51
51
52
$remarkup_view = new PHUIRemarkupView($viewer, $text);
+5
-5
src/applications/auth/controller/PhabricatorAuthStartController.php
+5
-5
src/applications/auth/controller/PhabricatorAuthStartController.php
···
90
90
91
91
return $this->renderError(
92
92
pht(
93
-
'This Phabricator install is not configured with any enabled '.
94
-
'authentication providers which can be used to log in. If you '.
95
-
'have accidentally locked yourself out by disabling all providers, '.
96
-
'you can use `%s` to recover access to an account.',
97
-
'phabricator/bin/auth recover <username>'));
93
+
'This server is not configured with any enabled authentication '.
94
+
'providers which can be used to log in. If you have accidentally '.
95
+
'locked yourself out by disabling all providers, you can use `%s` '.
96
+
'to recover access to an account.',
97
+
'./bin/auth recover <username>'));
98
98
}
99
99
100
100
$next_uri = $request->getStr('next');
+2
-2
src/applications/auth/controller/PhabricatorAuthUnlinkController.php
+2
-2
src/applications/auth/controller/PhabricatorAuthUnlinkController.php
···
86
86
->appendChild(
87
87
pht(
88
88
'You can not unlink this account because the administrator has '.
89
-
'configured Phabricator to make links to "%s" accounts permanent.',
89
+
'configured this server to make links to "%s" accounts permanent.',
90
90
$provider->getProviderName()))
91
91
->addCancelButton($done_uri);
92
92
}
···
123
123
$title = pht('Unlink "%s" Account?', $provider->getProviderName());
124
124
$body = pht(
125
125
'You will no longer be able to use your %s account to '.
126
-
'log in to Phabricator.',
126
+
'log in.',
127
127
$provider->getProviderName());
128
128
129
129
return $this->newDialog()
+1
-2
src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
+1
-2
src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
···
34
34
35
35
$must_verify = pht(
36
36
'You must verify your email address to log in. You should have a '.
37
-
'new email message from Phabricator with verification instructions '.
38
-
'in your inbox (%s).',
37
+
'new email message with verification instructions in your inbox (%s).',
39
38
phutil_tag('strong', array(), $email_address));
40
39
41
40
$send_again = pht(
+3
-3
src/applications/auth/controller/config/PhabricatorAuthDisableController.php
+3
-3
src/applications/auth/controller/config/PhabricatorAuthDisableController.php
···
49
49
if ($config->getShouldAllowRegistration()) {
50
50
$body = pht(
51
51
'Do you want to enable this provider? Users will be able to use '.
52
-
'their existing external accounts to register new Phabricator '.
53
-
'accounts and log in using linked accounts.');
52
+
'their existing external accounts to register new accounts and '.
53
+
'log in using linked accounts.');
54
54
} else {
55
55
$body = pht(
56
56
'Do you want to enable this provider? Users will be able to log '.
57
-
'in to Phabricator using linked accounts.');
57
+
'in using linked accounts.');
58
58
}
59
59
$button = pht('Enable Provider');
60
60
} else {
+11
-12
src/applications/auth/controller/config/PhabricatorAuthEditController.php
+11
-12
src/applications/auth/controller/config/PhabricatorAuthEditController.php
···
220
220
} else {
221
221
$registration_warning = pht(
222
222
"NOTE: Any user who can browse to this install's login page will be ".
223
-
"able to register a Phabricator account. To restrict who can register ".
223
+
"able to register an account. To restrict who can register ".
224
224
"an account, configure [[ %s | %s ]].",
225
225
$config_href,
226
226
$config_name);
···
238
238
phutil_tag('strong', array(), pht('Allow Registration:')),
239
239
' ',
240
240
pht(
241
-
'Allow users to register new Phabricator accounts using this '.
242
-
'provider. If you disable registration, users can still use this '.
243
-
'provider to log in to existing accounts, but will not be able to '.
244
-
'create new accounts.'),
241
+
'Allow users to register new accounts using this provider. If you '.
242
+
'disable registration, users can still use this provider to log in '.
243
+
'to existing accounts, but will not be able to create new accounts.'),
245
244
);
246
245
247
246
$str_link = hsprintf(
···
249
248
pht('Allow Linking Accounts'),
250
249
pht(
251
250
'Allow users to link account credentials for this provider to '.
252
-
'existing Phabricator accounts. There is normally no reason to '.
253
-
'disable this unless you are trying to move away from a provider '.
254
-
'and want to stop users from creating new account links.'));
251
+
'existing accounts. There is normally no reason to disable this '.
252
+
'unless you are trying to move away from a provider and want to '.
253
+
'stop users from creating new account links.'));
255
254
256
255
$str_unlink = hsprintf(
257
256
'<strong>%s:</strong> %s',
258
257
pht('Allow Unlinking Accounts'),
259
258
pht(
260
259
'Allow users to unlink account credentials for this provider from '.
261
-
'existing Phabricator accounts. If you disable this, Phabricator '.
262
-
'accounts will be permanently bound to provider accounts.'));
260
+
'existing accounts. If you disable this, accounts will be '.
261
+
'permanently bound to provider accounts.'));
263
262
264
263
$str_trusted_email = hsprintf(
265
264
'<strong>%s:</strong> %s',
266
265
pht('Trust Email Addresses'),
267
266
pht(
268
-
'Phabricator will skip email verification for accounts registered '.
267
+
'Skip email verification for accounts registered '.
269
268
'through this provider.'));
270
269
$str_auto_login = hsprintf(
271
270
'<strong>%s:</strong> %s',
272
271
pht('Allow Auto Login'),
273
272
pht(
274
-
'Phabricator will automatically login with this provider if it is '.
273
+
'Automatically log in with this provider if it is '.
275
274
'the only available provider.'));
276
275
277
276
$form = id(new AphrontFormView())
+1
-2
src/applications/auth/controller/config/PhabricatorAuthListController.php
+1
-2
src/applications/auth/controller/config/PhabricatorAuthListController.php
···
53
53
$list->setNoDataString(
54
54
pht(
55
55
'%s You have not added authentication providers yet. Use "%s" to add '.
56
-
'a provider, which will let users register new Phabricator accounts '.
57
-
'and log in.',
56
+
'a provider, which will let users register new accounts and log in.',
58
57
phutil_tag(
59
58
'strong',
60
59
array(),
+2
-2
src/applications/auth/guidance/PhabricatorAuthProvidersGuidanceEngineExtension.php
+2
-2
src/applications/auth/guidance/PhabricatorAuthProvidersGuidanceEngineExtension.php
···
42
42
43
43
if ($domains_value) {
44
44
$message = pht(
45
-
'Phabricator is configured with an email domain whitelist (in %s), so '.
45
+
'This server is configured with an email domain whitelist (in %s), so '.
46
46
'only users with a verified email address at one of these %s '.
47
47
'allowed domain(s) will be able to register an account: %s',
48
48
$domains_link,
···
53
53
->setMessage($message);
54
54
} else {
55
55
$message = pht(
56
-
'Anyone who can browse to this Phabricator install will be able to '.
56
+
'Anyone who can browse to this this server will be able to '.
57
57
'register an account. To add email domain restrictions, configure '.
58
58
'%s.',
59
59
$domains_link);