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

load locale dynamically only when not en-us #2866

Merged
merged 1 commit into from
Sep 26, 2017

Conversation

rgbkrk
Copy link
Member

@rgbkrk rgbkrk commented Sep 25, 2017

While trying to investigate failing tests on master, I noticed that there were errors because moment doesn't have a separate locale file for en or en-us. They keep it as a default per moment/moment#2081.

Since the whitespace was misleading in this file (I thought some of these functions were inside each other until I cleaned it up), I ran prettier over it.

}
var uiLang = _uiLang();

if (uiLang !== 'en' && uiLang !== 'en-us') {
Copy link
Member Author

Choose a reason for hiding this comment

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

The primary change here, with comment below

@rgbkrk
Copy link
Member Author

rgbkrk commented Sep 25, 2017

Since this is pretty much passing, I'm thinking I need to take a second look at how I'm doing the vdom mimetype in #2840. O____o

@rgbkrk rgbkrk merged commit b884ff9 into jupyter:master Sep 26, 2017
@rgbkrk rgbkrk deleted the fix-dynamic-locale branch September 26, 2017 03:48
@gnestor gnestor added this to the 5.2 milestone Oct 13, 2017
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 4, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants