Skip to content

mail-template - don't show hyphen if slogan is empty - #27595

Merged
LukasReschke merged 3 commits into
masterfrom
enh/25174/hide-hyphen-if-slogan-is-empty
Jun 22, 2021
Merged

mail-template - don't show hyphen if slogan is empty#27595
LukasReschke merged 3 commits into
masterfrom
enh/25174/hide-hyphen-if-slogan-is-empty

Conversation

@szaimen

Copy link
Copy Markdown
Contributor

Fix#25174
Signed-off-by: szaimen szaimen@e.mail.de

Signed-off-by: szaimen <szaimen@e.mail.de>
@szaimenszaimen added the 2. developing Work in progress label Jun 22, 2021
@szaimenszaimen added this to the Nextcloud 22 milestone Jun 22, 2021
@szaimenszaimen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 22, 2021
@szaimen

Copy link
Copy Markdown
ContributorAuthor

The test failures are unrelated, afaics.
@nextcloud/server please review

@szaimenszaimen added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 22, 2021
@LukasReschke

Copy link
Copy Markdown
Member

@szaimen I don't think they are all unrelated. Check https://drone.nextcloud.com/nextcloud/server/6463/9/4

- <p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - <br>This is an automatically sent email, please do not reply.</p>\n
157 | + <p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud<br>This is an automatically sent email, please do not reply.</p>\n
158
<br class="Apple-interchange-newline">

@szaimen

Copy link
Copy Markdown
ContributorAuthor

@szaimen I don't think they are all unrelated. Check https://drone.nextcloud.com/nextcloud/server/6463/9/4

- <p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - <br>This is an automatically sent email, please do not reply.</p>\n
157 | + <p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud<br>This is an automatically sent email, please do not reply.</p>\n
158
<br class="Apple-interchange-newline">

Thanks! in which file does this test need to be adjusted?

@szaimenszaimen added 2. developing Work in progress feature: emails needs info and removed 4. to release Ready to be released and/or waiting for tests to finish labels Jun 22, 2021
@LukasReschke

Copy link
Copy Markdown
Member

Should be the following as per Drone output:

  • /drone/src/apps/settings/tests/Mailer/NewUserMailHelperTest.php:384
  • /drone/src/apps/settings/tests/Mailer/NewUserMailHelperTest.php:835
  • /drone/src/apps/settings/tests/Mailer/NewUserMailHelperTest.php:616

(the drone UI is a bit unintuitive with failures as the errors are only shown at top in the text)

@szaimen

Copy link
Copy Markdown
ContributorAuthor

Thanks! I'll have a look.

Signed-off-by: szaimen <szaimen@e.mail.de>
Signed-off-by: szaimen <szaimen@e.mail.de>
@szaimen

Copy link
Copy Markdown
ContributorAuthor

I was able to fix the NewUserMailHelperTest test :)

@szaimenszaimen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 22, 2021
@LukasReschke

Copy link
Copy Markdown
Member

Error looks indeed unrelated now :)

@LukasReschke
LukasReschke merged commit 1c8f5cb into masterJun 22, 2021
@LukasReschke
LukasReschke deleted the enh/25174/hide-hyphen-if-slogan-is-empty branch June 22, 2021 15:53
@blizzzblizzz mentioned this pull request Jun 23, 2021
39 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Hyphen is shown after instance name in email footer, even when slogan is undefined or empty

4 participants

@szaimen@LukasReschke@artonge@Pytal