vendor/assets/javascripts/i18n/grid.locale-en.js in jqgrid-jquery-rails-4.3.1.0 vs vendor/assets/javascripts/i18n/grid.locale-en.js in jqgrid-jquery-rails-4.3.2.0

- old
+ new

@@ -5,11 +5,12 @@ * http://trirand.com/blog/ * Dual licensed under the MIT and GPL licenses: * http://www.opensource.org/licenses/mit-license.php * http://www.gnu.org/licenses/gpl.html **/ -$.jgrid = { +$.jgrid = $.jgrid || {}; +$.extend($.jgrid,{ defaults : { recordtext: "View {0} - {1} of {2}", emptyrecords: "No records to view", loadtext: "Loading...", pgtext : "Page {0} of {1}" @@ -122,7 +123,7 @@ showAction: '', target: '', checkbox : {disabled:true}, idName : 'id' } -}; +}); })(jQuery);