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

Jump to bottom

Make certain wordings translatable #6021

Merged
merged 1 commit into from
May 28, 2024
Merged

Make certain wordings translatable #6021

merged 1 commit into from
May 28, 2024

Conversation

Jerome-Herbinet
Copy link
Member

@Jerome-Herbinet Jerome-Herbinet commented May 24, 2024 •
edited
Loading

Just check commit.

Test from reviewers is need.

@Jerome-Herbinet Jerome-Herbinet added bug language l10n and translations labels May 24, 2024
@codecov Codecov
Copy link

codecov bot commented May 24, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 23.59%. Comparing base (f874071) to head (3c97791).
Report is 114 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff            @@
##               main    #6021   +/-   ##
=========================================
  Coverage     23.59%   23.59%           
  Complexity      457      457           
=========================================
  Files           246      246           
  Lines         11715    11715           
  Branches       2140     2140           
=========================================
  Hits           2764     2764           
  Misses         8637     8637           
  Partials        314      314
Flag Coverage Δ
javascript 15.18% <ø> (ø)
php 58.61% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ChristophWurst ChristophWurst added 2. developing Work in progress 3. to review Waiting for reviews and removed 2. developing Work in progress labels May 24, 2024
@Jerome-Herbinet Jerome-Herbinet force-pushed the Jerome-Herbinet-make-certain-wordings-translatable branch from 36f4778 to 08deb4e Compare May 24, 2024 11:22
ChristophWurst
ChristophWurst reviewed May 24, 2024
View reviewed changes
lib/Service/Appointments/MailService.php Outdated
if (!empty($config->getDescription())) {
$template->addBodyListItem($config->getDescription(), 'Description:');
$template->addBodyListItem($config->getDescription(), $l10n->t('Description:'));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
$template->addBodyListItem($config->getDescription(), $l10n->t('Description:'));
$template->addBodyListItem($config->getDescription(), $this->l10n->t('Description:'));

and for all following usages of $l10n

@Jerome-Herbinet Jerome-Herbinet force-pushed the Jerome-Herbinet-make-certain-wordings-translatable branch from 82e023c to 4d5c36c Compare May 24, 2024 12:21
ChristophWurst
ChristophWurst requested changes May 24, 2024
View reviewed changes
lib/Service/Appointments/MailService.php Outdated
@@ -194,9 +194,9 @@ public function sendBookingInformationEmail(Booking $booking, AppointmentConfig
$summary = $this->l10n->t('Dear %s, your booking has been accepted.', [$booking->getDisplayName()]);
$template->addHeading($summary);

$template->addBodyListItem($user->getDisplayName(), 'Appointment with:');
$template->addBodyListItem($user->getDisplayName(), $l10n->t('Appointment with:'));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from here …

lib/Service/Appointments/MailService.php Outdated
if (!empty($config->getDescription())) {
$template->addBodyListItem($config->getDescription(), 'Description:');
$template->addBodyListItem($config->getDescription(), $l10n->t('Description:'));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

… to here you have to replace $l10n with $this->l10n

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ChristophWurst can you check my last commit ?

@miaulalala miaulalala self-requested a review May 27, 2024 09:40
@miaulalala
Copy link
Contributor

Tests fail bc the new calls to l10n need to be added. I'll check in a minute and let you know where and how to add these :)

@miaulalala miaulalala force-pushed the Jerome-Herbinet-make-certain-wordings-translatable branch from 7aa3883 to 994de8e Compare May 27, 2024 14:12
@Jerome-Herbinet @miaulalala @ChristophWurst
Make certain wordings translatable
3c97791 
Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>

Make certain wordings translatable

Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>

Make certain wordings translatable

Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>
Co-Authored-By: Anna <anna@nextcloud.com>
Co-Authored-By: Christoph Wurst <ChristophWurst@users.noreply.github.com>
@miaulalala miaulalala force-pushed the Jerome-Herbinet-make-certain-wordings-translatable branch from 650b175 to 3c97791 Compare May 27, 2024 15:45
@ChristophWurst ChristophWurst merged commit 8fa5e7c into main May 28, 2024
42 checks passed
@ChristophWurst ChristophWurst deleted the Jerome-Herbinet-make-certain-wordings-translatable branch May 28, 2024 11:08
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 8, 2024

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@hamza221 hamza221 Awaiting requested review from hamza221

@miaulalala miaulalala Awaiting requested review from miaulalala miaulalala is a code owner

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug feedback-requested language l10n and translations
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Jerome-Herbinet @miaulalala @ChristophWurst