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 issue with default language in LGPO #52113

Merged
merged 3 commits into from Mar 27, 2019

Conversation

@twangboy
Copy link
Contributor

commented Mar 8, 2019

What does this PR do?

Change default when language not found from 1033 to 'en_US'. The integer was causing the .replace('_', '-') function to fail. Though this fixes the issue with replace failing on an int, it doesn't address the underlying issue why a valid language code wasn't being returned by GetSystemDefaultUILanguage.

What issues does this PR fix or reference?

#51944
#49699

Tests written?

No

Commits signed with GPG?

Yes

twangboy added 2 commits Mar 8, 2019
The integer was causing the .replace('_', '-') function to fail
@dwoz
dwoz approved these changes Mar 8, 2019
@dwoz dwoz merged commit a743fff into saltstack:2018.3 Mar 27, 2019
10 checks passed
10 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
@twangboy twangboy deleted the twangboy:fix_lgpo branch Mar 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.