Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[l10n]: Change apostrophe #14489

Merged
merged 2 commits into from
Feb 27, 2025
+10 −5
Merged

[l10n]: Change apostrophe #14489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a62bb7
fix(l10n): change apostrophe and quotes in "Let's get started" sample
Valdnet Feb 23, 2025
99289bd
test: Filter out new and old title, to allow testing cross versions
nickvergessen Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/sample-conversations.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
---
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/en/lets-get-started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
NAME: Let´s get started!
NAME: Let's get started!
EMOJI: 💡
COLOR: #0082c9
---
Expand Down
4 changes: 2 additions & 2 deletions lib/Service/SampleConversationsService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion tests/integration/features/bootstrap/FeatureContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading