$this->l10n = $l10n;
}
+ /**
+ * Wraps the L10n::t() function for Modules
+ *
+ * @see L10n::t()
+ */
+ protected function t(string $s, ...$args): string
+ {
+ return $this->l10n->t($s, $args);
+ }
+
+ /**
+ * Wraps the L10n::tt() function for Modules
+ *
+ * @see L10n::tt()
+ */
+ protected function tt(string $singular, string $plurarl, int $count): string
+ {
+ return $this->l10n->tt($singular, $plurarl, $count);
+ }
+
/**
* {@inheritDoc}
*/
$theme = Strings::sanitizeFilePathItem($this->parameters['theme']);
if (!is_dir("view/theme/$theme")) {
- notice($this->l10n->t('Unknown theme.'));
+ notice($this->t('Unknown theme.'));
return '';
}
$t = Renderer::getMarkupTemplate('admin/tos.tpl');
return Renderer::replaceMacros($t, [
- '$title' => $this->l10n->t('Administration'),
- '$page' => $this->l10n->t('Terms of Service'),
- '$displaytos' => ['displaytos', $this->l10n->t('Display Terms of Service'), $this->config->get('system', 'tosdisplay'), $this->l10n->t('Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page.')],
- '$displayprivstatement' => ['displayprivstatement', $this->
l10n->t('Display Privacy Statement'), $this->config->get('system', 'tosprivstatement'), $this->l10n->t('Show some informations regarding the needed information to operate the node according e.g. to <a href="%s" target="_blank" rel="noopener noreferrer">EU-GDPR</a>.', 'https://en.wikipedia.org/wiki/General_Data_Protection_Regulation')],
- '$preview' => $this->l10n->t('Privacy Statement Preview'),
+ '$title' => $this->t('Administration'),
+ '$page' => $this->t('Terms of Service'),
+ '$displaytos' => ['displaytos', $this->t('Display Terms of Service'), $this->config->get('system', 'tosdisplay'), $this->t('Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page.')],
+ '$displayprivstatement' => ['displayprivstatement', $this->
t('Display Privacy Statement'), $this->config->get('system', 'tosprivstatement'), $this->t('Show some informations regarding the needed information to operate the node according e.g. to <a href="%s" target="_blank" rel="noopener noreferrer">EU-GDPR</a>.', 'https://en.wikipedia.org/wiki/General_Data_Protection_Regulation')],
+ '$preview' => $this->t('Privacy Statement Preview'),
'$privtext' => $this->tos->privacy_complete,
- '$tostext' => ['tostext', $this->l10n->t('The Terms of Service'), $this->config->get('system', 'tostext'), $this->l10n->t('Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below.')],
+ '$tostext' => ['tostext', $this->t('The Terms of Service'), $this->config->get('system', 'tostext'), $this->t('Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below.')],
'$form_security_token' => self::getFormSecurityToken('admin_tos'),
- '$submit' => $this->l10n->t('Save Settings'),
+ '$submit' => $this->t('Save Settings'),
]);
}
}
$apps = Nav::getAppMenu();
if (count($apps) == 0) {
- notice($this->l10n->t('No installed applications.'));
+ notice($this->t('No installed applications.'));
}
$tpl = Renderer::getMarkupTemplate('apps.tpl');
return Renderer::replaceMacros($tpl, [
- '$title' => $this->l10n->t('Applications'),
+ '$title' => $this->t('Applications'),
'$apps' => $apps,
]);
}
parent::__construct($l10n, $parameters);
if (!local_user()) {
- throw new ForbiddenException($this->l10n->t('Permission denied.'));
+ throw new ForbiddenException($this->t('Permission denied.'));
}
$page = ($_REQUEST['page'] ?? 0) ?: 1;
$notif_tpl = Renderer::getMarkupTemplate('notifications/notifications.tpl');
return Renderer::replaceMacros($notif_tpl, [
- '$header' => $header ?? $this->l10n->t('Notifications'),
+ '$header' => $header ?? $this->t('Notifications'),
'$tabs' => $tabs,
'$notifications' => $notifications,
'$noContent' => $noContent,
foreach (self::URL_TYPES as $type => $url) {
$tabs[] = [
- 'label' => $this->l10n->t(self::PRINT_TYPES[$type]),
+ 'label' => $this->t(self::PRINT_TYPES[$type]),
'url' => 'notifications/' . $url,
'sel' => (($selected == $url) ? 'active' : ''),
'id' => $type . '-tab',
$this->page = $page;
if (!Session::isAuthenticated()) {
- throw new ForbiddenException($this->l10n->t('Permission denied.'));
+ throw new ForbiddenException($this->t('Permission denied.'));
}
}
$contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => local_user()]);
if (empty($contact)) {
- throw new BadRequestException($this->l10n->t('Contact not found.'));
+ throw new BadRequestException($this->t('Contact not found.'));
}
$name = ($_POST['name'] ?? '') ?: $contact['name'];
}
if (!$r) {
- notice($this->l10n->t('Contact update failed.'));
+ notice($this->t('Contact update failed.'));
}
}
$contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => local_user()]);
if (empty($contact)) {
- throw new BadRequestException($this->l10n->t('Contact not found.'));
+ throw new BadRequestException($this->t('Contact not found.'));
}
$this->page['aside'] = Widget\VCard::getHTML($contact);
- $warning = $this->l10n->t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
- $info = $this->l10n->t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');
+ $warning = $this->t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
+ $info = $this->t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');
$returnaddr = "contact/$cid";
'$warning' => $warning,
'$info' => $info,
'$returnaddr' => $returnaddr,
- '$return' => $this->l10n->t('Return to contact editor'),
+ '$return' => $this->t('Return to contact editor'),
'$contact_id' => $contact['id'],
- '$lbl_submit' => $this->l10n->t('Submit'),
-
- '$name' => ['name', $this->l10n->t('Name'), $contact['name'], '', '', $readonly],
- '$nick' => ['nick', $this->l10n->t('Account Nickname'), $contact['nick'], '', '', $readonly],
- '$attag' => ['attag', $this->l10n->t('@Tagname - overrides Name/Nickname'), $contact['attag']],
- '$url' => ['url', $this->l10n->t('Account URL'), $contact['url'], '', '', $readonly],
- '$alias' => ['alias', $this->l10n->t('Account URL Alias'), $contact['alias'], '', '', $readonly],
- '$request' => ['request', $this->l10n->t('Friend Request URL'), $contact['request'], '', '', $readonly],
- 'confirm' => ['confirm', $this->l10n->t('Friend Confirm URL'), $contact['confirm'], '', '', $readonly],
- 'notify' => ['notify', $this->l10n->t('Notification Endpoint URL'), $contact['notify'], '', '', $readonly],
- 'poll' => ['poll', $this->l10n->t('Poll/Feed URL'), $contact['poll'], '', '', $readonly],
- 'photo' => ['photo', $this->l10n->t('New photo from this URL'), '', '', '', $readonly],
+ '$lbl_submit' => $this->t('Submit'),
+
+ '$name' => ['name', $this->t('Name'), $contact['name'], '', '', $readonly],
+ '$nick' => ['nick', $this->t('Account Nickname'), $contact['nick'], '', '', $readonly],
+ '$attag' => ['attag', $this->t('@Tagname - overrides Name/Nickname'), $contact['attag']],
+ '$url' => ['url', $this->t('Account URL'), $contact['url'], '', '', $readonly],
+ '$alias' => ['alias', $this->t('Account URL Alias'), $contact['alias'], '', '', $readonly],
+ '$request' => ['request', $this->t('Friend Request URL'), $contact['request'], '', '', $readonly],
+ 'confirm' => ['confirm', $this->t('Friend Confirm URL'), $contact['confirm'], '', '', $readonly],
+ 'notify' => ['notify', $this->t('Notification Endpoint URL'), $contact['notify'], '', '', $readonly],
+ 'poll' => ['poll', $this->t('Poll/Feed URL'), $contact['poll'], '', '', $readonly],
+ 'photo' => ['photo', $this->t('New photo from this URL'), '', '', '', $readonly],
]);
}
}
$data = Model\Contact::getPublicAndUserContactID($this->parameters['id'], local_user());
if (!$this->dba->isResult($data)) {
- throw new HTTPException\NotFoundException($this->l10n->t('Unknown contact.'));
+ throw new HTTPException\NotFoundException($this->t('Unknown contact.'));
}
if (empty($data['user'])) {
$this->contact = Model\Contact::getById($data['user']);
if ($this->contact['deleted']) {
- throw new HTTPException\NotFoundException($this->l10n->t('Contact is deleted.'));
+ throw new HTTPException\NotFoundException($this->t('Contact is deleted.'));
}
if (!empty($this->contact['network']) && $this->contact['network'] == Protocol::PHANTOM) {
- throw new HTTPException\NotFoundException($this->l10n->t('Contact is being deleted.'));
+ throw new HTTPException\NotFoundException($this->t('Contact is being deleted.'));
}
}
$result = Model\Contact::revokeFollow($this->contact);
if ($result === true) {
- notice($this->l10n->t('Follow was successfully revoked.'));
+ notice($this->t('Follow was successfully revoked.'));
} elseif ($result === null) {
- notice($this->l10n->t('Follow was successfully revoked, however the remote contact won\'t be aware of this revokation.'));
+ notice($this->t('Follow was successfully revoked, however the remote contact won\'t be aware of this revokation.'));
} else {
- notice($this->l10n->t('Unable to revoke follow, please try again later or contact the administrator.'));
+ notice($this->t('Unable to revoke follow, please try again later or contact the administrator.'));
}
$this->baseUrl->redirect('contact/' . $this->parameters['id']);
return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [
'$l10n' => [
- 'header' => $this->l10n->t('Revoke Follow'),
- 'message' => $this->l10n->t('Do you really want to revoke this contact\'s follow? This cannot be undone and they will have to manually follow you back again.'),
- 'confirm' => $this->l10n->t('Yes'),
- 'cancel' => $this->l10n->t('Cancel'),
+ 'header' => $this->t('Revoke Follow'),
+ 'message' => $this->t('Do you really want to revoke this contact\'s follow? This cannot be undone and they will have to manually follow you back again.'),
+ 'confirm' => $this->t('Yes'),
+ 'cancel' => $this->t('Cancel'),
],
'$contact' => Contact::getContactTemplateVars($this->contact),
'$method' => 'post',
$this->httpClient = $httpClient;
if (!local_user()) {
- notice($this->l10n->t('You must be logged in to use this module'));
+ notice($this->t('You must be logged in to use this module'));
$baseUrl->redirect();
}
}
$tpl = Renderer::getMarkupTemplate('feedtest.tpl');
return Renderer::replaceMacros($tpl, [
- '$url' => ['url', $this->l10n->t('Source URL'), $_REQUEST['url'] ?? '', ''],
+ '$url' => ['url', $this->t('Source URL'), $_REQUEST['url'] ?? '', ''],
'$result' => $result
]);
}
$enabled = $this->config->get('system', 'diaspora_enabled', false);
if (!$enabled) {
$this->logger->info('Diaspora disabled.');
- throw new HTTPException\ForbiddenException($this->l10n->t('Access denied.'));
+ throw new HTTPException\ForbiddenException($this->t('Access denied.'));
}
if ($this->parameters['type'] === 'public') {
$this->logger = $logger;
if (!local_user()) {
- notice($this->l10n->t('You must be logged in to use this module'));
+ notice($this->t('You must be logged in to use this module'));
$baseUrl->redirect();
}
}
$tpl = Renderer::getMarkupTemplate("filer_dialog.tpl");
echo Renderer::replaceMacros($tpl, [
- '$field' => ['term', $this->l10n->t("Save to Folder:"), '', '', $filetags, $this->l10n->t('- select -')],
- '$submit' => $this->l10n->t('Save'),
+ '$field' => ['term', $this->t("Save to Folder:"), '', '', $filetags, $this->t('- select -')],
+ '$submit' => $this->t('Save'),
]);
exit;
parent::__construct($l10n, $parameters);
if (!local_user()) {
- throw new ForbiddenException($this->l10n->t('Permission denied.'));
+ throw new ForbiddenException($this->t('Permission denied.'));
}
$this->baseUrl = $baseUrl;
// We do query the "uid" as well to ensure that it is our contact
if (!$this->dba->exists('contact', ['id' => $cid, 'uid' => local_user()])) {
- throw new NotFoundException($this->l10n->t('Contact not found.'));
+ throw new NotFoundException($this->t('Contact not found.'));
}
$suggest_contact_id = intval($_POST['suggest']);
// We do query the "uid" as well to ensure that it is our contact
$contact = $this->dba->selectFirst('contact', ['name', 'url', 'request', 'avatar'], ['id' => $suggest_contact_id, 'uid' => local_user()]);
if (empty($contact)) {
- notice($this->l10n->t('Suggested contact not found.'));
+ notice($this->t('Suggested contact not found.'));
return;
}
Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::SUGGESTION, $suggest->id);
- info($this->l10n->t('Friend suggestion sent.'));
+ info($this->t('Friend suggestion sent.'));
}
public function content(): string
$contact = $this->dba->selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
if (empty($contact)) {
- notice($this->l10n->t('Contact not found.'));
+ notice($this->t('Contact not found.'));
$this->baseUrl->redirect();
}
$tpl = Renderer::getMarkupTemplate('fsuggest.tpl');
return Renderer::replaceMacros($tpl, [
'$contact_id' => $cid,
- '$fsuggest_title' => $this->l10n->t('Suggest Friends'),
+ '$fsuggest_title' => $this->t('Suggest Friends'),
'$fsuggest_select' => [
'suggest',
- $this->l10n->t('Suggest a friend for %s', $contact['name']),
+ $this->t('Suggest a friend for %s', $contact['name']),
'',
'',
$formattedContacts,
],
- '$submit' => $this->l10n->t('Submit'),
+ '$submit' => $this->t('Submit'),
]);
}
}
$output = '';
- $install_title = $this->l10n->t('Friendica Communications Server - Setup');
+ $install_title = $this->t('Friendica Communications Server - Setup');
switch ($this->currentWizardStep) {
case self::SYSTEM_CHECK:
$tpl = Renderer::getMarkupTemplate('install_checks.tpl');
$output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title,
- '$pass' => $this->l10n->t('System check'),
- '$required' => $this->l10n->t('Required'),
- '$requirement_not_satisfied' => $this->l10n->t('Requirement not satisfied'),
- '$optional_requirement_not_satisfied' => $this->l10n->t('Optional requirement not satisfied'),
- '$ok' => $this->l10n->t('OK'),
+ '$pass' => $this->t('System check'),
+ '$required' => $this->t('Required'),
+ '$requirement_not_satisfied' => $this->t('Requirement not satisfied'),
+ '$optional_requirement_not_satisfied' => $this->t('Optional requirement not satisfied'),
+ '$ok' => $this->t('OK'),
'$checks' => $this->installer->getChecks(),
'$passed' => $status,
- '$see_install' => $this->l10n->t('Please see the file "doc/INSTALL.md".'),
- '$next' => $this->l10n->t('Next'),
- '$reload' => $this->l10n->t('Check again'),
+ '$see_install' => $this->t('Please see the file "doc/INSTALL.md".'),
+ '$next' => $this->t('Next'),
+ '$reload' => $this->t('Check again'),
'$php_path' => $php_path,
]);
break;
case self::BASE_CONFIG:
$ssl_choices = [
- App\BaseURL::SSL_POLICY_NONE => $this->l10n->t("No SSL policy, links will track page SSL state"),
- App\BaseURL::SSL_POLICY_FULL => $this->l10n->t("Force all links to use SSL"),
- App\BaseURL::SSL_POLICY_SELFSIGN => $this->l10n->t("Self-signed certificate, use SSL for local links only \x28discouraged\x29")
+ App\BaseURL::SSL_POLICY_NONE => $this->t("No SSL policy, links will track page SSL state"),
+ App\BaseURL::SSL_POLICY_FULL => $this->t("Force all links to use SSL"),
+ App\BaseURL::SSL_POLICY_SELFSIGN => $this->t("Self-signed certificate, use SSL for local links only \x28discouraged\x29")
];
$tpl = Renderer::getMarkupTemplate('install_base.tpl');
$output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title,
- '$pass' => $this->l10n->t('Base settings'),
+ '$pass' => $this->t('Base settings'),
'$ssl_policy' => ['system-ssl_policy',
- $this->l10n->t("SSL link policy"),
+ $this->t("SSL link policy"),
$configCache->get('system', 'ssl_policy'),
- $this->l10n->t("Determines whether generated links should be forced to use SSL"),
+ $this->t("Determines whether generated links should be forced to use SSL"),
$ssl_choices],
'$hostname' => ['config-hostname',
- $this->l10n->t('Host name'),
+ $this->t('Host name'),
$configCache->get('config', 'hostname'),
- $this->l10n->t('Overwrite this field in case the determinated hostname isn\'t right, otherweise leave it as is.'),
- $this->l10n->t('Required')],
+ $this->t('Overwrite this field in case the determinated hostname isn\'t right, otherweise leave it as is.'),
+ $this->t('Required')],
'$basepath' => ['system-basepath',
- $this->l10n->t("Base path to installation"),
+ $this->t("Base path to installation"),
$configCache->get('system', 'basepath'),
- $this->l10n->t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."),
- $this->l10n->t('Required')],
+ $this->t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."),
+ $this->t('Required')],
'$urlpath' => ['system-urlpath',
- $this->l10n->t('Sub path of the URL'),
+ $this->t('Sub path of the URL'),
$configCache->get('system', 'urlpath'),
- $this->l10n->t('Overwrite this field in case the sub path determination isn\'t right, otherwise leave it as is. Leaving this field blank means the installation is at the base URL without sub path.'),
+ $this->t('Overwrite this field in case the sub path determination isn\'t right, otherwise leave it as is. Leaving this field blank means the installation is at the base URL without sub path.'),
''],
'$php_path' => $configCache->get('config', 'php_path'),
- '$submit' => $this->l10n->t('Submit'),
+ '$submit' => $this->t('Submit'),
]);
break;
$tpl = Renderer::getMarkupTemplate('install_db.tpl');
$output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title,
- '$pass' => $this->l10n->t('Database connection'),
- '$info_01' => $this->l10n->t('In order to install Friendica we need to know how to connect to your database.'),
- '$info_02' => $this->l10n->t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
- '$info_03' => $this->l10n->t('The database you specify below should already exist. If it does not, please create it before continuing.'),
- '$required' => $this->l10n->t('Required'),
- '$requirement_not_satisfied' => $this->l10n->t('Requirement not satisfied'),
+ '$pass' => $this->t('Database connection'),
+ '$info_01' => $this->t('In order to install Friendica we need to know how to connect to your database.'),
+ '$info_02' => $this->t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
+ '$info_03' => $this->t('The database you specify below should already exist. If it does not, please create it before continuing.'),
+ '$required' => $this->t('Required'),
+ '$requirement_not_satisfied' => $this->t('Requirement not satisfied'),
'$checks' => $this->installer->getChecks(),
'$hostname' => $configCache->get('config', 'hostname'),
'$ssl_policy' => $configCache->get('system', 'ssl_policy'),
'$basepath' => $configCache->get('system', 'basepath'),
'$urlpath' => $configCache->get('system', 'urlpath'),
'$dbhost' => ['database-hostname',
- $this->l10n->t('Database Server Name'),
+ $this->t('Database Server Name'),
$configCache->get('database', 'hostname'),
'',
- $this->l10n->t('Required')],
+ $this->t('Required')],
'$dbuser' => ['database-username',
- $this->l10n->t('Database Login Name'),
+ $this->t('Database Login Name'),
$configCache->get('database', 'username'),
'',
- $this->l10n->t('Required'),
+ $this->t('Required'),
'autofocus'],
'$dbpass' => ['database-password',
- $this->l10n->t('Database Login Password'),
+ $this->t('Database Login Password'),
$configCache->get('database', 'password'),
- $this->l10n->t("For security reasons the password must not be empty"),
- $this->l10n->t('Required')],
+ $this->t("For security reasons the password must not be empty"),
+ $this->t('Required')],
'$dbdata' => ['database-database',
- $this->l10n->t('Database Name'),
+ $this->t('Database Name'),
$configCache->get('database', 'database'),
'',
- $this->l10n->t('Required')],
- '$lbl_10' => $this->l10n->t('Please select a default timezone for your website'),
+ $this->t('Required')],
+ '$lbl_10' => $this->t('Please select a default timezone for your website'),
'$php_path' => $configCache->get('config', 'php_path'),
- '$submit' => $this->l10n->t('Submit')
+ '$submit' => $this->t('Submit')
]);
break;
$tpl = Renderer::getMarkupTemplate('install_settings.tpl');
$output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title,
- '$required' => $this->l10n->t('Required'),
+ '$required' => $this->t('Required'),
'$checks' => $this->installer->getChecks(),
- '$pass' => $this->l10n->t('Site settings'),
+ '$pass' => $this->t('Site settings'),
'$hostname' => $configCache->get('config', 'hostname'),
'$ssl_policy' => $configCache->get('system', 'ssl_policy'),
'$basepath' => $configCache->get('system', 'basepath'),
'$dbpass' => $configCache->get('database', 'password'),
'$dbdata' => $configCache->get('database', 'database'),
'$adminmail' => ['config-admin_email',
- $this->l10n->t('Site administrator email address'),
+ $this->t('Site administrator email address'),
$configCache->get('config', 'admin_email'),
- $this->l10n->t('Your account email address must match this in order to use the web admin panel.'),
- $this->l10n->t('Required'), 'autofocus', 'email'],
+ $this->t('Your account email address must match this in order to use the web admin panel.'),
+ $this->t('Required'), 'autofocus', 'email'],
'$timezone' => Temporal::getTimezoneField('system-default_timezone',
- $this->l10n->t('Please select a default timezone for your website'),
+ $this->t('Please select a default timezone for your website'),
$configCache->get('system', 'default_timezone'),
''),
'$language' => ['system-language',
- $this->l10n->t('System Language:'),
+ $this->t('System Language:'),
$configCache->get('system', 'language'),
- $this->l10n->t('Set the default language for your Friendica installation interface and to send emails.'),
+ $this->t('Set the default language for your Friendica installation interface and to send emails.'),
$lang_choices],
'$php_path' => $configCache->get('config', 'php_path'),
- '$submit' => $this->l10n->t('Submit')
+ '$submit' => $this->t('Submit')
]);
break;
if (count($this->installer->getChecks()) == 0) {
$txt = '<p style="font-size: 130%;">';
- $txt .= $this->l10n->t('Your Friendica site database has been installed.') . EOL;
+ $txt .= $this->t('Your Friendica site database has been installed.') . EOL;
$db_return_text .= $txt;
}
$tpl = Renderer::getMarkupTemplate('install_finished.tpl');
$output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title,
- '$required' => $this->l10n->t('Required'),
- '$requirement_not_satisfied' => $this->l10n->t('Requirement not satisfied'),
+ '$required' => $this->t('Required'),
+ '$requirement_not_satisfied' => $this->t('Requirement not satisfied'),
'$checks' => $this->installer->getChecks(),
- '$pass' => $this->l10n->t('Installation finished'),
+ '$pass' => $this->t('Installation finished'),
'$text' => $db_return_text . $this->whatNext(),
]);
{
$baseurl = $this->baseUrl->get();
return
- $this->l10n->t('<h1>What next</h1>')
- . "<p>" . $this->l10n->t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.')
- . $this->l10n->t('Please see the file "doc/INSTALL.md".')
+ $this->t('<h1>What next</h1>')
+ . "<p>" . $this->t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.')
+ . $this->t('Please see the file "doc/INSTALL.md".')
. "</p><p>"
- . $this->
l10n->t('Go to your new Friendica node <a href="%s/register">registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.', $baseurl)
+ . $this->t('Go to your new Friendica node <a href="%s/register">registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.', $baseurl)
. "</p>";
}
];
return [
- 'header' => $this->l10n->t('Notifications'),
+ 'header' => $this->t('Notifications'),
'notifications' => $notifications,
];
}
// The link to switch between ignored and normal connection requests
$notificationShowLink = [
'href' => (!$all ? 'notifications/intros/all' : 'notifications/intros'),
- 'text' => (!$all ? $this->l10n->t('Show Ignored Requests') : $this->l10n->t('Hide Ignored Requests')),
+ 'text' => (!$all ? $this->t('Show Ignored Requests') : $this->t('Hide Ignored Requests')),
];
$owner = User::getOwnerDataById(local_user());
case 'friend_suggestion':
$notificationContent[] = Renderer::replaceMacros($notificationSuggestions, [
'$type' => $Introduction->getLabel(),
- '$str_notification_type' => $this->l10n->t('Notification type:'),
+ '$str_notification_type' => $this->t('Notification type:'),
'$str_type' => $Introduction->getType(),
'$intro_id' => $Introduction->getIntroId(),
- '$lbl_madeby' => $this->l10n->t('Suggested by:'),
+ '$lbl_madeby' => $this->t('Suggested by:'),
'$madeby' => $Introduction->getMadeBy(),
'$madeby_url' => $Introduction->getMadeByUrl(),
'$madeby_zrl' => $Introduction->getMadeByZrl(),
'$dfrn_url' => $owner['url'],
'$url' => $Introduction->getUrl(),
'$zrl' => $Introduction->getZrl(),
- '$lbl_url' => $this->l10n->t('Profile URL'),
+ '$lbl_url' => $this->t('Profile URL'),
'$addr' => $Introduction->getAddr(),
'$action' => 'follow',
- '$approve' => $this->l10n->t('Approve'),
+ '$approve' => $this->t('Approve'),
'$note' => $Introduction->getNote(),
- '$ignore' => $this->l10n->t('Ignore'),
- '$discard' => $this->l10n->t('Discard'),
+ '$ignore' => $this->t('Ignore'),
+ '$discard' => $this->t('Discard'),
'$is_mobile' => $this->mode->isMobile(),
]);
break;
// Normal connection requests
default:
if ($Introduction->getNetwork() === Protocol::DFRN) {
- $lbl_knowyou = $this->l10n->t('Claims to be known to you: ');
- $knowyou = ($Introduction->getKnowYou() ? $this->l10n->t('Yes') : $this->l10n->t('No'));
+ $lbl_knowyou = $this->t('Claims to be known to you: ');
+ $knowyou = ($Introduction->getKnowYou() ? $this->t('Yes') : $this->t('No'));
} else {
$lbl_knowyou = '';
$knowyou = '';
$convertedName = BBCode::convert($Introduction->getName());
- $helptext = $this->l10n->t('Shall your connection be bidirectional or not?');
- $helptext2 = $this->l10n->t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $convertedName, $convertedName);
- $helptext3 = $this->l10n->t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $convertedName);
+ $helptext = $this->t('Shall your connection be bidirectional or not?');
+ $helptext2 = $this->t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $convertedName, $convertedName);
+ $helptext3 = $this->t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $convertedName);
- $friend = ['duplex', $this->l10n->t('Friend'), '1', $helptext2, true];
- $follower = ['duplex', $this->l10n->t('Subscriber'), '0', $helptext3, false];
+ $friend = ['duplex', $this->t('Friend'), '1', $helptext2, true];
+ $follower = ['duplex', $this->t('Subscriber'), '0', $helptext3, false];
$action = 'follow_confirm';
$header .= ' (' . ContactSelector::networkToName($Introduction->getNetwork(), $Introduction->getUrl()) . ')';
if ($Introduction->getNetwork() != Protocol::DIASPORA) {
- $discard = $this->l10n->t('Discard');
+ $discard = $this->t('Discard');
} else {
$discard = '';
}
$notificationContent[] = Renderer::replaceMacros($notificationTemplate, [
'$type' => $Introduction->getLabel(),
'$header' => $header,
- '$str_notification_type' => $this->l10n->t('Notification type:'),
+ '$str_notification_type' => $this->t('Notification type:'),
'$str_type' => $Introduction->getType(),
'$dfrn_id' => $Introduction->getDfrnId(),
'$uid' => $Introduction->getUid(),
'$photo' => $Introduction->getPhoto(),
'$fullname' => $Introduction->getName(),
'$location' => $Introduction->getLocation(),
- '$lbl_location' => $this->l10n->t('Location:'),
+ '$lbl_location' => $this->t('Location:'),
'$about' => $Introduction->getAbout(),
- '$lbl_about' => $this->l10n->t('About:'),
+ '$lbl_about' => $this->t('About:'),
'$keywords' => $Introduction->getKeywords(),
- '$lbl_keywords' => $this->l10n->t('Tags:'),
- '$hidden' => ['hidden', $this->l10n->t('Hide this contact from others'), $Introduction->isHidden(), ''],
+ '$lbl_keywords' => $this->t('Tags:'),
+ '$hidden' => ['hidden', $this->t('Hide this contact from others'), $Introduction->isHidden(), ''],
'$lbl_connection_type' => $helptext,
'$friend' => $friend,
'$follower' => $follower,
'$url' => $Introduction->getUrl(),
'$zrl' => $Introduction->getZrl(),
- '$lbl_url' => $this->l10n->t('Profile URL'),
+ '$lbl_url' => $this->t('Profile URL'),
'$addr' => $Introduction->getAddr(),
'$lbl_knowyou' => $lbl_knowyou,
- '$lbl_network' => $this->l10n->t('Network:'),
+ '$lbl_network' => $this->t('Network:'),
'$network' => ContactSelector::networkToName($Introduction->getNetwork(), $Introduction->getUrl()),
'$knowyou' => $knowyou,
- '$approve' => $this->l10n->t('Approve'),
+ '$approve' => $this->t('Approve'),
'$note' => $Introduction->getNote(),
- '$ignore' => $this->l10n->t('Ignore'),
+ '$ignore' => $this->t('Ignore'),
'$discard' => $discard,
'$action' => $action,
'$is_mobile' => $this->mode->isMobile(),
}
if (count($notifications['notifications']) == 0) {
- notice($this->l10n->t('No introductions.'));
- $notificationNoContent = $this->l10n->t('No more %s notifications.', $notifications['ident']);
+ notice($this->t('No introductions.'));
+ $notificationNoContent = $this->t('No more %s notifications.', $notifications['ident']);
}
return $this->printContent($notificationHeader, $notificationContent, $notificationNoContent, $notificationShowLink);
$factory = $this->formattedNotificationFactory;
if (($this->args->get(1) == 'network')) {
- $notificationHeader = $this->l10n->t('Network Notifications');
+ $notificationHeader = $this->t('Network Notifications');
$notifications = [
'ident' => FormattedNotification::NETWORK,
'notifications' => $factory->getNetworkList($this->showAll, $this->firstItemNum, self::ITEMS_PER_PAGE),
];
} elseif (($this->args->get(1) == 'system')) {
- $notificationHeader = $this->l10n->t('System Notifications');
+ $notificationHeader = $this->t('System Notifications');
$notifications = [
'ident' => FormattedNotification::SYSTEM,
'notifications' => $factory->getSystemList($this->showAll, $this->firstItemNum, self::ITEMS_PER_PAGE),
];
} elseif (($this->args->get(1) == 'personal')) {
- $notificationHeader = $this->l10n->t('Personal Notifications');
+ $notificationHeader = $this->t('Personal Notifications');
$notifications = [
'ident' => FormattedNotification::PERSONAL,
'notifications' => $factory->getPersonalList($this->showAll, $this->firstItemNum, self::ITEMS_PER_PAGE),
];
} elseif (($this->args->get(1) == 'home')) {
- $notificationHeader = $this->l10n->t('Home Notifications');
+ $notificationHeader = $this->t('Home Notifications');
$notifications = [
'ident' => FormattedNotification::HOME,
'notifications' => $factory->getHomeList($this->showAll, $this->firstItemNum, self::ITEMS_PER_PAGE),
]);
}
} else {
- $notificationNoContent = $this->l10n->t('No more %s notifications.', $notificationResult['ident']);
+ $notificationNoContent = $this->t('No more %s notifications.', $notificationResult['ident']);
}
$notificationShowLink = [
'href' => ($this->showAll ? 'notifications/' . $notifications['ident'] : 'notifications/' . $notifications['ident'] . '?show=all'),
- 'text' => ($this->showAll ? $this->l10n->t('Show unread') : $this->l10n->t('Show all')),
+ 'text' => ($this->showAll ? $this->t('Show unread') : $this->t('Show all')),
];
return $this->printContent($notificationHeader, $notificationContent, $notificationNoContent, $notificationShowLink);
$this->owner = User::getOwnerDataByNick($this->parameters['profile']);
if (!$this->owner) {
- throw new HTTPException\NotFoundException($this->l10n->t('User not found.'));
+ throw new HTTPException\NotFoundException($this->t('User not found.'));
}
$this->baseUrl = $baseUrl;
}
if (empty($this->owner)) {
- notice($this->l10n->t('Profile unavailable.'));
+ notice($this->t('Profile unavailable.'));
return;
}
$url = Probe::cleanURI($_POST['dfrn_url']);
if (!strlen($url)) {
- notice($this->l10n->t("Invalid locator"));
+ notice($this->t("Invalid locator"));
return;
}
// Detect the network, make sure the provided URL is valid
$data = Contact::getByURL($url);
if (!$data) {
- notice($this->l10n->t("The provided profile link doesn't seem to be valid"));
+ notice($this->t("The provided profile link doesn't seem to be valid"));
return;
}
if (empty($data['subscribe'])) {
- notice($this->l10n->t("Remote subscription can't be done for your network. Please subscribe directly on your system."));
+ notice($this->t("Remote subscription can't be done for your network. Please subscribe directly on your system."));
return;
}
$tpl = Renderer::getMarkupTemplate('auto_request.tpl');
$o = Renderer::replaceMacros($tpl, [
- '$header' => $this->l10n->t('Friend/Connection Request'),
- '$page_desc' => $this->l10n->t('Enter your Webfinger address (user@domain.tld) or profile URL here. If this isn\'t supported by your system, you have to subscribe to <strong>%s</strong> or <strong>%s</strong> directly on your system.', $target_addr, $target_url),
- '$invite_desc' => $this->
l10n->t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica node and join us today</a>.', Search::getGlobalDirectory() . '/servers'),
- '$your_address' => $this->l10n->t('Your Webfinger address or profile URL:'),
- '$pls_answer' => $this->l10n->t('Please answer the following:'),
- '$submit' => $this->l10n->t('Submit Request'),
- '$cancel' => $this->l10n->t('Cancel'),
+ '$header' => $this->t('Friend/Connection Request'),
+ '$page_desc' => $this->t('Enter your Webfinger address (user@domain.tld) or profile URL here. If this isn\'t supported by your system, you have to subscribe to <strong>%s</strong> or <strong>%s</strong> directly on your system.', $target_addr, $target_url),
+ '$invite_desc' => $this->t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica node and join us today</a>.', Search::getGlobalDirectory() . '/servers'),
+ '$your_address' => $this->t('Your Webfinger address or profile URL:'),
+ '$pls_answer' => $this->t('Please answer the following:'),
+ '$submit' => $this->t('Submit Request'),
+ '$cancel' => $this->t('Cancel'),
'$request' => 'remote_follow/' . $this->parameters['profile'],
'$name' => $this->owner['name'],
$fields = ['uid' => local_user(), 'term' => $search];
if (!$this->dba->exists('search', $fields)) {
if (!$this->dba->insert('search', $fields)) {
- notice($this->l10n->t('Search term was not saved.'));
+ notice($this->t('Search term was not saved.'));
}
} else {
- notice($this->l10n->t('Search term already saved.'));
+ notice($this->t('Search term already saved.'));
}
break;
case 'remove':
if (!$this->dba->delete('search', ['uid' => local_user(), 'term' => $search])) {
- notice($this->l10n->t('Search term was not removed.'));
+ notice($this->t('Search term was not removed.'));
}
break;
}
if ($visitor_home) {
System::externalRedirect($visitor_home);
} else {
- info($this->l10n->t('Logged out.'));
+ info($this->t('Logged out.'));
$this->baseUrl->redirect();
}
}
if (RecoveryCode::existsForUser(local_user(), $recovery_code)) {
RecoveryCode::markUsedForUser(local_user(), $recovery_code);
$this->session->set('2fa', true);
- info($this->l10n->t('Remaining recovery codes: %d', RecoveryCode::countValidForUser(local_user())));
+ info($this->t('Remaining recovery codes: %d', RecoveryCode::countValidForUser(local_user())));
$this->auth->setForUser($this->app, User::getById($this->app->getLoggedInUserId()), true, true);
} else {
- notice($this->l10n->t('Invalid code, please retry.'));
+ notice($this->t('Invalid code, please retry.'));
}
}
}
return Renderer::replaceMacros(Renderer::getMarkupTemplate('twofactor/recovery.tpl'), [
'$form_security_token' => self::getFormSecurityToken('twofactor_recovery'),
- '$title' => $this->l10n->t('Two-factor recovery'),
- '$message' => $this->
l10n->t('<p>You can enter one of your one-time recovery codes in case you lost access to your mobile device.</p>'),
- '$recovery_message' => $this->
l10n->t('Don’t have your phone? <a href="%s">Enter a two-factor recovery code</a>', '2fa/recovery'),
- '$recovery_code' => ['recovery_code', $this->l10n->t('Please enter a recovery code'), '', '', '', 'placeholder="000000-000000"'],
- '$recovery_label' => $this->l10n->t('Submit recovery code and complete login'),
+ '$title' => $this->t('Two-factor recovery'),
+ '$message' => $this->t('<p>You can enter one of your one-time recovery codes in case you lost access to your mobile device.</p>'),
+ '$recovery_message' => $this->t('Don’t have your phone? <a href="%s">Enter a two-factor recovery code</a>', '2fa/recovery'),
+ '$recovery_code' => ['recovery_code', $this->t('Please enter a recovery code'), '', '', '', 'placeholder="000000-000000"'],
+ '$recovery_label' => $this->t('Submit recovery code and complete login'),
]);
}
}
}
if (!self::checkFormSecurityToken('settings_2fa_password', 't')) {
- notice($this->l10n->t('Please enter your password to access this page.'));
+ notice($this->t('Please enter your password to access this page.'));
$this->baseUrl->redirect('settings/2fa');
}
}
case 'generate':
$description = $_POST['description'] ?? '';
if (empty($description)) {
- notice($this->l10n->t('App-specific password generation failed: The description is empty.'));
+ notice($this->t('App-specific password generation failed: The description is empty.'));
$this->baseUrl->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
} elseif (AppSpecificPassword::checkDuplicateForUser(local_user(), $description)) {
- notice($this->l10n->t('App-specific password generation failed: This description already exists.'));
+ notice($this->t('App-specific password generation failed: This description already exists.'));
$this->baseUrl->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
} else {
$this->appSpecificPassword = AppSpecificPassword::generateForUser(local_user(), $_POST['description'] ?? '');
- info($this->l10n->t('New app-specific password generated.'));
+ info($this->t('New app-specific password generated.'));
}
break;
case 'revoke_all' :
AppSpecificPassword::deleteAllForUser(local_user());
- info($this->l10n->t('App-specific passwords successfully revoked.'));
+ info($this->t('App-specific passwords successfully revoked.'));
$this->baseUrl->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
break;
}
self::checkFormSecurityTokenRedirectOnError('settings/2fa/app_specific', 'settings_2fa_app_specific');
if (AppSpecificPassword::deleteForUser(local_user(), $_POST['revoke_id'])) {
- info($this->l10n->t('App-specific password successfully revoked.'));
+ info($this->t('App-specific password successfully revoked.'));
}
$this->baseUrl->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
'$form_security_token' => self::getFormSecurityToken('settings_2fa_app_specific'),
'$password_security_token' => self::getFormSecurityToken('settings_2fa_password'),
- '$title' => $this->l10n->t('Two-factor app-specific passwords'),
- '$help_label' => $this->l10n->t('Help'),
- '$message' => $this->
l10n->t('<p>App-specific passwords are randomly generated passwords used instead your regular password to authenticate your account on third-party applications that don\'t support two-factor authentication.</p>'),
- '$generated_message' => $this->l10n->t('Make sure to copy your new app-specific password now. You won’t be able to see it again!'),
+ '$title' => $this->t('Two-factor app-specific passwords'),
+ '$help_label' => $this->t('Help'),
+ '$message' => $this->t('<p>App-specific passwords are randomly generated passwords used instead your regular password to authenticate your account on third-party applications that don\'t support two-factor authentication.</p>'),
+ '$generated_message' => $this->t('Make sure to copy your new app-specific password now. You won’t be able to see it again!'),
'$generated_app_specific_password' => $this->appSpecificPassword,
- '$description_label' => $this->l10n->t('Description'),
- '$last_used_label' => $this->l10n->t('Last Used'),
- '$revoke_label' => $this->l10n->t('Revoke'),
- '$revoke_all_label' => $this->l10n->t('Revoke All'),
+ '$description_label' => $this->t('Description'),
+ '$last_used_label' => $this->t('Last Used'),
+ '$revoke_label' => $this->t('Revoke'),
+ '$revoke_all_label' => $this->t('Revoke All'),
'$app_specific_passwords' => $appSpecificPasswords,
- '$generate_message' => $this->l10n->t('When you generate a new app-specific password, you must use it right away, it will be shown to you once after you generate it.'),
- '$generate_title' => $this->l10n->t('Generate new app-specific password'),
- '$description_placeholder_label' => $this->l10n->t('Friendiqa on my Fairphone 2...'),
- '$generate_label' => $this->l10n->t('Generate'),
+ '$generate_message' => $this->t('When you generate a new app-specific password, you must use it right away, it will be shown to you once after you generate it.'),
+ '$generate_title' => $this->t('Generate new app-specific password'),
+ '$description_placeholder_label' => $this->t('Friendiqa on my Fairphone 2...'),
+ '$generate_label' => $this->t('Generate'),
]);
}
}
}
if (!self::checkFormSecurityToken('settings_2fa_password', 't')) {
- notice($this->l10n->t('Please enter your password to access this page.'));
+ notice($this->t('Please enter your password to access this page.'));
$this->baseUrl->redirect('settings/2fa');
}
}
if ($_POST['action'] == 'regenerate') {
RecoveryCode::regenerateForUser(local_user());
- info($this->l10n->t('New recovery codes successfully generated.'));
+ info($this->t('New recovery codes successfully generated.'));
$this->baseUrl->redirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password'));
}
}
'$form_security_token' => self::getFormSecurityToken('settings_2fa_recovery'),
'$password_security_token' => self::getFormSecurityToken('settings_2fa_password'),
- '$title' => $this->l10n->t('Two-factor recovery codes'),
- '$help_label' => $this->l10n->t('Help'),
- '$message' => $this->
l10n->t('<p>Recovery codes can be used to access your account in the event you lose access to your device and cannot receive two-factor authentication codes.</p><p><strong>Put these in a safe spot!</strong> If you lose your device and don’t have the recovery codes you will lose access to your account.</p>'),
+ '$title' => $this->t('Two-factor recovery codes'),
+ '$help_label' => $this->t('Help'),
+ '$message' => $this->t('<p>Recovery codes can be used to access your account in the event you lose access to your device and cannot receive two-factor authentication codes.</p><p><strong>Put these in a safe spot!</strong> If you lose your device and don’t have the recovery codes you will lose access to your account.</p>'),
'$recovery_codes' => $recoveryCodes,
- '$regenerate_message' => $this->l10n->t('When you generate new recovery codes, you must copy the new codes. Your old codes won’t work anymore.'),
- '$regenerate_label' => $this->l10n->t('Generate new recovery codes'),
+ '$regenerate_message' => $this->t('When you generate new recovery codes, you must copy the new codes. Your old codes won’t work anymore.'),
+ '$regenerate_label' => $this->t('Generate new recovery codes'),
'$verified' => $verified,
- '$verify_label' => $this->l10n->t('Next: Verification'),
+ '$verify_label' => $this->t('Next: Verification'),
]);
}
}
}
if (!self::checkFormSecurityToken('settings_2fa_password', 't')) {
- notice($this->l10n->t('Please enter your password to access this page.'));
+ notice($this->t('Please enter your password to access this page.'));
$this->baseUrl->redirect('settings/2fa');
}
}
switch ($_POST['action']) {
case 'remove_all' :
$this->trustedBrowserRepo->removeAllForUser(local_user());
- info($this->l10n->t('Trusted browsers successfully removed.'));
+ info($this->t('Trusted browsers successfully removed.'));
$this->baseUrl->redirect('settings/2fa/trusted?t=' . self::getFormSecurityToken('settings_2fa_password'));
break;
}
self::checkFormSecurityTokenRedirectOnError('settings/2fa/trusted', 'settings_2fa_trusted');
if ($this->trustedBrowserRepo->removeForUser(local_user(), $_POST['remove_id'])) {
- info($this->l10n->t('Trusted browser successfully removed.'));
+ info($this->t('Trusted browser successfully removed.'));
}
$this->baseUrl->redirect('settings/2fa/trusted?t=' . self::getFormSecurityToken('settings_2fa_password'));
'$form_security_token' => self::getFormSecurityToken('settings_2fa_trusted'),
'$password_security_token' => self::getFormSecurityToken('settings_2fa_password'),
- '$title' => $this->l10n->t('Two-factor Trusted Browsers'),
- '$message' => $this->l10n->t('Trusted browsers are individual browsers you chose to skip two-factor authentication to access Friendica. Please use this feature sparingly, as it can negate the benefit of two-factor authentication.'),
- '$device_label' => $this->l10n->t('Device'),
- '$os_label' => $this->l10n->t('OS'),
- '$browser_label' => $this->l10n->t('Browser'),
- '$created_label' => $this->l10n->t('Trusted'),
- '$last_used_label' => $this->l10n->t('Last Use'),
- '$remove_label' => $this->l10n->t('Remove'),
- '$remove_all_label' => $this->l10n->t('Remove All'),
+ '$title' => $this->t('Two-factor Trusted Browsers'),
+ '$message' => $this->t('Trusted browsers are individual browsers you chose to skip two-factor authentication to access Friendica. Please use this feature sparingly, as it can negate the benefit of two-factor authentication.'),
+ '$device_label' => $this->t('Device'),
+ '$os_label' => $this->t('OS'),
+ '$browser_label' => $this->t('Browser'),
+ '$created_label' => $this->t('Trusted'),
+ '$last_used_label' => $this->t('Last Use'),
+ '$remove_label' => $this->t('Remove'),
+ '$remove_all_label' => $this->t('Remove All'),
'$trusted_browsers' => $trustedBrowserDisplay,
]);
}
if (!self::checkFormSecurityToken('settings_2fa_password', 't')) {
- notice($this->l10n->t('Please enter your password to access this page.'));
+ notice($this->t('Please enter your password to access this page.'));
$this->baseUrl->redirect('settings/2fa');
}
}
$this->pConfig->set(local_user(), '2fa', 'verified', true);
Session::set('2fa', true);
- info($this->l10n->t('Two-factor authentication successfully activated.'));
+ info($this->t('Two-factor authentication successfully activated.'));
$this->baseUrl->redirect('settings/2fa');
} else {
- notice($this->l10n->t('Invalid code, please retry.'));
+ notice($this->t('Invalid code, please retry.'));
}
}
}
$shortOtpauthUrl = explode('?', $otpauthUrl)[0];
- $manual_message = $this->
l10n->t('<p>Or you can submit the authentication settings manually:</p>
+ $manual_message = $this->t('<p>Or you can submit the authentication settings manually:</p>
<dl>
<dt>Issuer</dt>
<dd>%s</dd>
'$form_security_token' => self::getFormSecurityToken('settings_2fa_verify'),
'$password_security_token' => self::getFormSecurityToken('settings_2fa_password'),
- '$title' => $this->l10n->t('Two-factor code verification'),
- '$help_label' => $this->l10n->t('Help'),
- '$message' => $this->
l10n->t('<p>Please scan this QR Code with your authenticator app and submit the provided code.</p>'),
+ '$title' => $this->t('Two-factor code verification'),
+ '$help_label' => $this->t('Help'),
+ '$message' => $this->t('<p>Please scan this QR Code with your authenticator app and submit the provided code.</p>'),
'$qrcode_image' => $qrcode_image,
- '$qrcode_url_message' => $this->
l10n->t('<p>Or you can open the following URL in your mobile device:</p><p><a href="%s">%s</a></p>', $otpauthUrl, $shortOtpauthUrl),
+ '$qrcode_url_message' => $this->t('<p>Or you can open the following URL in your mobile device:</p><p><a href="%s">%s</a></p>', $otpauthUrl, $shortOtpauthUrl),
'$manual_message' => $manual_message,
'$company' => $company,
'$holder' => $holder,
'$secret' => $secret,
- '$verify_code' => ['verify_code', $this->l10n->t('Please enter a code from your authentication app'), '', '', $this->l10n->t('Required'), 'autofocus autocomplete="off" placeholder="000000"'],
- '$verify_label' => $this->l10n->t('Verify code and enable two-factor authentication'),
+ '$verify_code' => ['verify_code', $this->t('Please enter a code from your authentication app'), '', '', $this->t('Required'), 'autofocus autocomplete="off" placeholder="000000"'],
+ '$verify_label' => $this->t('Verify code and enable two-factor authentication'),
]);
}
}
$this->config = $config;
$this->baseUrl = $baseUrl;
- $this->privacy_operate = $this->l10n->t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.');
- $this->privacy_distribute = $this->l10n->t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.');
- $this->privacy_delete = $this->
l10n->t('At any point in time a logged in user can export their account data from the <a href="%1$s/settings/userexport">account settings</a>. If the user wants to delete their account they can do so at <a href="%1$s/removeme">%1$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', $this->baseUrl);
+ $this->privacy_operate = $this->t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.');
+ $this->privacy_distribute = $this->t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.');
+ $this->privacy_delete = $this->t('At any point in time a logged in user can export their account data from the <a href="%1$s/settings/userexport">account settings</a>. If the user wants to delete their account they can do so at <a href="%1$s/removeme">%1$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', $this->baseUrl);
// In some cases we don't need every single one of the above separate, but all in one block.
// So here is an array to look over
- $this->privacy_complete = [$this->l10n->t('Privacy Statement'), $this->privacy_operate,
+ $this->privacy_complete = [$this->t('Privacy Statement'), $this->privacy_operate,
$this->privacy_distribute, $this->privacy_delete];
}
$tpl = Renderer::getMarkupTemplate('tos.tpl');
if ($this->config->get('system', 'tosdisplay')) {
return Renderer::replaceMacros($tpl, [
- '$title' => $this->l10n->t('Terms of Service'),
+ '$title' => $this->t('Terms of Service'),
'$tostext' => BBCode::convert($this->config->get('system', 'tostext')),
'$displayprivstatement' => $this->config->get('system', 'tosprivstatement'),
- '$privstatementtitle' => $this->l10n->t('Privacy Statement'),
- '$privacy_operate' => $this->l10n->t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.'),
- '$privacy_distribute' => $this->l10n->t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.'),
- '$privacy_delete' => $this->
l10n->t('At any point in time a logged in user can export their account data from the <a href="%1$s/settings/userexport">account settings</a>. If the user wants to delete their account they can do so at <a href="%1$s/removeme">%1$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', $this->baseUrl)
+ '$privstatementtitle' => $this->t('Privacy Statement'),
+ '$privacy_operate' => $this->t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.'),
+ '$privacy_distribute' => $this->t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.'),
+ '$privacy_delete' => $this->t('At any point in time a logged in user can export their account data from the <a href="%1$s/settings/userexport">account settings</a>. If the user wants to delete their account they can do so at <a href="%1$s/removeme">%1$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', $this->baseUrl)
]);
} else {
return '';
projects / friendica.git / commitdiff