From 0a62bb7cf63d19d024724a888e6f0892e1b17d7c Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+valdnet@users.noreply.github.com> Date: Sun, 23 Feb 2025 16:45:49 +0100 Subject: [PATCH 1/2] fix(l10n): change apostrophe and quotes in "Let's get started" sample Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com> Signed-off-by: Maksim Sukharev --- docs/sample-conversations.md | 2 +- docs/samples/en/lets-get-started.md | 2 +- lib/Service/SampleConversationsService.php | 4 ++-- tests/integration/features/bootstrap/FeatureContext.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/sample-conversations.md b/docs/sample-conversations.md index 2187821ef53..22afb13c68a 100644 --- a/docs/sample-conversations.md +++ b/docs/sample-conversations.md @@ -30,7 +30,7 @@ In each of the languages you can have a unique set of sample Markdown files. The first section of the Markdown files must contain the following information, prefixed with the matching keyword: ``` -NAME: Let´s get started! +NAME: Let's get started! EMOJI: 💡 COLOR: #0082c9 --- diff --git a/docs/samples/en/lets-get-started.md b/docs/samples/en/lets-get-started.md index fa097da0f32..6e85efcf8e1 100644 --- a/docs/samples/en/lets-get-started.md +++ b/docs/samples/en/lets-get-started.md @@ -1,4 +1,4 @@ -NAME: Let´s get started! +NAME: Let's get started! EMOJI: 💡 COLOR: #0082c9 --- diff --git a/lib/Service/SampleConversationsService.php b/lib/Service/SampleConversationsService.php index f4fcdd7152e..e6690ae80e5 100644 --- a/lib/Service/SampleConversationsService.php +++ b/lib/Service/SampleConversationsService.php @@ -78,7 +78,7 @@ public function initialCreateSamples(string $userId): void { protected function defaultSampleConversation(IUser $user): void { $room = $this->roomService->createConversation( Room::TYPE_GROUP, - $this->l->t('Let´s get started!'), + $this->l->t('Let\'s get started!'), $user, Room::OBJECT_TYPE_SAMPLE, $user->getUID() @@ -114,7 +114,7 @@ protected function defaultSampleConversation(IUser $user): void { . "\n\n" . '{FILE:Readme.md}', $this->l->t('## 💭 Let the conversations flow: mention users, react to messages and more -You can mention everybody in a the conversation @all or mention specific participants by typing "@" and picking their name from the list.') +You can mention everybody in a the conversation %s or mention specific participants by typing "@" and picking their name from the list.', ['@all']) . "\n" . '{REACTION:😍}{REACTION:👍}', '{REPLY}' . $this->l->t('You can reply to messages, forward them to other chats and people, or copy message content.'), $this->l->t('## ✨ Do more with Smart Picker diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php index 989f4073fa0..78a17952339 100644 --- a/tests/integration/features/bootstrap/FeatureContext.php +++ b/tests/integration/features/bootstrap/FeatureContext.php @@ -2813,7 +2813,7 @@ public function userGetsDashboardWidgetItems($user, $widgetId, $apiVersion = 'v1 $actualItems = $data[$widgetId]['items']; } - $actualItems = array_values(array_filter($actualItems, static fn ($item) => $item['title'] !== 'Note to self' && $item['title'] !== 'Talk updates ✅' && $item['title'] !== 'Let´s get started!')); + $actualItems = array_values(array_filter($actualItems, static fn ($item) => $item['title'] !== 'Note to self' && $item['title'] !== 'Talk updates ✅' && $item['title'] !== 'Let\'s get started!')); if (empty($expectedItems)) { Assert::assertEmpty($actualItems); From 99289bd724f966033ca1f419ea97fec2f1a0a00e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 24 Feb 2025 13:15:30 +0100 Subject: [PATCH 2/2] test: Filter out new and old title, to allow testing cross versions Signed-off-by: Joas Schilling --- tests/integration/features/bootstrap/FeatureContext.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php index 78a17952339..5d140abd435 100644 --- a/tests/integration/features/bootstrap/FeatureContext.php +++ b/tests/integration/features/bootstrap/FeatureContext.php @@ -2813,7 +2813,12 @@ public function userGetsDashboardWidgetItems($user, $widgetId, $apiVersion = 'v1 $actualItems = $data[$widgetId]['items']; } - $actualItems = array_values(array_filter($actualItems, static fn ($item) => $item['title'] !== 'Note to self' && $item['title'] !== 'Talk updates ✅' && $item['title'] !== 'Let\'s get started!')); + $actualItems = array_values(array_filter($actualItems, static function (array $item): bool { + return $item['title'] !== 'Note to self' + && $item['title'] !== 'Talk updates ✅' + && $item['title'] !== 'Let´s get started!' + && $item['title'] !== 'Let\'s get started!'; + })); if (empty($expectedItems)) { Assert::assertEmpty($actualItems);