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

Rename Preferences to Settings #195

Merged
merged 6 commits into from
Oct 27, 2023
Merged

Rename Preferences to Settings #195

merged 6 commits into from
Oct 27, 2023

Conversation

Jerry23011
Copy link
Collaborator

Changes

  • Rename Preferences to Settings
  • Rename Settings title in toolbar: Settings -> General
  • Rename string in code: setting -> setting_general
  • Rename asset: toolbar_setting -> toolbar_setting_general

Screenshots

zh-Hans en

@Jerry23011 Jerry23011 requested a review from tisfeng October 26, 2023 19:21
@Jerry23011 Jerry23011 linked an issue Oct 26, 2023 that may be closed by this pull request
🚀 功能建议：根据系统版本使用 “设置“ 或 ”偏好设置“ #159
Closed
4 tasks
@tisfeng
Copy link
Owner

tisfeng commented Oct 27, 2023

赞

@tisfeng tisfeng merged commit 1e290c6 into tisfeng:dev Oct 27, 2023
2 checks passed
@tisfeng
Copy link
Owner

tisfeng commented Oct 27, 2023

好像不对劲，这里怎么有两个 Settings？你们好像改错了，英文环境下我看菜单项还是显示 Settings ？

而且中文下，也还是【设置】，都改成【设置...】和 Settings... 吧。

image

@Kyle-Ye
Copy link
Collaborator

Kyle-Ye commented Oct 27, 2023 •
edited
Loading

好像不对劲，这里怎么有两个 Settings？你们好像改错了，英文环境下我看菜单项还是显示 Settings ？

而且中文下，也还是【设置】，都改成【设置...】和 Settings... 吧。

image

貌似是个 StoryBoard Bug，估计苹果也不打算维护 Storyboard 了。。。我先裸改storyboard的 ID 节点修复下吧

Fixed via #200

或者后面改到 SwiftUI 方案的话需要 Target macOS 13 https://developer.apple.com/documentation/swiftui/menubarextra

@Kyle-Ye Kyle-Ye mentioned this pull request Oct 27, 2023
Merged
@tisfeng
Copy link
Owner

tisfeng commented Oct 27, 2023

可以，那就先这样改。

@Jerry23011 Jerry23011 mentioned this pull request Oct 28, 2023
Merged
@tisfeng tisfeng mentioned this pull request Oct 31, 2023
Closed
4 tasks
@Jerry23011 Jerry23011 deleted the preferences-rename branch November 15, 2023 05:59
Jerry23011 added a commit to Jerry23011/Easydict that referenced this pull request Dec 3, 2023
@Jerry23011 @Kyle-Ye
Rename Preferences to Settings (tisfeng#195)
5798357 
* perf(UI): rename Preferences to Settings

* fix(UI): conflicts in String Catalog

* docs: update README

* docs: update README

* docs: update README_EN

* perf(UI): settings name adjustment

Co-authored-by: Kyle <[email protected]>

---------

Co-authored-by: Kyle <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kyle-Ye Kyle-Ye Kyle-Ye left review comments

@tisfeng tisfeng Awaiting requested review from tisfeng

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

Successfully merging this pull request may close these issues.

🚀 功能建议：根据系统版本使用 “设置“ 或 ”偏好设置“
3 participants
@Jerry23011 @tisfeng @Kyle-Ye