Skip to content

Commit

Permalink
Merge branch 'master' of github.com:timekit-io/booking-js
Browse files Browse the repository at this point in the history
  • Loading branch information
laander committed Jul 7, 2017
2 parents bb48b11 + 971d26c commit 3eaaa93
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -264,15 +264,15 @@ localization: {
},
```
For full language support, FullCalendar also takes a ["lang" option](http://fullcalendar.io/docs/text/lang/), accompanied by a language file. Make sure to use defer attribute on a script tag loading the language file if you are deferring booking.js, language file should be loaded after booking.js, but before initialization.
For full language support, FullCalendar also takes a ["locale" option](http://fullcalendar.io/docs/text/lang/), accompanied by a language file. Make sure to use defer attribute on a script tag loading the language file if you are deferring booking.js, language file should be loaded after booking.js, but before initialization.
Remember to set `localization.timeDateFormat` to false so it doesn't override the language file's settings.
See `/examples/local-language.htm`
```javascript
fullCalendar: {
lang: 'de'
locale: 'de'
},
localization: {
timeDateFormat: false
Expand Down
4 changes: 2 additions & 2 deletions examples/local-language.htm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script type="text/javascript" src="../dist/booking.js"></script>
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/fullcalendar/2.4.0/lang/de.js"></script>
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.4.0/locale/de.js"></script>
<div id="bookingjs">
<script type="text/javascript">
TimekitBooking().init({
Expand All @@ -22,7 +22,7 @@
avatar: '../misc/avatar-doc.jpg',
app: 'back-to-the-future',
fullCalendar: {
lang: 'de'
locale: 'de'
},
localization: {
timeDateFormat: false
Expand Down

0 comments on commit 3eaaa93

Please sign in to comment.