fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #39 from alvarocs/BUG-8932

Browse Source 
BUG 8932 Untranslatable strings   SOLVED
This commit is contained in:
julceslauhub
2012-06-06 13:52:07 -07:00
parent 7eb21c69a5 bc121f65cc
commit aa338dea1d
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/system/class.headPublisher.php
View File

@@ -304,7 +304,7 @@ class headPublisher {
function getExtJsStylesheets($skinName){ function getExtJsStylesheets($skinName){
$script = " <link rel='stylesheet' type='text/css' href='/css/$skinName.css' />\n"; $script = " <link rel='stylesheet' type='text/css' href='/css/$skinName.css' />\n";
$script .= " <script type='text/javascript' src='/js/ext/translation.en.js'></script>\n"; $script .= " <script type='text/javascript' src='/js/ext/translation.".SYS_LANG.".js'></script>\n";
/* /*
$script .= " <link rel='stylesheet' type='text/css' href='/skins/ext/ext-all-notheme.css' />\n"; $script .= " <link rel='stylesheet' type='text/css' href='/skins/ext/ext-all-notheme.css' />\n";
$script .= " <link rel='stylesheet' type='text/css' href='/skins/ext/" . $this->extJsSkin.".css' />\n"; $script .= " <link rel='stylesheet' type='text/css' href='/skins/ext/" . $this->extJsSkin.".css' />\n";

2
workflow/engine/js/dynaforms/dynaforms_conditionalShowHide.js
View File

@@ -398,7 +398,7 @@ var Conditional = function(DYN_UID){
if(this.canSave){ if(this.canSave){
if( saving != true ){ if( saving != true ){
bResult = (result)? 'TRUE': 'FALSE'; bResult = (result)? _('ID_TRUE'): _('ID_FALSE');
oResultDiv = document.getElementById("ResultMessageTD"); oResultDiv = document.getElementById("ResultMessageTD");
oResultDiv.style.display = 'block'; oResultDiv.style.display = 'block';
oResultDiv.style.backgroundColor = '#BFCCC5'; oResultDiv.style.backgroundColor = '#BFCCC5';

1
workflow/engine/templates/setup/languages.js
View File

@@ -78,6 +78,7 @@ Ext.onReady(function(){
if(uploader.getForm().isValid()){ if(uploader.getForm().isValid()){
uploader.getForm().submit({ uploader.getForm().submit({
url: 'languages_Import', url: 'languages_Import',
waitTitle:'',
waitMsg: _('ID_UPLOADING_TRANSLATION_FILE'), waitMsg: _('ID_UPLOADING_TRANSLATION_FILE'),
success: function(o, resp){ success: function(o, resp){
w.close(); w.close();