Merge pull request #27595 from nextcloud/enh/25174/hide-hyphen-if-slogan-is-empty

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

Author: LukasReschke

apps/settings/tests/Mailer/NewUserMailHelperTest.php

@@ -349,7 +349,7 @@ public function testGenerateTemplateWithPasswordResetToken() {
 					</tr>
 					</tbody>
 				</table>
-				<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>
+				<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>
 			</center>
 		</td>
 	</tr>
@@ -376,7 +376,7 @@ public function testGenerateTemplateWithPasswordResetToken() {
 
 
 -- 
-TestCloud - 
+TestCloud
 This is an automatically sent email, please do not reply.
 EOF;
 
@@ -581,7 +581,7 @@ public function testGenerateTemplateWithoutPasswordResetToken() {
 					</tr>
 					</tbody>
 				</table>
-				<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>
+				<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>
 			</center>
 		</td>
 	</tr>
@@ -608,7 +608,7 @@ public function testGenerateTemplateWithoutPasswordResetToken() {
 
 
 -- 
-TestCloud - 
+TestCloud
 This is an automatically sent email, please do not reply.
 EOF;
 
@@ -802,7 +802,7 @@ public function testGenerateTemplateWithoutUserId() {
 					</tr>
 					</tbody>
 				</table>
-				<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>
+				<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>
 			</center>
 		</td>
 	</tr>
@@ -827,7 +827,7 @@ public function testGenerateTemplateWithoutUserId() {
 
 
 -- 
-TestCloud - 
+TestCloud
 This is an automatically sent email, please do not reply.
 EOF;
 

lib/private/Mail/EMailTemplate.php

@@ -619,7 +619,11 @@ protected function ensureBodyIsClosed() {
 	public function addFooter(string $text = '', ?string $lang = null) {
 		if ($text === '') {
 			$l10n = $this->l10nFactory->get('lib', $lang);
-			$text = $this->themingDefaults->getName() . ' - ' . $this->themingDefaults->getSlogan($lang) . '<br>' . $l10n->t('This is an automatically sent email, please do not reply.');
+			$slogan = $this->themingDefaults->getSlogan($lang);
+			if ($slogan !== '') {
+				$slogan = ' - ' . $slogan;
+			}
+			$text = $this->themingDefaults->getName() . $slogan . '<br>' . $l10n->t('This is an automatically sent email, please do not reply.');
 		}
 
 		if ($this->footerAdded) {