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.

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

fix: change translation logic to handle plurals better #49852

Merged
merged 1 commit into from
Jan 7, 2025

Conversation

SebastianKrupinski
Copy link
Contributor

@SebastianKrupinski SebastianKrupinski commented Dec 13, 2024

Summary

  • Altered phrase generation logic to work better with plurals and time intervals
  • Added more test to cover all possible scenarios

Checklist

@SebastianKrupinski
Copy link
Contributor Author

/backport to stable30

@SebastianKrupinski
Copy link
Contributor Author

Code added in 30, do not backport further.

apps/dav/lib/CalDAV/Schedule/IMipService.php Show resolved Hide resolved
apps/dav/lib/CalDAV/Schedule/IMipService.php Outdated Show resolved Hide resolved
apps/dav/lib/CalDAV/Schedule/IMipService.php Outdated Show resolved Hide resolved
apps/dav/lib/CalDAV/Schedule/IMipService.php Outdated Show resolved Hide resolved
@ChristophWurst ChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 18, 2024
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

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

Needs a squash for clean git history.

Requesting as change so this isn't merged prematurely.

@SebastianKrupinski SebastianKrupinski force-pushed the fix/issue-49756-translations branch from a31501b to e0a8d74 Compare December 19, 2024 13:23
@SebastianKrupinski SebastianKrupinski force-pushed the fix/issue-49756-translations branch from e0a8d74 to 887c258 Compare December 23, 2024 13:47
Copy link
Member

@st3iny st3iny left a comment

Choose a reason for hiding this comment

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

Still not clean. Please rebase when updating the branch instead of merging master into your work branch.

@SebastianKrupinski SebastianKrupinski force-pushed the fix/issue-49756-translations branch from 26313ff to 3e2d890 Compare December 26, 2024 17:06
@SebastianKrupinski SebastianKrupinski force-pushed the fix/issue-49756-translations branch from 3e2d890 to b88563e Compare December 31, 2024 01:12
@st3iny st3iny force-pushed the fix/issue-49756-translations branch from b88563e to a912556 Compare January 6, 2025 09:21
@st3iny st3iny added bug feature: caldav Related to CalDAV internals labels Jan 6, 2025
@SebastianKrupinski SebastianKrupinski merged commit 3ab0d67 into master Jan 7, 2025
188 checks passed
@SebastianKrupinski SebastianKrupinski deleted the fix/issue-49756-translations branch January 7, 2025 08:49
@st3iny
Copy link
Member

st3iny commented Jan 7, 2025

We did it, after like 20 attempts 🎉 🎉 🎉

@SebastianKrupinski
Copy link
Contributor Author

We did it, after like 20 attempts 🎉 🎉 🎉

🤣 🤣 🤣 Yeah, tell me about it.

Now we can have the same fun with the backport

@skjnldsv skjnldsv mentioned this pull request Jan 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: caldav Related to CalDAV internals
Projects
Status: ☑️ Done
Development

Successfully merging this pull request may close these issues.

i18n: Translation does not work with multiple placeholders
4 participants