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

Nextcloud 27 : Replace "Update" with "Edit" in share dialog #41734

Merged
merged 1 commit into from Nov 29, 2023

Conversation

Jerome-Herbinet
Copy link
Member

@Jerome-Herbinet Jerome-Herbinet commented Nov 24, 2023

Same as #41680 but specially made for NC 27 because backport failed.

Checklist

@Jerome-Herbinet Jerome-Herbinet added design Design, UI, UX, etc. 3. to review Waiting for reviews feature: sharing feature: file sidebar Related to the file sidebar component labels Nov 24, 2023
Copy link
Contributor

@Fenn-CS Fenn-CS left a comment

Choose a reason for hiding this comment

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

The original commit has the word update in two places... Does it already exist in once place here?

@Jerome-Herbinet
Copy link
Member Author

Jerome-Herbinet commented Nov 24, 2023

The original commit has the word update in two places... Does it already exist in once place here?

@Fenn-CS
There is a difference. I noticed that "update" is also here in the file :


... but in don't think I need or have to change it because it's apparently not a wording call. What do you think ?

@Fenn-CS
Copy link
Contributor

Fenn-CS commented Nov 24, 2023

I see where the issue is coming from.... #41301 was never backported so

[ATOMIC_PERMISSIONS.UPDATE]: this.t('files_sharing', 'Edit'),

Which you updated in master does not exist in stable27.

cc: @Jerome-Herbinet

@Fenn-CS
Copy link
Contributor

Fenn-CS commented Nov 24, 2023

@Jerome-Herbinet Can you please rebase against this and add the update? #41736

@Jerome-Herbinet
Copy link
Member Author

I rebased but there are unnecessary commits. I'll fix it tomorrow.

@Jerome-Herbinet Jerome-Herbinet force-pushed the Jerome-Herbinet-change-share-update-right-wording branch from 6723b5a to 6015471 Compare November 28, 2023 14:32
@Jerome-Herbinet
Copy link
Member Author

@Fenn-CS it's OK, problems fixed with rebase and I build the assets.
Thanks @zak39 for your precious help once again :-)

@AndyScherzinger
Copy link
Member

/compile amend /

@nextcloud-command nextcloud-command force-pushed the Jerome-Herbinet-change-share-update-right-wording branch from 404550f to ac2a3a0 Compare November 28, 2023 17:58
@zak39
Copy link
Contributor

zak39 commented Nov 29, 2023

/compile amend /

Hi @AndyScherzinger :)

I would like to know : the owner of the PR is able to use the Bot Nextcloud?

I guess your command allows you to build assets and merge with this branch, no?

@AndyScherzinger
Copy link
Member

I would like to know : the owner of the PR is able to use the Bot Nextcloud?

@zak39 yes, well anybody can

I guess your command allows you to build assets and merge with this branch, no?

yes, while you can also leave out the amending, that will just amend the compiled assets with the last commit of the PR. So depending on the decision you might not want that.
For details, see https://github.com/nextcloud/server/blob/master/.github/workflows/command-compile.yml

@AndyScherzinger
Copy link
Member

/compile amend /

@AndyScherzinger AndyScherzinger added this to the Nextcloud 27.1.5 milestone Nov 29, 2023
@nextcloud-command nextcloud-command force-pushed the Jerome-Herbinet-change-share-update-right-wording branch from 5ff3268 to cc7c2a5 Compare November 29, 2023 09:52
@Fenn-CS Fenn-CS force-pushed the Jerome-Herbinet-change-share-update-right-wording branch 2 times, most recently from 4856988 to 912138e Compare November 29, 2023 10:37
@Fenn-CS
Copy link
Contributor

Fenn-CS commented Nov 29, 2023

/compile amend /

Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@nextcloud-command nextcloud-command force-pushed the Jerome-Herbinet-change-share-update-right-wording branch from 912138e to 21c157e Compare November 29, 2023 12:24
@Fenn-CS
Copy link
Contributor

Fenn-CS commented Nov 29, 2023

Drone failure unrelated.

@Fenn-CS Fenn-CS merged commit ebf289c into stable27 Nov 29, 2023
37 of 38 checks passed
@Fenn-CS Fenn-CS deleted the Jerome-Herbinet-change-share-update-right-wording branch November 29, 2023 16:55
@blizzz blizzz mentioned this pull request Dec 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews design Design, UI, UX, etc. feature: file sidebar Related to the file sidebar component feature: sharing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants