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

Add option to append tags #1564

Merged
merged 9 commits into from
Oct 21, 2022
Merged

Add option to append tags #1564

merged 9 commits into from
Oct 21, 2022

Conversation

qwerty287
Copy link
Contributor

@qwerty287 qwerty287 added this to the 4.6.2 milestone Oct 21, 2022
@qwerty287 qwerty287 requested a review from a team October 21, 2022 07:15
@codecov
Copy link

codecov bot commented Oct 21, 2022 •
edited
Loading

Codecov Report

Merging #1564 (2a88198) into master (3872691) will decrease coverage by 0.73%.
The diff coverage is 100.00%.

❗ Current head 2a88198 differs from pull request most recent head b3f9517. Consider uploading reports for the commit b3f9517 to get more accurate results

Additional details and impacted files

@qwerty287 qwerty287 mentioned this pull request Oct 21, 2022
Closed
nagmat84
nagmat84 requested changes Oct 21, 2022
View reviewed changes
app/Http/Requests/Photo/SetPhotosTagsRequest.php Outdated Show resolved Hide resolved
app/Http/Requests/Photo/SetPhotosTagsRequest.php Outdated Show resolved Hide resolved
app/Http/Requests/Photo/SetPhotosTagsRequest.php Outdated Show resolved Hide resolved
app/Http/Requests/Photo/SetPhotosTagsRequest.php Outdated Show resolved Hide resolved
tests/Feature/Lib/PhotosUnitTest.php Show resolved Hide resolved
app/Locale/ChineseSimplified.php
@@ -297,6 +297,7 @@ public function get_locale(): array
'ERROR_SEARCH_DEACTIVATED' => '搜索功能已在设置中停用。',
'SUCCESS' => 'OK',
'RETRY' => '重试',
'OVERRIDE' => 'Override',
Copy link
Collaborator

Choose a reason for hiding this comment

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

I still have to check with the frontend where we use this label, but in order to prevent clash of names in the future I would prefer a key which is more specific than only OVERRIDE. I would expect something like CHECKBOX_OVERRIDE_LABEL or whatever is appropriate. (I haven't had a look at the frontend yet, hence I don't know where this key is used.)

kamil4
kamil4 requested changes Oct 21, 2022
View reviewed changes
Copy link
Contributor

@kamil4 kamil4 left a comment

Choose a reason for hiding this comment

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

The localization files are missing the TAGS_OVERRIDE_INFO key.

@qwerty287
Copy link
Contributor Author

@kamil4 Looks like I pushed while you reviewed :) 2a88198

@kamil4
Copy link
Contributor

kamil4 commented Oct 21, 2022

The localization files are missing the TAGS_OVERRIDE_INFO key.

Never mind...

@qwerty287 qwerty287 merged commit b4cbfc4 into master Oct 21, 2022
@qwerty287 qwerty287 deleted the append-tags branch October 21, 2022 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nagmat84 nagmat84 nagmat84 approved these changes

@ildyria ildyria ildyria left review comments

@kamil4 kamil4 kamil4 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.6.2
Development

Successfully merging this pull request may close these issues.

[Enhancement] Add a checkbox to overwrite or add tags when selecting mulitple images
4 participants
@qwerty287 @kamil4 @ildyria @nagmat84