Index: lams_central/web/includes/javascript/jquery.jqGrid.locale-en.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/jquery.jqGrid.locale-en.js,v diff -u -r1.2 -r1.3 --- lams_central/web/includes/javascript/jquery.jqGrid.locale-en.js 29 Sep 2012 13:56:36 -0000 1.2 +++ lams_central/web/includes/javascript/jquery.jqGrid.locale-en.js 17 Sep 2013 04:46:28 -0000 1.3 @@ -19,10 +19,8 @@ caption: "Search...", Find: "Find", Reset: "Reset", - odata : ['equal', 'not equal', 'less', 'less or equal','greater','greater or equal', 'begins with','does not begin with','is in','is not in','ends with','does not end with','contains','does not contain'], - groupOps: [ { op: "AND", text: "all" }, { op: "OR", text: "any" } ], - matchText: " match", - rulesText: " rules" + odata: [{ oper:'eq', text:'equal'},{ oper:'ne', text:'not equal'},{ oper:'lt', text:'less'},{ oper:'le', text:'less or equal'},{ oper:'gt', text:'greater'},{ oper:'ge', text:'greater or equal'},{ oper:'bw', text:'begins with'},{ oper:'bn', text:'does not begin with'},{ oper:'in', text:'is in'},{ oper:'ni', text:'is not in'},{ oper:'ew', text:'ends with'},{ oper:'en', text:'does not end with'},{ oper:'cn', text:'contains'},{ oper:'nc', text:'does not contain'}], + groupOps: [ { op: "AND", text: "all" }, { op: "OR", text: "any" } ] }, edit : { addCaption: "Add Record", @@ -104,6 +102,7 @@ S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th';}, srcformat: 'Y-m-d', newformat: 'n/j/Y', + parseRe : /[Tt\\\/:_;.,\t\s-]/, masks : { // see http://php.net/manual/en/function.date.php for PHP format used in jqGrid // and see http://docs.jquery.com/UI/Datepicker/formatDate