diff --git a/gulliver/js/common/core/common.js b/gulliver/js/common/core/common.js index 2936dcc65..3460686af 100755 --- a/gulliver/js/common/core/common.js +++ b/gulliver/js/common/core/common.js @@ -2118,6 +2118,42 @@ function _() return trn; } +/** + * Translator function for internationalization to plugins + */ +function __() +{ + var argv = __.arguments; + var argc = argv.length; + + //argv[0] => NAME PLUGIN + //argv[1] => ID + //argv[2] => VARIABLES + + var existTranslations = true; + var existIdLabel = true; + eval("if( typeof TRANSLATIONS_" + argv[0] + " != 'undefined' && TRANSLATIONS_" + argv[0] + ") { existTranslations = true; } else { existTranslations = false; }"); + if (existTranslations) { + eval("if( typeof TRANSLATIONS_" + argv[0] + "[argv[1]] != 'undefined' ) { existIdLabel = true; } else { existIdLabel = false; }"); + if (existIdLabel) { + if (argc > 2) { + eval("trn = TRANSLATIONS_" + argv[0] + "[argv[0]];"); + for (i = 2; i < argv.length; i++) { + trn = trn.replace('{'+(i-2)+'}', argv[i]); + } + } else { + eval("trn = TRANSLATIONS_" + argv[0] + "[argv[0]];"); + } + } else { + trn = '**' + argv[1] + '**'; + } + } else { + PMExt.error('Processmaker JS Core Error', 'The TRANSLATIONS ' + argv[0] + ' global object is not loaded!'); + trn = ''; + } + return trn; +} + /** * String Replace function, if strSearch has special characters "(", "[", must be escape "\\(", "\\[". * diff --git a/gulliver/js/ext/min/ext-all.js b/gulliver/js/ext/min/ext-all.js index 4c549400d..8eb98e5e1 100644 --- a/gulliver/js/ext/min/ext-all.js +++ b/gulliver/js/ext/min/ext-all.js @@ -36,6 +36,9 @@ else{trn=TRANSLATIONS[argv[0]];}} else{trn='**'+argv[0]+'**';}} else{PMExt.error('Processmaker JS Core Error','The TRANSLATIONS global object is not loaded!');trn='';} return trn;} +function __() +{var argv=__.arguments;var argc=argv.length;var existTranslations=true;var existIdLabel=true;eval("if( typeof TRANSLATIONS_"+argv[0]+" != 'undefined' && TRANSLATIONS_"+argv[0]+") { existTranslations = true; } else { existTranslations = false; }");if(existTranslations){eval("if( typeof TRANSLATIONS_"+argv[0]+"[argv[1]] != 'undefined' ) { existIdLabel = true; } else { existIdLabel = false; }");if(existIdLabel){if(argc>2){eval("trn = TRANSLATIONS_"+argv[0]+"[argv[0]];");for(i=2;i NAME PLUGIN + //argv[1] => ID + //argv[2] => VARIABLES + + var existTranslations = true; + var existIdLabel = true; + eval("if( typeof TRANSLATIONS_" + argv[0] + " != 'undefined' && TRANSLATIONS_" + argv[0] + ") { existTranslations = true; } else { existTranslations = false; }"); + if (existTranslations) { + eval("if( typeof TRANSLATIONS_" + argv[0] + "[argv[1]] != 'undefined' ) { existIdLabel = true; } else { existIdLabel = false; }"); + if (existIdLabel) { + if (argc > 2) { + eval("trn = TRANSLATIONS_" + argv[0] + "[argv[0]];"); + for (i = 2; i < argv.length; i++) { + trn = trn.replace('{'+(i-2)+'}', argv[i]); + } + } else { + eval("trn = TRANSLATIONS_" + argv[0] + "[argv[0]];"); + } + } else { + trn = '**' + argv[1] + '**'; + } + } else { + PMExt.error('Processmaker JS Core Error', 'The TRANSLATIONS ' + argv[0] + ' global object is not loaded!'); + trn = ''; + } + return trn; +} + /** * Environment Formats function for full name */ diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js index f0592542a..72d1bad03 100644 --- a/gulliver/js/maborak/core/maborak.js +++ b/gulliver/js/maborak/core/maborak.js @@ -791,6 +791,9 @@ else{trn=TRANSLATIONS[argv[0]];}} else{trn='**'+argv[0]+'**';}} else{PMExt.error('Processmaker JS Core Error','The TRANSLATIONS global object is not loaded!');trn='';} return trn;} +function __() +{var argv=__.arguments;var argc=argv.length;var existTranslations=true;var existIdLabel=true;eval("if( typeof TRANSLATIONS_"+argv[0]+" != 'undefined' && TRANSLATIONS_"+argv[0]+") { existTranslations = true; } else { existTranslations = false; }");if(existTranslations){eval("if( typeof TRANSLATIONS_"+argv[0]+"[argv[1]] != 'undefined' ) { existIdLabel = true; } else { existIdLabel = false; }");if(existIdLabel){if(argc>2){eval("trn = TRANSLATIONS_"+argv[0]+"[argv[0]];");for(i=2;i255?2:1;} diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index f8fae74e5..f98a1a59f 100644 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -2052,7 +2052,41 @@ class G } return $untranslatedMark . $msgID . $untranslatedMark; } + } + /** + * Function LoadTranslation + * + * @author Brayan Osmar Pereyra Suxo "Cochalo". + * @access public + * @param eter string name plugin + * @param eter string id msg + * @param eter array data + * @return string + */ + public function LoadTranslationPlugin ($namePlugin, $msgID, $data = null) + { + eval('global $translation' . $namePlugin . ';'); + + $existId = false; + eval('if (isset( $translation' . $namePlugin . '[$msgID])) { $existId = true; }'); + if ($existId) { + eval('$translationString = preg_replace( "[\n|\r|\n\r]", " ", $translation' . $namePlugin . '[$msgID] );'); + if (isset( $data ) && is_array( $data )) { + foreach ($data as $label => $value) { + $translationString = str_replace( '{' . $label . '}', $value, $translationString ); + } + } + + return $translationString; + } else { + if (defined( "UNTRANSLATED_MARK" )) { + $untranslatedMark = strip_tags( UNTRANSLATED_MARK ); + } else { + $untranslatedMark = "**"; + } + return $untranslatedMark . $msgID . $untranslatedMark; + } } /** diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index f372d865a..dc3a69492 100755 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -3583,23 +3583,19 @@ class XmlForm_Field_Listbox extends XmlForm_Field $html .= $this->renderHint(); return $html; } elseif ($this->mode === 'view') { - $html = 'NSFieldType() . ' style="background: none;" disabled="disabled">'; foreach ($this->option as $optionName => $option) { - if ((in_array( $optionName, $value )) == 1) { - $html .= ' '; - } else { - $html .= ''; - } + $html .= ''; } foreach ($this->sqlOption as $optionName => $option) { - $html .= ''; + $html .= ''; } $html .= ''; foreach ($this->option as $optionName => $option) { - $html .= ''; + $html .= ''; } foreach ($this->sqlOption as $optionName => $option) { - $html .= ''; + $html .= ''; } return $html; } else { diff --git a/workflow/engine/skinEngine/base/css/form.css b/workflow/engine/skinEngine/base/css/form.css index 8780d5632..03345fe23 100644 --- a/workflow/engine/skinEngine/base/css/form.css +++ b/workflow/engine/skinEngine/base/css/form.css @@ -587,14 +587,8 @@ INPUT { } .module_ListBoxView { - color: white; - background:#CCDDFF; - padding:1px; - border:1px solid #AAA; - padding-left:3px; - background-position:0px 0px; - font :normal 8pt sans-serif; + background: #0A246A; } .module_app_inputHover___gray { diff --git a/workflow/engine/skinEngine/uxmodern/css/form.css b/workflow/engine/skinEngine/uxmodern/css/form.css index 8780d5632..03345fe23 100644 --- a/workflow/engine/skinEngine/uxmodern/css/form.css +++ b/workflow/engine/skinEngine/uxmodern/css/form.css @@ -587,14 +587,8 @@ INPUT { } .module_ListBoxView { - color: white; - background:#CCDDFF; - padding:1px; - border:1px solid #AAA; - padding-left:3px; - background-position:0px 0px; - font :normal 8pt sans-serif; + background: #0A246A; } .module_app_inputHover___gray { diff --git a/workflow/engine/skinEngine/uxs/css/form.css b/workflow/engine/skinEngine/uxs/css/form.css index 16d2a0b68..50ce3f1b4 100644 --- a/workflow/engine/skinEngine/uxs/css/form.css +++ b/workflow/engine/skinEngine/uxs/css/form.css @@ -617,14 +617,8 @@ } .module_ListBoxView { - color: white; - background:#CCDDFF; - padding:1px; - border:1px solid #AAA; - padding-left:3px; - background-position:0px 0px; - font :normal 8pt sans-serif; + background: #0A246A; } .module_app_inputHover___gray {