vendor/assets/javascripts/webshims/shims/combos/11.js in webshims-rails-1.15.6.4 vs vendor/assets/javascripts/webshims/shims/combos/11.js in webshims-rails-1.15.8
- old
+ new
@@ -811,12 +811,12 @@
});
}
};
})();
var addZero = function(val){
- if(!val){return "";}
val = val+'';
+ if(!val){return "";}
return val.length == 1 ? '0'+val : val;
};
var loadPicker = function(type, name){
type = (type == 'color' ? 'color' : 'forms')+'-picker';
@@ -891,17 +891,16 @@
numberFormat: {
".": ".",
",": ","
},
numberSigns: '.',
- dateSigns: '/',
+ dateSigns: '-',
timeSigns: ":. ",
- dFormat: "/",
+ dFormat: "-",
patterns: {
- d: "mm/dd/yy"
+ d: "yy-mm-dd"
},
- meridian: ['AM', 'PM'],
month: {
currentText: 'This month'
},
time: {
"currentText": "Now"
@@ -916,30 +915,40 @@
"monthNamesShort": ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],
"dayNames": ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],
"dayNamesShort": ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],
"dayNamesMin": ["Su","Mo","Tu","We","Th","Fr","Sa"],
"weekHeader": "Wk",
- "firstDay": 0,
+ "firstDay": 1,
"isRTL": false,
"showMonthAfterYear": false,
"yearSuffix": ""
}
}, formcfg.en || {});
if(!formcfg['en-US']){
- formcfg['en-US'] = $.extend(true, {}, formcfg['en']);
+ formcfg['en-US'] = $.extend(true, {}, formcfg.en, {
+ date: {firstDay: 0},
+ patterns: {d: "mm/dd/yy"},
+ dateSigns: '-',
+ dFormat: "/",
+ meridian: ['AM', 'PM']
+
+ });
}
if(!formcfg['en-GB']){
formcfg['en-GB'] = $.extend(true, {}, formcfg.en, {
- date: {firstDay: 1},
- patterns: {d: "dd/mm/yy"}
+ date: {firstDay: 1},
+ patterns: {d: "dd/mm/yy"},
+ dateSigns: '-',
+ dFormat: "/",
+ meridian: ['AM', 'PM']
});
}
if(!formcfg['en-AU']){
formcfg['en-AU'] = $.extend(true, {}, formcfg['en-GB']);
}
if(!formcfg['']){
- formcfg[''] = formcfg['en-US'];
+ formcfg[''] = formcfg['en'];
}
curCfg = formcfg[''];
var processLangCFG = function(langCfg){