diff --git a/gulliver/js/ext/locale/ext-lang-pt.js b/gulliver/js/ext/locale/ext-lang-pt.js index cec535d73..4f2e3747b 100644 --- a/gulliver/js/ext/locale/ext-lang-pt.js +++ b/gulliver/js/ext/locale/ext-lang-pt.js @@ -245,6 +245,15 @@ if(Ext.grid.GridView){ }); } + +if(Ext.grid.GroupingView){ + Ext.apply(Ext.grid.GroupingView.prototype, { + emptyGroupText : '(Nenhum)', + groupByText : 'Grupo por este campo', + showGroupsText : 'Mostrar em Grupos' + }); +} + if(Ext.grid.PropertyColumnModel){ Ext.apply(Ext.grid.PropertyColumnModel.prototype, { nameText : "Nome", diff --git a/gulliver/js/ext/locale/ext-lang-pt_BR.js b/gulliver/js/ext/locale/ext-lang-pt_BR.js index 03c6b1553..ad48f18da 100644 --- a/gulliver/js/ext/locale/ext-lang-pt_BR.js +++ b/gulliver/js/ext/locale/ext-lang-pt_BR.js @@ -287,6 +287,14 @@ if(Ext.grid.GridView){ }); } +if(Ext.grid.GroupingView){ + Ext.apply(Ext.grid.GroupingView.prototype, { + emptyGroupText : '(Nenhum)', + groupByText : 'Grupo por este campo', + showGroupsText : 'Mostrar em Grupos' + }); +} + if(Ext.grid.PropertyColumnModel){ Ext.apply(Ext.grid.PropertyColumnModel.prototype, { nameText : "Nome", diff --git a/gulliver/system/class.headPublisher.php b/gulliver/system/class.headPublisher.php index f1c1f4191..3161166d7 100644 --- a/gulliver/system/class.headPublisher.php +++ b/gulliver/system/class.headPublisher.php @@ -313,9 +313,16 @@ class headPublisher $head = $head . " \n"; $head = $head . " \n"; - $aux = explode('-', strtolower(SYS_LANG)); - if (($aux[0] != 'en') && file_exists(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'ext' . PATH_SEP . 'locale' . PATH_SEP . 'ext-lang-' . $aux[0] . '.js')) { - $head = $head . " \n"; + if (SYS_LANG != 'en') { + $tempLang = str_replace('-', '_', SYS_LANG); + if (file_exists(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'ext' . PATH_SEP . 'locale' . PATH_SEP . 'ext-lang-' . $tempLang . '.js')) { + $head = $head . " \n"; + } else { + $aux = explode('-', strtolower(SYS_LANG)); + if (file_exists(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'ext' . PATH_SEP . 'locale' . PATH_SEP . 'ext-lang-' . $aux[0] . '.js')) { + $head = $head . " \n"; + } + } } // enabled for particular use