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

Fix #2740, write i18n.csv on demand #2741

Merged
merged 3 commits into from Dec 23, 2019
Merged

Conversation

@studentmain
Copy link
Collaborator

studentmain commented Dec 22, 2019

Please follow the guide below

  • You will be asked some questions, please read them carefully and answer honestly

  • Put an x into all the boxes [ ] relevant to your pull request (like that [x])

  • Use Preview tab to see how your pull request will actually look like

  • Searched for similar pull requests

  • Compiled the code with Visual Studio

  • Require translation update

  • Require document update (readme.md, wikipage, etc)

What is the purpose of your pull request?

  • Bug fix
  • Improvement
  • New feature

Description of your pull request and other information

Explanation of your pull request in arbitrary form goes here. Please make sure the description explains the purpose and effect of your pull request and is worded well enough to be understood. Provide as much context and examples as possible.

@studentmain studentmain requested review from celeron533 and chenshaoju Dec 22, 2019
Copy link
Collaborator

chenshaoju left a comment

:+1 Looks good to me, but someone else must approve.

@@ -322,6 +320,7 @@ private void LoadMenu()
CreateMenuItem("Show Logs...", new EventHandler(this.ShowLogItem_Click)),
this.VerboseLoggingToggleItem = CreateMenuItem( "Verbose Logging", new EventHandler(this.VerboseLoggingToggleItem_Click) ),
this.ShowPluginOutputToggleItem = CreateMenuItem("Show Plugin Output", new EventHandler(this.ShowPluginOutputToggleItem_Click)),
this.WriteI18NFileItem = CreateMenuItem("Write translation template",new EventHandler(WriteI18NFileItem_Click)),

This comment has been minimized.

Copy link
@celeron533

celeron533 Dec 23, 2019

Collaborator

Why need this menu? What will happen if user generated an old csv file then user upgrade SS to a new version with new UI elements?

This comment has been minimized.

Copy link
@studentmain

studentmain Dec 23, 2019

Author Collaborator

Why need this menu?

user can translate the program by edit generated csv

What will happen

New translation won't apply

This comment has been minimized.

Copy link
@celeron533

celeron533 Dec 23, 2019

Collaborator

New translation won't apply

IMO, if users need a new language or amend the translation, let them send pull request. Otherwise, by use of an external translation file may cause some "out-of-date" problem after upgrade.

This comment has been minimized.

Copy link
@celeron533

celeron533 Dec 23, 2019

Collaborator

If you feel it doesn't matter, please merge the PR.

This comment has been minimized.

Copy link
@studentmain

studentmain Dec 23, 2019

Author Collaborator

@chenshaoju How do you think?

This comment has been minimized.

Copy link
@chenshaoju

chenshaoju Dec 23, 2019

Collaborator

My programming is bad...
Looks good, build succeeded, I think is good.

This comment has been minimized.

Copy link
@studentmain

studentmain Dec 23, 2019

Author Collaborator

"out-of-date" problem

will implement translate file merge to resolve this

This comment has been minimized.

Copy link
@celeron533

celeron533 Dec 23, 2019

Collaborator

will implement translate file merge to resolve this

What will happen if there is a conflict or obsoleted item in new version? This is what I am worrying about. Too much user interactions.
Or your design purpose is to switch between "integrated translation resource" and "external translation file" in the future?

This comment has been minimized.

Copy link
@studentmain

studentmain Dec 23, 2019

Author Collaborator

conflict

use external one, as user may changed it

obsoleted

just keep it, user can downgrade version

This comment has been minimized.

Copy link
@celeron533

celeron533 Dec 24, 2019

Collaborator

OK I will draft a new release soon

@studentmain studentmain merged commit efc5a25 into shadowsocks:master Dec 23, 2019
1 check passed
1 check passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.