Skip to content

[stable23] Fix source of translations #29967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 1 commit into from
Nov 30, 2021
Merged

[stable23] Fix source of translations #29967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/private/Contacts/ContactsMenu/ContactsStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ private function contactArrayToEntry(array $contact) {
if (!empty($user)) {
$account = $this->accountManager->getAccount($user);
if ($this->isProfileEnabled($account)) {
$entry->setProfileTitle($this->l10nFactory->get('core')->t('View profile'));
$entry->setProfileTitle($this->l10nFactory->get('lib')->t('View profile'));
$entry->setProfileUrl($this->urlGenerator->linkToRouteAbsolute('core.ProfilePage.index', ['targetUserId' => $targetUserId]));
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Contacts/ContactsMenu/Providers/ProfileProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function process(IEntry $entry) {
$account = $this->accountManager->getAccount($targetUser);
if ($this->isProfileEnabled($account)) {
$iconUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/profile.svg'));
$profileActionText = $this->l10nFactory->get('core')->t('View profile');
$profileActionText = $this->l10nFactory->get('lib')->t('View profile');
$profileUrl = $this->urlGenerator->linkToRouteAbsolute('core.ProfilePage.index', ['targetUserId' => $targetUserId]);
$action = $this->actionFactory->newLinkAction($iconUrl, $profileActionText, $profileUrl, 'profile');
// Set highest priority (by descending order), other actions have the default priority 10 as defined in lib/private/Contacts/ContactsMenu/Actions/LinkAction.php
Expand Down
4 changes: 2 additions & 2 deletions lib/private/Profile/Actions/EmailAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ public function getId(): string {
}

public function getDisplayId(): string {
return $this->l10nFactory->get('core')->t('Email');
return $this->l10nFactory->get('lib')->t('Email');
}

public function getTitle(): string {
return $this->l10nFactory->get('core')->t('Mail %s', [$this->value]);
return $this->l10nFactory->get('lib')->t('Mail %s', [$this->value]);
}

public function getPriority(): int {
Expand Down
4 changes: 2 additions & 2 deletions lib/private/Profile/Actions/PhoneAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ public function getId(): string {
}

public function getDisplayId(): string {
return $this->l10nFactory->get('core')->t('Phone');
return $this->l10nFactory->get('lib')->t('Phone');
}

public function getTitle(): string {
return $this->l10nFactory->get('core')->t('Call %s', [$this->value]);
return $this->l10nFactory->get('lib')->t('Call %s', [$this->value]);
}

public function getPriority(): int {
Expand Down
4 changes: 2 additions & 2 deletions lib/private/Profile/Actions/TwitterAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ public function getId(): string {
}

public function getDisplayId(): string {
return $this->l10nFactory->get('core')->t('Twitter');
return $this->l10nFactory->get('lib')->t('Twitter');
}

public function getTitle(): string {
$displayUsername = $this->value[0] === '@' ? $this->value : '@' . $this->value;
return $this->l10nFactory->get('core')->t('View %s on Twitter', [$displayUsername]);
return $this->l10nFactory->get('lib')->t('View %s on Twitter', [$displayUsername]);
}

public function getPriority(): int {
Expand Down
4 changes: 2 additions & 2 deletions lib/private/Profile/Actions/WebsiteAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ public function getId(): string {
}

public function getDisplayId(): string {
return $this->l10nFactory->get('core')->t('Website');
return $this->l10nFactory->get('lib')->t('Website');
}

public function getTitle(): string {
return $this->l10nFactory->get('core')->t('Visit %s', [$this->value]);
return $this->l10nFactory->get('lib')->t('Visit %s', [$this->value]);
}

public function getPriority(): int {
Expand Down
14 changes: 7 additions & 7 deletions lib/private/Profile/ProfileManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,31 +396,31 @@ public function getProfileConfigWithMetadata(IUser $targetUser, ?IUser $visiting
$propertiesMetadata = [
IAccountManager::PROPERTY_ADDRESS => [
'appId' => self::CORE_APP_ID,
'displayId' => $this->l10nFactory->get(self::CORE_APP_ID)->t('Address'),
'displayId' => $this->l10nFactory->get('lib')->t('Address'),
],
IAccountManager::PROPERTY_AVATAR => [
'appId' => self::CORE_APP_ID,
'displayId' => $this->l10nFactory->get(self::CORE_APP_ID)->t('Profile picture'),
'displayId' => $this->l10nFactory->get('lib')->t('Profile picture'),
],
IAccountManager::PROPERTY_BIOGRAPHY => [
'appId' => self::CORE_APP_ID,
'displayId' => $this->l10nFactory->get(self::CORE_APP_ID)->t('About'),
'displayId' => $this->l10nFactory->get('lib')->t('About'),
],
IAccountManager::PROPERTY_DISPLAYNAME => [
'appId' => self::CORE_APP_ID,
'displayId' => $this->l10nFactory->get(self::CORE_APP_ID)->t('Full name'),
'displayId' => $this->l10nFactory->get('lib')->t('Full name'),
],
IAccountManager::PROPERTY_HEADLINE => [
'appId' => self::CORE_APP_ID,
'displayId' => $this->l10nFactory->get(self::CORE_APP_ID)->t('Headline'),
'displayId' => $this->l10nFactory->get('lib')->t('Headline'),
],
IAccountManager::PROPERTY_ORGANISATION => [
'appId' => self::CORE_APP_ID,
'displayId' => $this->l10nFactory->get(self::CORE_APP_ID)->t('Organisation'),
'displayId' => $this->l10nFactory->get('lib')->t('Organisation'),
],
IAccountManager::PROPERTY_ROLE => [
'appId' => self::CORE_APP_ID,
'displayId' => $this->l10nFactory->get(self::CORE_APP_ID)->t('Role'),
'displayId' => $this->l10nFactory->get('lib')->t('Role'),
],
];

Expand Down