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 building tasks for moment-with-locales.js and moment-with-locales.custom.js #2393

Merged
merged 1 commit into from Jun 23, 2015

Conversation

dennisgl
Copy link
Contributor

#2367 moment-with-locales.custom.js uses last defined locale by default

moment-with-locales.js and moment-with-locales.custom.js were default to "en".

See grunt task embedLocales:

var languageReset = 'moment.locale(\'en\');';

Adding it back to transpiling task seems the right thing to do.


custom locale building was broken

screen shot 2015-05-28 at 2 38 08 pm

In current built moment-with-locales.custom.js:

this line

var moment_with_locales_custom = moment;

which moment is actually undefined, and should be replaced with the matches from the regex,
and thus become

var moment_with_locales_custom = moment__default;

@dennisgl
Copy link
Contributor Author

@ichernev, I would be glad if you could take a look on the PR, and let me know if the changes are appropriate 🌻

@wyantb
Copy link
Contributor

wyantb commented Jun 5, 2015

👍 LGTM. Fixes #2399 #2367 etc. @ichernev looking at this? Would be great for a 2.10.4.

@mattjohnsonpint
Copy link
Contributor

@timrwood - this one is important. Can you please take a look and push out a build if possible. Thanks.

@mattjohnsonpint
Copy link
Contributor

I'm merging this now so it gets in the next build. Thanks.

mattjohnsonpint added a commit that referenced this pull request Jun 23, 2015
Fix building tasks for `moment-with-locales.js` and `moment-with-locales.custom.js`
@mattjohnsonpint mattjohnsonpint merged commit c5f93cd into moment:develop Jun 23, 2015
@mattjohnsonpint mattjohnsonpint added this to the 2.10.4 milestone Jun 28, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants