mirror of
https://github.com/friendica/friendica
synced 2025-04-26 09:10:15 +00:00
Replace $this->l10n->t() with $this->t() for Modules
This commit is contained in:
parent
207662251d
commit
dab9e13c69
23 changed files with 246 additions and 226 deletions
|
@ -57,7 +57,7 @@ class Advanced extends BaseModule
|
|||
$this->page = $page;
|
||||
|
||||
if (!Session::isAuthenticated()) {
|
||||
throw new ForbiddenException($this->l10n->t('Permission denied.'));
|
||||
throw new ForbiddenException($this->t('Permission denied.'));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -67,7 +67,7 @@ class Advanced extends BaseModule
|
|||
|
||||
$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'];
|
||||
|
@ -106,7 +106,7 @@ class Advanced extends BaseModule
|
|||
}
|
||||
|
||||
if (!$r) {
|
||||
notice($this->l10n->t('Contact update failed.'));
|
||||
notice($this->t('Contact update failed.'));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -116,13 +116,13 @@ class Advanced extends BaseModule
|
|||
|
||||
$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";
|
||||
|
||||
|
@ -142,20 +142,20 @@ class Advanced extends BaseModule
|
|||
'$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'),
|
||||
'$lbl_submit' => $this->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],
|
||||
'$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],
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -60,7 +60,7 @@ class Revoke extends BaseModule
|
|||
|
||||
$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'])) {
|
||||
|
@ -70,11 +70,11 @@ class Revoke extends BaseModule
|
|||
$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.'));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -88,11 +88,11 @@ class Revoke extends BaseModule
|
|||
|
||||
$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']);
|
||||
|
@ -108,10 +108,10 @@ class Revoke extends BaseModule
|
|||
|
||||
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',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue