From d5b218eed404dfe2ae2cfd7ddf263cf7a3449c44 Mon Sep 17 00:00:00 2001 From: YFdyh000 Date: Sun, 22 Aug 2021 22:13:58 +0800 Subject: [PATCH 1/2] Simple and uniform localized website title --- application/front/controller/visitor/InstallController.php | 2 +- tests/front/controller/visitor/InstallControllerTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/front/controller/visitor/InstallController.php b/application/front/controller/visitor/InstallController.php index 418d4a49..ecb3b8f0 100644 --- a/application/front/controller/visitor/InstallController.php +++ b/application/front/controller/visitor/InstallController.php @@ -131,7 +131,7 @@ class InstallController extends ShaarliVisitorController } else { $this->container->conf->set( 'general.title', - 'Shared bookmarks on ' . escape(index_url($this->container->environment)) + t('My links') ); } diff --git a/tests/front/controller/visitor/InstallControllerTest.php b/tests/front/controller/visitor/InstallControllerTest.php index ea29592c..44c90f9d 100644 --- a/tests/front/controller/visitor/InstallControllerTest.php +++ b/tests/front/controller/visitor/InstallControllerTest.php @@ -266,7 +266,7 @@ class InstallControllerTest extends TestCase static::assertSame('/subfolder/login', $result->getHeader('location')[0]); static::assertSame('UTC', $confSettings['general.timezone']); - static::assertSame('Shared bookmarks on http://shaarli/subfolder/', $confSettings['general.title']); + static::assertSame('My links', $confSettings['general.title']); } /** @@ -299,6 +299,6 @@ class InstallControllerTest extends TestCase static::assertSame('/login', $result->getHeader('location')[0]); static::assertSame('UTC', $confSettings['general.timezone']); - static::assertSame('Shared bookmarks on http://shaarli/', $confSettings['general.title']); + static::assertSame('My links', $confSettings['general.title']); } } From b59cdb38710deb3841509b3b84ec424503a495fa Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 13 Aug 2022 10:14:46 +0200 Subject: [PATCH 2/2] ArthurHoaro code review: use Shared Bookmark as default title instead of My links --- application/front/controller/visitor/InstallController.php | 2 +- tests/front/controller/visitor/InstallControllerTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/front/controller/visitor/InstallController.php b/application/front/controller/visitor/InstallController.php index ecb3b8f0..6ffeb2db 100644 --- a/application/front/controller/visitor/InstallController.php +++ b/application/front/controller/visitor/InstallController.php @@ -131,7 +131,7 @@ class InstallController extends ShaarliVisitorController } else { $this->container->conf->set( 'general.title', - t('My links') + t('Shared Bookmarks') ); } diff --git a/tests/front/controller/visitor/InstallControllerTest.php b/tests/front/controller/visitor/InstallControllerTest.php index 44c90f9d..9cf0e1c9 100644 --- a/tests/front/controller/visitor/InstallControllerTest.php +++ b/tests/front/controller/visitor/InstallControllerTest.php @@ -266,7 +266,7 @@ class InstallControllerTest extends TestCase static::assertSame('/subfolder/login', $result->getHeader('location')[0]); static::assertSame('UTC', $confSettings['general.timezone']); - static::assertSame('My links', $confSettings['general.title']); + static::assertSame('Shared Bookmarks', $confSettings['general.title']); } /** @@ -299,6 +299,6 @@ class InstallControllerTest extends TestCase static::assertSame('/login', $result->getHeader('location')[0]); static::assertSame('UTC', $confSettings['general.timezone']); - static::assertSame('My links', $confSettings['general.title']); + static::assertSame('Shared Bookmarks', $confSettings['general.title']); } }