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

feat(Select Translate): keep previous result if selected text is empty when open Select Translate #375

Merged
merged 3 commits into from
Feb 4, 2024
Merged

feat(Select Translate): keep previous result if selected text is empty when open Select Translate #375

merged 3 commits into from
Feb 4, 2024

Conversation

yam-liu
Copy link
Contributor

@yam-liu yam-liu commented Jan 30, 2024

github-actions[bot]
github-actions bot reviewed Jan 30, 2024
View reviewed changes
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Hello yam-liu, Thank you for your first PR contribution 🎉 yam-liu

@yam-liu yam-liu mentioned this pull request Jan 30, 2024
Closed
4 tasks
@yam-liu yam-liu force-pushed the feature/select_translate_keep_prev_result branch from 5450ea3 to 70a6f62 Compare January 31, 2024 05:05
@tisfeng
Copy link
Owner

tisfeng commented Jan 31, 2024

Maybe since you used rebase, here it can't automatically update the branch code to the latest, like this #349 , it will block PR process.

image image

@tisfeng
Copy link
Owner

tisfeng commented Feb 2, 2024

Please update this PR with the latest dev branch, otherwise it will block PR review process.

@yam-liu yam-liu force-pushed the feature/select_translate_keep_prev_result branch from cbefaa3 to 8b01190 Compare February 2, 2024 17:32
@tisfeng
Copy link
Owner

tisfeng commented Feb 3, 2024

Please review this PR.

tisfeng
tisfeng requested changes Feb 4, 2024
View reviewed changes
Copy link
Owner

@tisfeng tisfeng 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, are there any other questions?

AkaShark
AkaShark previously approved these changes Feb 4, 2024
View reviewed changes
@phlpsong
Copy link
Collaborator

phlpsong commented Feb 4, 2024 •
edited
Loading

Looks good, need to merge the latest changes of dev branch.

@yam-liu yam-liu force-pushed the feature/select_translate_keep_prev_result branch from 8b01190 to 7af6f42 Compare February 4, 2024 02:51
tisfeng
tisfeng requested changes Feb 4, 2024
View reviewed changes
Easydict/App/Localizable.xcstrings Outdated Show resolved Hide resolved
@yam-liu @tisfeng
feat(Select Translate): Update Chinese value for key "select_query_te…
f756d04 
…xt_when_window_activate" in Localizable.xcstrings

Co-authored-by: Tisfeng <[email protected]>
@yam-liu
Copy link
Contributor Author

yam-liu commented Feb 4, 2024

It seems that there are no requested changes anymore, but the merge is still blocked.
CleanShot 2024-02-04 at 11 05 17@2x

@tisfeng
Copy link
Owner

tisfeng commented Feb 4, 2024

It should be OK to wait for the CI check to complete.

image

@tisfeng
Copy link
Owner

tisfeng commented Feb 4, 2024

@yam-liu Thanks your good PR, hope to receive more PR from you!

@tisfeng tisfeng merged commit 2b00b93 into tisfeng:dev Feb 4, 2024
5 checks passed
@tisfeng tisfeng mentioned this pull request Feb 4, 2024
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@phlpsong phlpsong phlpsong approved these changes

@tisfeng tisfeng tisfeng approved these changes

@AkaShark AkaShark AkaShark left review comments

@NeverAgain11 NeverAgain11 Awaiting requested review from NeverAgain11

@choykarl choykarl Awaiting requested review from choykarl

@CanglongCl CanglongCl Awaiting requested review from CanglongCl

@Jerry23011 Jerry23011 Awaiting requested review from Jerry23011

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

Successfully merging this pull request may close these issues.
4 participants
@yam-liu @tisfeng @phlpsong @AkaShark