Skip to content
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.

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

Fix l10n #26287

Merged
merged 1 commit into from
Mar 25, 2021
Merged

Fix l10n #26287

merged 1 commit into from
Mar 25, 2021

Conversation

Valdnet
Copy link
Contributor

@Valdnet Valdnet commented Mar 25, 2021

Issue: #26286

@rullzer rullzer added the 3. to review Waiting for reviews label Mar 25, 2021
@rullzer rullzer added this to the Nextcloud 22 milestone Mar 25, 2021
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whohoo

@rullzer rullzer merged commit 570c25c into master Mar 25, 2021
@rullzer rullzer deleted the Valdnet-patch-6 branch March 25, 2021 12:14
@MorrisJobke
Copy link
Member

/backport to stable21

@MorrisJobke
Copy link
Member

/backport to stable20

@MorrisJobke
Copy link
Member

/backport to stable19

@backportbot-nextcloud
Copy link

The backport to stable1 failed. Please do this backport manually.

@nickvergessen
Copy link
Member

Errm the display name is overwritten here already:

if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
$this->calendarInfo['{DAV:}displayname'] = $l10n->t('Contact birthdays');
}

not enough?

@nickvergessen
Copy link
Member

I guess the problem is activity is generated not using the users language but any so when the email is sent its en/default?

@Valdnet
Copy link
Contributor Author

Valdnet commented Mar 25, 2021

@nickvergessen The problem with the birthday calendar is also this: #47330.

@nickvergessen
Copy link
Member

Yeah but the change here is useless, as the value is always overwritten by the code I pointed out.

@Valdnet
Copy link
Contributor Author

Valdnet commented Mar 25, 2021

but the change here is useless

I don't know if it's useless, but adding l10n to the text string fixes the display of the correct contact birthday calendar name in activities. See for yourself:

  • Before change:

obraz

  • After adding: $ this-> l10n-> t (

obraz

Perhaps the code needs to be changed, but this is left to the developers 😉.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Untranslated name of contact's birthday calendar
5 participants