Skip to content

Provide the proper language to the mailer - #20246

Merged
rullzer merged 1 commit into
masterfrom
fix/untranslated_mail_footer
Apr 16, 2020
Merged

Provide the proper language to the mailer#20246
rullzer merged 1 commit into
masterfrom
fix/untranslated_mail_footer

Conversation

@rullzer

@rullzerrullzer commented Mar 31, 2020

Copy link
Copy Markdown
Member

Else we can't properly translate the footer in the recipients e-mail language.

  1. Create 2 users (userA and userB)
  2. set language of userB to something other than English
  3. share a file from userA to user B

before:

  • footer in language of userA

After:

  • footer in language of userB

@rullzerrullzer added bug 3. to review Waiting for reviews labels Mar 31, 2020
@rullzerrullzer added this to the Nextcloud 19 milestone Mar 31, 2020
ChristophWurst
ChristophWurst approved these changes Mar 31, 2020
View reviewed changes

@ChristophWurstChristophWurst left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Of course 🙈

nickvergessen
nickvergessen requested changes Mar 31, 2020
View reviewed changes

@nickvergessennickvergessen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good in general, but the addFooter call should be fixed

Comment threadlib/private/Share20/Manager.php
Comment threadlib/private/legacy/util.php Outdated
@rullzer
rullzerforce-pushed the fix/untranslated_mail_footer branch from 5f22bf9 to 680da86CompareMarch 31, 2020 12:18
@rullzer
rullzerforce-pushed the fix/untranslated_mail_footer branch from 680da86 to b8378c1CompareApril 1, 2020 07:01
@nickvergessen

nickvergessen commented Apr 1, 2020

Copy link
Copy Markdown
Member

There were 26 errors:

  1. Test\Mail\EMailTemplateTest::testEMailTemplateCustomFooter

TypeError: Argument 3 passed to OC\Mail\EMailTemplate::__construct() must implement interface OCP\L10N\IFactory, instance of Mock_IL10N_58c1d8ad given, called in /drone/src/tests/lib/Mail/EMailTemplateTest.php on line 54

This was referenced Apr 4, 2020
Merged
Merged
@rullzer
rullzerforce-pushed the fix/untranslated_mail_footer branch from b8378c1 to 673a5b6CompareApril 13, 2020 13:53
@nickvergessen

nickvergessen commented Apr 15, 2020

Copy link
Copy Markdown
Member

Lint / php-cs check (pull_request)

failing

@rullzerrullzer mentioned this pull request Apr 15, 2020
Merged
57 tasks
@rullzer
rullzerforce-pushed the fix/untranslated_mail_footer branch from b930115 to f2cbbf2CompareApril 16, 2020 06:44
nickvergessen
nickvergessen reviewed Apr 16, 2020
View reviewed changes
Comment threadapps/theming/lib/ThemingDefaults.php Outdated
nickvergessen
nickvergessen requested changes Apr 16, 2020
View reviewed changes
Comment threadlib/private/Mail/EMailTemplate.php Outdated
Comment threadlib/private/legacy/OC_Defaults.php Outdated
Comment threadlib/public/Defaults.php Outdated
Comment threadlib/public/Mail/IEMailTemplate.php Outdated
@rullzer
Provide the proper language to the mailer
bb4dedb
Else we can't properly translate the footer in the recipients e-mail
language.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
rullzerforce-pushed the fix/untranslated_mail_footer branch from f2cbbf2 to bb4dedbCompareApril 16, 2020 07:04
@rullzerrullzer mentioned this pull request Apr 16, 2020
Merged
55 tasks
@rullzer

rullzer commented Apr 16, 2020

Copy link
Copy Markdown
MemberAuthor

/backport to stable18

@rullzer

rullzer commented Apr 16, 2020

Copy link
Copy Markdown
MemberAuthor

/backport to stable17

@rullzer
rullzer merged commit fc2e17d into masterApr 16, 2020
@rullzer
rullzer deleted the fix/untranslated_mail_footer branch April 16, 2020 08:06
@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Apr 16, 2020
Merged
@backportbot-nextcloud

backportbot-nextcloudBot commented Apr 16, 2020

Copy link
Copy Markdown

backport to stable18 in #20512 with conflicts ⚠️

@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Apr 16, 2020
Merged
@backportbot-nextcloud

backportbot-nextcloudBot commented Apr 16, 2020

Copy link
Copy Markdown

backport to stable17 in #20513 with conflicts ⚠️

@MorrisJobkeMorrisJobke mentioned this pull request Apr 27, 2020
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nickvergessennickvergessennickvergessen requested changes
@georgehrkegeorgehrkegeorgehrke approved these changes
@ChristophWurstChristophWurstChristophWurst approved these changes
@juliusknorrjuliusknorrjuliusknorr approved these changes

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Milestone

Nextcloud 19

Development

Successfully merging this pull request may close these issues.

5 participants

@rullzer@nickvergessen@georgehrke@ChristophWurst@juliusknorr