Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

pass locale to datepicker, use gem for that

Browse source
This commit is contained in:
wvengen 2013-07-07 01:47:22 +02:00
parent 76645ebd12
commit 8080cd6b7e
8 changed files with 12 additions and 840 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/application.js
View file

@ -3,8 +3,9 @@
//= require jquery_ujs
//= require twitter/bootstrap
//= require jquery.tokeninput
//= require bootstrap-datepicker
//= require bootstrap-datepicker.de
//= require bootstrap-datepicker/core
//= require bootstrap-datepicker/locales/bootstrap-datepicker.de
//= require bootstrap-datepicker/locales/bootstrap-datepicker.nl
//= require jquery.observe_field
//= require rails.validations
//= require_self
@ -112,7 +113,7 @@ $(function() {
});
// Use bootstrap datepicker for dateinput
$('.datepicker').datepicker({format: 'yyyy-mm-dd', weekStart: 1, language: 'de'});
$('.datepicker').datepicker({format: 'yyyy-mm-dd', language: I18n.locale});
});

3
app/assets/stylesheets/application.css
View file

@ -1,4 +1,5 @@
/*
*= require bootstrap_and_overrides
*= require token-input-bootstrappy
*/
*= require bootstrap-datepicker
*/

4
app/assets/stylesheets/bootstrap_and_overrides.css.less vendored
View file

@ -31,10 +31,6 @@ body {
// Example:
// @linkColor: #ff0000;
// Bootstrap datepicker
@import "datepicker";
// Custom styles
// Fix empty dd tags in horizontal dl, see https://github.com/twitter/bootstrap/issues/4062