Merge pull request #14489 from nextcloud/Valdnet-patch-1

[l10n]: Change apostrophe
nextcloud · Feb 27, 2025 · 7f79bd4 · 7f79bd4
2 parents f7fc5ff + 99289bd
commit 7f79bd4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);