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

Projects
None yet
3 participants
@rgbkrk
Copy link
Member

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') {

This comment has been minimized.

@rgbkrk

rgbkrk Sep 25, 2017

Author Member

The primary change here, with comment below

@rgbkrk

This comment has been minimized.

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

4 checks passed

codecov/patch Coverage not affected when comparing b2edf89...11e578f
Details
codecov/project 79.24% remains the same compared to b2edf89
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@rgbkrk rgbkrk deleted the rgbkrk:fix-dynamic-locale branch Sep 26, 2017

@gnestor gnestor added this to the 5.2 milestone Oct 13, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.