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

Restore display language support #34

Merged
merged 1 commit into from
Dec 23, 2021
Merged

Restore display language support #34

merged 1 commit into from
Dec 23, 2021

Conversation

code-asher
Copy link
Member

Copy link

@jsjoeio jsjoeio left a comment

Choose a reason for hiding this comment

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

Nice work!!!

Do you think it's worth me submitting this upstream?

const regexp = /('(?:[^\\']*(?:\\.)?)*')|('(?:[^\\']*(?:\\.)?)*')|(\/\*(?:\r?\n|.)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))/g;

return content.replace(regexp, (match, _m1, _m2, m3, m4) => {
// Only one of m1, m2, m3, m4 matches
Copy link

Choose a reason for hiding this comment

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

What exactly is this? I know you said taken from src/main so I guess I'll have to look there when reviewing this from a computer.

Copy link
Member Author

Choose a reason for hiding this comment

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

I think the file can contain comments so they remove them since JSON.parse will choke otherwise.

@@ -15,9 +15,10 @@ import { AuthType } from 'vs/base/common/auth';
export const serverOptions: OptionDescriptions<ServerParsedArgs> = {
//#region @coder
'auth': { type: 'string' },
'port': { type: 'string' },
'locale': { type: 'string' },
Copy link

Choose a reason for hiding this comment

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

Does this mean you can pass locale as a command line arg?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yup, gonna add it back on the code-server side.

@code-asher code-asher merged commit 76663e7 into coder:main Dec 23, 2021
@code-asher code-asher deleted the display-language branch December 23, 2021 18:16
@code-asher
Copy link
Member Author

Could be worth submitting upstream although it is anyone's guess whether this is the path they will end up taking!

@code-asher
Copy link
Member Author

There are some things we would need to change first though.

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