react-moment 1.1.4 → 1.2.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-moment",
   "description": "React component for the moment date library.",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "author": {
     "name": "Sean Hickey",
     "web": "https://headzoo.io"

package/src/index.jsx

@@ -168,11 +168,7 @@ export default class Moment extends React.Component {
     parse = parse || Moment.globalParse;
     local = local || Moment.globalLocal;
     tz = tz || Moment.globalTimezone;
-    if (Moment.globalLocale) {
-      locale = Moment.globalLocale;
-    } else {
-      locale = locale || Moment.globalMoment.locale();
-    }
+    locale = locale || Moment.globalLocale || Moment.globalMoment.locale();
 
     let datetime = null;
     if (utc) {

package/tests/index.jsx

@@ -392,6 +392,22 @@ describe('react-moment', () => {
     expect(ReactDOM.findDOMNode(date).innerHTML).toEqual('19 avr. 1976');
   });
 
+  it('locale prop overrides globalLocale', () => {
+    // Set global locale to French
+    Moment.globalLocale = 'fr';
+    
+    // Component with explicit English locale should override global French
+    const date = TestUtils.renderIntoDocument(
+      <Moment format="D MMM YYYY" locale="en" date="1976-04-19T12:59-0500" />
+    );
+    
+    // Should display in English, not French
+    expect(ReactDOM.findDOMNode(date).innerHTML).toEqual('19 Apr 1976');
+    
+    // Reset global locale
+    Moment.globalLocale = null;
+  });
+
   it('globalTimezone', () => {
     Moment.globalTimezone = 'America/Los_Angeles';
     const date = TestUtils.renderIntoDocument(