Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Translate all share exceptions #40164

Merged
merged 3 commits into from
Sep 4, 2024
Merged

Translate all share exceptions #40164

merged 3 commits into from
Sep 4, 2024

Conversation

solracsf
Copy link
Member

@solracsf solracsf commented Aug 30, 2023 •
edited
Loading

Summary

Fixes ambiguous messages like :
image

Checklist

@solracsf solracsf added the 3. to review Waiting for reviews label Aug 30, 2023
@solracsf solracsf added this to the Nextcloud 28 milestone Aug 30, 2023
@szaimen szaimen requested review from icewind1991, Valdnet, come-nc, a team and nfebe and removed request for a team August 30, 2023 13:28
@solracsf solracsf added 2. developing Work in progress 3. to review Waiting for reviews and removed 3. to review Waiting for reviews 2. developing Work in progress labels Aug 30, 2023
@solracsf solracsf force-pushed the exceptionsTranslateShare branch from 3cfb95e to 7cf9cdd Compare August 30, 2023 21:57
come-nc

This comment was marked as resolved.

# to view

@solracsf

This comment was marked as resolved.

# to view
@come-nc
Copy link
Contributor

come-nc commented Aug 31, 2023

Hum @nextcloud/files what do you think?

artonge

This comment was marked as resolved.

# to view

@solracsf

This comment was marked as resolved.

# to view
@skjnldsv skjnldsv mentioned this pull request Nov 1, 2023
Merged
This was referenced Nov 6, 2023
Merged
Merged
This was referenced Nov 14, 2023
Merged
Merged
@blizzz blizzz modified the milestones: Nextcloud 28, Nextcloud 29 Nov 23, 2023
@skjnldsv skjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Feb 23, 2024
@susnux susnux added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 30, 2024
@susnux susnux added this to the Nextcloud 31 milestone Aug 30, 2024
@susnux susnux requested review from artonge, come-nc and nfebe August 30, 2024 23:10
nfebe
nfebe approved these changes Aug 31, 2024
View reviewed changes
Copy link
Contributor

@nfebe nfebe left a comment

Choose a reason for hiding this comment

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

Looks good, some capitalization suggestions. Thank you.

@skjnldsv skjnldsv dismissed stale reviews from come-nc and artonge September 3, 2024 19:49

addressed

@skjnldsv skjnldsv enabled auto-merge September 3, 2024 19:49
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Sep 4, 2024
solracsf and others added 3 commits September 4, 2024 09:03
@solracsf @skjnldsv
fix(l10n): Translate all share exceptions
f250643 
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>

Fix drone

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>

Fix tests

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
@skjnldsv @nfebe @susnux
fix: adjust sharing controller exceptions case
f4aa264 
Co-authored-by: F. E Noel Nfebe <fenn25.fn@gmail.com>
Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
@skjnldsv
fix: share manager tests translation string
78e09b5 
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
@skjnldsv skjnldsv force-pushed the exceptionsTranslateShare branch from c2c6030 to 78e09b5 Compare September 4, 2024 07:03
@skjnldsv skjnldsv disabled auto-merge September 4, 2024 07:50
@skjnldsv
Copy link
Member

skjnldsv commented Sep 4, 2024

Sharding test error unrelated

@skjnldsv skjnldsv merged commit 99b225f into master Sep 4, 2024
167 of 174 checks passed
@skjnldsv skjnldsv deleted the exceptionsTranslateShare branch September 4, 2024 07:50
@solracsf
Copy link
Member Author

solracsf commented Sep 4, 2024

Worth a backport to 30 at least ?

@skjnldsv
Copy link
Member

skjnldsv commented Sep 4, 2024

/backport to stable30

@skjnldsv
Copy link
Member

skjnldsv commented Sep 4, 2024

Agreed

@backportbot backportbot
Copy link

backportbot bot commented Sep 4, 2024

The backport to stable30 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable30
git pull origin stable30

# Create the new backport branch
git checkout -b backport/40164/stable30

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick f250643e f4aa2644 78e09b5a

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/40164/stable30

Error: Failed to clone repository: Failed to checkout branches: Updating 1cc7851..ab511e8
From https://github.com/nextcloud/server

  • [deleted] (none) -> origin/adapterQueryOpti
  • [deleted] (none) -> origin/automated/noid/stable29-fix-npm-audit
  • [deleted] (none) -> origin/backport/47325/stable26
  • [deleted] (none) -> origin/backport/47598/stable29
  • [deleted] (none) -> origin/backport/stable30/47158
  • [deleted] (none) -> origin/chore/theming
  • [deleted] (none) -> origin/exceptionsTranslateShare
  • [deleted] (none) -> origin/executeStatementOnDelete
  • [deleted] (none) -> origin/fix/appstore-upgrade-failure
  • [deleted] (none) -> origin/fix/bring-back-security-fixes
    error: Your local changes to the following files would be overwritten by merge:
    dist/4254-4254.js.map.license
    dist/4696-4696.js.map.license
    dist/5643-5643.js.map.license
    Please commit your changes or stash them before you merge.
    Aborting

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@susnux
Copy link
Contributor

susnux commented Sep 7, 2024

If you manually backport, then please include: #40164

@skjnldsv skjnldsv mentioned this pull request Jan 7, 2025
Merged
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@susnux susnux susnux left review comments

@nfebe nfebe nfebe approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@Valdnet Valdnet Valdnet approved these changes

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@artonge artonge Awaiting requested review from artonge

@come-nc come-nc Awaiting requested review from come-nc

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish backport-request bug feature: language l10n and translations
Projects
None yet
Milestone
Nextcloud 31
Development

Successfully merging this pull request may close these issues.
9 participants
@solracsf @come-nc @skjnldsv @susnux @artonge @nfebe @Valdnet @joshtrichards @blizzz