Merge pull request #43577 from arublov/fix/pages-titles-apps

[Bugfix]: Titles of pages (dashboard, apps-settings, users-settings)

apps/settings/lib/Controller/AppSettingsController.php

@@ -97,7 +97,7 @@ class AppSettingsController extends Controller {
 		$policy = new ContentSecurityPolicy();
 		$policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com');
 
-		$templateResponse = new TemplateResponse('settings', 'settings/empty', ['pageTitle' => $this->l10n->t('Apps')]);
+		$templateResponse = new TemplateResponse('settings', 'settings/empty', ['pageTitle' => $this->l10n->t('Settings')]);
 		$templateResponse->setContentSecurityPolicy($policy);
 
 		\OCP\Util::addStyle('settings', 'settings');

apps/settings/lib/Controller/UsersController.php

@@ -237,7 +237,7 @@ class UsersController extends Controller {
 		\OCP\Util::addStyle('settings', 'settings');
 		\OCP\Util::addScript('settings', 'vue-settings-apps-users-management');
 
-		return new TemplateResponse('settings', 'settings/empty', ['pageTitle' => $this->l10n->t('Users')]);
+		return new TemplateResponse('settings', 'settings/empty', ['pageTitle' => $this->l10n->t('Settings')]);
 	}
 
 	/**

apps/settings/tests/Controller/AppSettingsControllerTest.php

@@ -203,7 +203,7 @@ class AppSettingsControllerTest extends TestCase {
 		$expected = new TemplateResponse('settings',
 			'settings/empty',
 			[
-				'pageTitle' => 'Apps'
+				'pageTitle' => 'Settings'
 			],
 			'user');
 		$expected->setContentSecurityPolicy($policy);
@@ -236,7 +236,7 @@ class AppSettingsControllerTest extends TestCase {
 		$expected = new TemplateResponse('settings',
 			'settings/empty',
 			[
-				'pageTitle' => 'Apps'
+				'pageTitle' => 'Settings'
 			],
 			'user');
 		$expected->setContentSecurityPolicy($policy);

core/templates/layout.public.php

@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>
 		<?php
-		p(!empty($_['application'])?$_['application'].' - ':'');
+			p(!empty($_['application']) ? $_['application'].' - ' : '');
 p($theme->getTitle());
 ?>
 	</title>

core/templates/layout.user.php

@@ -18,8 +18,8 @@ $getUserAvatar = static function (int $size) use ($_): string {
 		<meta charset="utf-8">
 		<title>
 			<?php
-				p(!empty($_['pageTitle'])?$_['pageTitle'].' - ':'');
-p(!empty($_['application'])?$_['application'].' - ':'');
+				p(!empty($_['pageTitle']) && $_['pageTitle'] !== $_['application'] ? $_['pageTitle'].' - ' : '');
+p(!empty($_['application']) ? $_['application'].' - ' : '');
 p($theme->getTitle());
 ?>
 		</title>