Only set locale if dateLocale prop is passed and update README

JonathanWi · Apr 21, 2016 · 2eb0fdc · 2eb0fdc
1 parent 3a68b67
commit 2eb0fdc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/GiftedMessenger.js b/GiftedMessenger.js
@@ -129,7 +129,8 @@ class GiftedMessenger extends Component {
 
     Object.assign(this.styles, this.props.styles);
 
-    setLocale(this.props.dateLocale);
+    if (this.props.dateLocale !== '')
+      setLocale(this.props.dateLocale);
   }
 
   componentDidMount() {
@@ -592,6 +593,7 @@ class GiftedMessenger extends Component {
 GiftedMessenger.defaultProps = {
   autoFocus: true,
   blurOnSubmit: false,
+  dateLocale: '',
   displayNames: true,
   displayNamesInsideBubble: false,
   forceRenderImage: false,

diff --git a/README.md b/README.md
@@ -37,6 +37,7 @@ See [GiftedMessengerExample/GiftedMessengerContainer.js](https://raw.githubuserc
 | ----------------------------- | -------- | -------------------------------------------------------------------------- | -------- | -------------------------------- |
 | autoFocus                     | Boolean  | TextInput auto focus                                                       | Both     | true                             |
 | blurOnSubmit                  | Boolean  | Dismiss the keyboard when clicking on submit                               | Both     | false                            |
+| dateLocale                    | String   | The moment.js locale used for displaying the message timestamps            | Both     | ''                               |
 | displayNames                  | Boolean  | Display or not the name of the interlocutor(s)                             | Both     | true                             |
 | displayNamesInsideBubble      | Boolean  | Display the name of the interlocutor(s) inside the bubble                  | Both     | false                            |
 | forceRenderImage              | Boolean  | Always render the users images (avatar)                                    | Both     | false                            |