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

feat: Make protocol registration a configurable user preference #411

Merged

Conversation

oblivioncth
Copy link
Contributor

Prevents the launcher from forcefully overwriting an existing registration for the "flashpoint://" protocol if the user wants to use another application for that.

The default value true keeps existing behavior. Setting the value to false not only prevents the launcher from setting itself as the protocol handler, but will remove a prior registration of itself if present.

The non-English strings are all via Google Translate, which I figured was better than nothing.

@oblivioncth oblivioncth changed the title Make protocol registration a configurable user preference feat: Make protocol registration a configurable user preference Oct 23, 2023
@oblivioncth
Copy link
Contributor Author

Improved error reporting by accounting for Electron quirks.

@colin969
Copy link
Member

Looks good, but I'll double check later today.

You shouldn't include non-english strings here. That's CrowdIn's job. Note for the future.

Copy link
Member

@colin969 colin969 left a comment

Choose a reason for hiding this comment

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

Should only be a simple change

src/main/Main.ts Show resolved Hide resolved
@colin969 colin969 changed the base branch from develop to release/12.2.0 October 27, 2023 15:55
@oblivioncth
Copy link
Contributor Author

You shouldn't include non-english strings here. That's CrowdIn's job. Note for the future.
Noted. Forgot about that service.

To clarify exactly how this should be handled in the future, should one:

  1. Not modify the the non-English lang/*.json files at all (i.e. leave out the new variable from them entirely)
  2. Add the new variable to the non-English files as an empty string.
  3. Add the new variable to the non-English files with the string as just a copy of the English one.

I did see some English in the translation files so I'm guessing 3?

Finally, do you want me to drop/alter the translations in accordance with the above proper action from this PR specifically? Or should I leave this one alone?

@colin969
Copy link
Member

colin969 commented Oct 27, 2023

  1. Language files except for English should not be touched.

It'd be easiest to apply the lang files for non-english from the release branch to yours to deal with conflicts.

@colin969 colin969 merged commit 1b949a4 into FlashpointProject:release/12.2.0 Oct 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants