From 80e055e7393582c43eb0a1785561c1071161b206 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Thu, 28 Aug 2014 14:22:03 -0400 Subject: [PATCH 1/8] IMPROVEMENT labels plugins - A validation was added when the file does not exist .po in the language specified. --- workflow/engine/classes/model/Translation.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/model/Translation.php b/workflow/engine/classes/model/Translation.php index 2b1df119e..01e608303 100755 --- a/workflow/engine/classes/model/Translation.php +++ b/workflow/engine/classes/model/Translation.php @@ -288,7 +288,12 @@ class Translation extends BaseTranslation } if (!file_exists(PATH_PLUGINS . $plugin . PATH_SEP . 'translations' . PATH_SEP . $plugin . '.' . $languageId . '.po')) { - return; + if (!file_exists(PATH_PLUGINS . $plugin . PATH_SEP . 'translations' . PATH_SEP . $plugin . '.en.po')) { + return; + } + $languageFile = PATH_PLUGINS . $plugin . PATH_SEP . 'translations' . PATH_SEP . $plugin . '.en.po' ; + } else { + $languageFile = PATH_PLUGINS . $plugin . PATH_SEP . 'translations' . PATH_SEP . $plugin . '.' . $languageId . '.po' ; } $translation = Array (); $translationJS = Array (); @@ -304,7 +309,7 @@ class Translation extends BaseTranslation foreach ($translations as $key => $row) { $translation[$key] = $row; } - $languageFile = PATH_PLUGINS . $plugin . PATH_SEP . 'translations' . PATH_SEP . $plugin . '.' . $languageId . '.po' ; + G::LoadSystem( 'i18n_po' ); $POFile = new i18n_PO( $languageFile ); $POFile->readInit(); From 4691cb934314803dcbc9c2c5f8ec5d10e93314e8 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Tue, 2 Sep 2014 10:33:58 -0400 Subject: [PATCH 2/8] Updating .sql and .po files 2014-09-02 --- .../translations/english/processmaker.en.po | 60 +++- workflow/engine/data/mssql/insert.sql | 322 ++++++++++-------- workflow/engine/data/mysql/insert.sql | 305 +++++++++-------- 3 files changed, 393 insertions(+), 294 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index cbd31ed06..974968a9d 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ProcessMaker 2.5.2.3\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2014-08-21 17:02:40\n" +"PO-Revision-Date: 2014-09-02 10:32:26\n" "Last-Translator: \n" "Language-Team: Colosa Developers Team \n" "MIME-Version: 1.0\n" @@ -12616,8 +12616,8 @@ msgstr "The current password is incorrect" # TRANSLATION # LABEL/ID_MAX_LIFETIME #: LABEL/ID_MAX_LIFETIME -msgid "Maximum lifetime cleaned up (ms)" -msgstr "Maximum lifetime cleaned up (ms)" +msgid "Cookie lifetime (seconds)" +msgstr "Cookie lifetime (seconds)" # TRANSLATION # LABEL/ID_SUCCESSFUL_CONNECTION @@ -13204,8 +13204,8 @@ msgstr "xxx" # TRANSLATION # LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5 #: LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5 -msgid "ProcessMaker uses a workspaces to store data. Please select a valid workspace name and credentials to log in it." -msgstr "ProcessMaker uses a workspaces to store data. Please select a valid workspace name and credentials to log in it." +msgid "ProcessMaker uses workspaces to store data. Please enter a valid workspace name and credentials to login." +msgstr "ProcessMaker uses workspaces to store data. Please enter a valid workspace name and credentials to login." # TRANSLATION # LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP4_2 @@ -13558,8 +13558,8 @@ msgstr "Pre-installation check" # TRANSLATION # LABEL/ID_DIRECTORY_FILE_PERMISSION #: LABEL/ID_DIRECTORY_FILE_PERMISSION -msgid "Directory File Permission" -msgstr "Directory File Permission" +msgid "File Permisions" +msgstr "File Permisions" # TRANSLATION # LABEL/ID_DATA_CORRECT @@ -16396,8 +16396,8 @@ msgstr "Use the language of URL" # TRANSLATION # LABEL/ID_SUMMARY_FORM_NO_PERMISSIONS #: LABEL/ID_SUMMARY_FORM_NO_PERMISSIONS -msgid "You do not have permission to summary form" -msgstr "You do not have permission to summary form" +msgid "You do not have permission to have access to the summary form" +msgstr "You do not have permission to have access to the summary form" # TRANSLATION # LABEL/ID_SUMMARY_FORM @@ -16411,6 +16411,48 @@ msgstr "Summary form" msgid "You can't delete the default language." msgstr "You can't delete the default language." +# TRANSLATION +# LABEL/ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT +#: LABEL/ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT +msgid "The format is incorrect, check the following examples: *.* *.png *.pdf, *.doc, *.xls" +msgstr "The format is incorrect, check the following examples: *.* *.png *.pdf, *.doc, *.xls" + +# TRANSLATION +# LABEL/ID_UPLOAD_ERR_NOT_ALLOWED_EXTENSION +#: LABEL/ID_UPLOAD_ERR_NOT_ALLOWED_EXTENSION +msgid "The file has not been attached because the extension is not allowed or because it doesn't correspond to the content of it." +msgstr "The file has not been attached because the extension is not allowed or because it doesn't correspond to the content of it." + +# TRANSLATION +# LABEL/ID_INPUT_DOC_TYPE_FILE_REQUIRED +#: LABEL/ID_INPUT_DOC_TYPE_FILE_REQUIRED +msgid "You must specify the allowed file extensions, use *.* to allow any extension." +msgstr "You must specify the allowed file extensions, use *.* to allow any extension." + +# TRANSLATION +# LABEL/ID_TINY_SYSTEM_VARIABLE +#: LABEL/ID_TINY_SYSTEM_VARIABLE +msgid "System Variable" +msgstr "System Variable" + +# TRANSLATION +# LABEL/ID_CHOOSE_PROVIDER +#: LABEL/ID_CHOOSE_PROVIDER +msgid "Please select provider" +msgstr "Please select provider" + +# TRANSLATION +# LABEL/ID_INDEX +#: LABEL/ID_INDEX +msgid "Index" +msgstr "Index" + +# TRANSLATION +# LABEL/ID_ERROR_JS_NOT_AVAILABLE +#: LABEL/ID_ERROR_JS_NOT_AVAILABLE +msgid "Your browser does not support javascript or it is disabled, please use a different browser or activate the javascript. Forms won't work totally because javascript is used." +msgstr "Your browser does not support javascript or it is disabled, please use a different browser or activate the javascript. Forms won't work totally because javascript is used." + # additionalTables/additionalTablesData.xml?ADD_TAB_NAME # additionalTables/additionalTablesData.xml #: text - ADD_TAB_NAME diff --git a/workflow/engine/data/mssql/insert.sql b/workflow/engine/data/mssql/insert.sql index 4e6548d26..efe7bb721 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -20,148 +20,148 @@ SELECT 'PER_NAME','','00000000000000000000000000000008','en','Reports' UNION ALL SELECT 'PER_NAME','','00000000000000000000000000000007','en','Reassign case' UNION ALL SELECT 'PER_NAME','','00000000000000000000000000000006','en','All cases' UNION ALL SELECT 'PER_NAME','','00000000000000000000000000000005','en','Create cases' UNION ALL -SELECT 'PER_NAME','','00000000000000000000000000000004','en','Factory' UNION ALL +SELECT 'PER_NAME','','00000000000000000000000000000004','en','Design processes' UNION ALL SELECT 'PER_NAME','','00000000000000000000000000000003','en','Users' UNION ALL SELECT 'PER_NAME','','00000000000000000000000000000001','en','Login' UNION ALL SELECT 'PER_NAME','','00000000000000000000000000000002','en','Setup'; -INSERT INTO [LANGUAGE] ([LAN_ID],[LAN_NAME],[LAN_NATIVE_NAME],[LAN_DIRECTION],[LAN_WEIGHT],[LAN_ENABLED],[LAN_CALENDAR]) -SELECT 'aa','Afar','','L','0','0','GREGORIAN' UNION ALL -SELECT 'ab','Abkhazian','','L','1','0','GREGORIAN' UNION ALL -SELECT 'af','Afrikaans','','L','2','0','GREGORIAN' UNION ALL -SELECT 'am','Amharic','','L','3','0','GREGORIAN' UNION ALL -SELECT 'ar','Arabic','','L','4','0','GREGORIAN' UNION ALL -SELECT 'as','Assamese','','L','5','0','GREGORIAN' UNION ALL -SELECT 'ay','Aymara','','L','6','0','GREGORIAN' UNION ALL -SELECT 'az','Azerbaijani','','L','7','0','GREGORIAN' UNION ALL -SELECT 'ba','Bashkir','','L','8','0','GREGORIAN' UNION ALL -SELECT 'be','Byelorussian','','L','9','0','GREGORIAN' UNION ALL -SELECT 'bg','Bulgarian','','L','10','0','GREGORIAN' UNION ALL -SELECT 'bh','Bihari','','L','11','0','GREGORIAN' UNION ALL -SELECT 'bi','Bislama','','L','12','0','GREGORIAN' UNION ALL -SELECT 'bn','Bengali','','L','13','0','GREGORIAN' UNION ALL -SELECT 'bo','Tibetan','','L','14','0','GREGORIAN' UNION ALL -SELECT 'br','Breton','','L','15','0','GREGORIAN' UNION ALL -SELECT 'ca','Catalan','','L','16','0','GREGORIAN' UNION ALL -SELECT 'co','Corsican','','L','17','0','GREGORIAN' UNION ALL -SELECT 'cs','Czech','','L','18','0','GREGORIAN' UNION ALL -SELECT 'cy','Welsh','','L','19','0','GREGORIAN' UNION ALL -SELECT 'da','Danish','','L','20','0','GREGORIAN' UNION ALL -SELECT 'de','German','','L','21','0','GREGORIAN' UNION ALL -SELECT 'dz','Bhutani','','L','22','0','GREGORIAN' UNION ALL -SELECT 'el','Greek','','L','23','0','GREGORIAN' UNION ALL -SELECT 'en','English','','L','24','1','GREGORIAN' UNION ALL -SELECT 'eo','Esperanto','','L','25','0','GREGORIAN' UNION ALL -SELECT 'es','Spanish','','L','26','0','GREGORIAN' UNION ALL -SELECT 'et','Estonian','','L','27','0','GREGORIAN' UNION ALL -SELECT 'eu','Basque','','L','28','0','GREGORIAN' UNION ALL -SELECT 'fa','Persian','','R','29','0','PERSIAN' UNION ALL -SELECT 'fi','Finnish','','L','30','0','GREGORIAN' UNION ALL -SELECT 'fj','Fiji','','L','31','0','GREGORIAN' UNION ALL -SELECT 'fo','Faeroese','','L','32','0','GREGORIAN' UNION ALL -SELECT 'fr','French','','L','33','0','GREGORIAN' UNION ALL -SELECT 'fy','Frisian','','L','34','0','GREGORIAN' UNION ALL -SELECT 'ga','Irish','','L','35','0','GREGORIAN' UNION ALL -SELECT 'gd','Gaelic','','L','36','0','GREGORIAN' UNION ALL -SELECT 'gl','Galician','','L','37','0','GREGORIAN' UNION ALL -SELECT 'gn','Guarani','','L','38','0','GREGORIAN' UNION ALL -SELECT 'gu','Gujarati','','L','39','0','GREGORIAN' UNION ALL -SELECT 'ha','Hausa','','L','40','0','GREGORIAN' UNION ALL -SELECT 'hi','Hindi','','L','41','0','GREGORIAN' UNION ALL -SELECT 'hr','Croatian','','L','42','0','GREGORIAN' UNION ALL -SELECT 'hu','Hungarian','','L','43','0','GREGORIAN' UNION ALL -SELECT 'hy','Armenian','','L','44','0','GREGORIAN' UNION ALL -SELECT 'ia','Interlingua','','L','45','0','GREGORIAN' UNION ALL -SELECT 'ie','Interlingue','','L','46','0','GREGORIAN' UNION ALL -SELECT 'ik','Inupiak','','L','47','0','GREGORIAN' UNION ALL -SELECT 'in','Indonesian','','L','48','0','GREGORIAN' UNION ALL -SELECT 'is','Icelandic','','L','49','0','GREGORIAN' UNION ALL -SELECT 'it','Italian','','L','50','0','GREGORIAN' UNION ALL -SELECT 'iw','Hebrew','','R','51','0','GREGORIAN' UNION ALL -SELECT 'ja','Japanese','','L','52','0','GREGORIAN' UNION ALL -SELECT 'ji','Yiddish','','L','53','0','GREGORIAN' UNION ALL -SELECT 'jw','Javanese','','L','54','0','GREGORIAN' UNION ALL -SELECT 'ka','Georgian','','L','55','0','GREGORIAN' UNION ALL -SELECT 'kk','Kazakh','','L','56','0','GREGORIAN' UNION ALL -SELECT 'kl','Greenlandic','','L','57','0','GREGORIAN' UNION ALL -SELECT 'km','Cambodian','','L','58','0','GREGORIAN' UNION ALL -SELECT 'kn','Kannada','','L','59','0','GREGORIAN' UNION ALL -SELECT 'ko','Korean','','L','60','0','GREGORIAN' UNION ALL -SELECT 'ks','Kashmiri','','L','61','0','GREGORIAN' UNION ALL -SELECT 'ku','Kurdish','','L','62','0','GREGORIAN' UNION ALL -SELECT 'ky','Kirghiz','','L','63','0','GREGORIAN' UNION ALL -SELECT 'la','Latin','','L','64','0','GREGORIAN' UNION ALL -SELECT 'ln','Lingala','','L','65','0','GREGORIAN' UNION ALL -SELECT 'lo','Laothian','','L','66','0','GREGORIAN' UNION ALL -SELECT 'lt','Lithuanian','','L','67','0','GREGORIAN' UNION ALL -SELECT 'lv','Latvian','','L','68','0','GREGORIAN' UNION ALL -SELECT 'mg','Malagasy','','L','69','0','GREGORIAN' UNION ALL -SELECT 'mi','Maori','','L','70','0','GREGORIAN' UNION ALL -SELECT 'mk','Macedonian','','L','71','0','GREGORIAN' UNION ALL -SELECT 'ml','Malayalam','','L','72','0','GREGORIAN' UNION ALL -SELECT 'mn','Mongolian','','L','73','0','GREGORIAN' UNION ALL -SELECT 'mo','Moldavian','','L','74','0','GREGORIAN' UNION ALL -SELECT 'mr','Marathi','','L','75','0','GREGORIAN' UNION ALL -SELECT 'ms','Malay','','L','76','0','GREGORIAN' UNION ALL -SELECT 'mt','Maltese','','L','77','0','GREGORIAN' UNION ALL -SELECT 'my','Burmese','','L','78','0','GREGORIAN' UNION ALL -SELECT 'na','Nauru','','L','79','0','GREGORIAN' UNION ALL -SELECT 'ne','Nepali','','L','80','0','GREGORIAN' UNION ALL -SELECT 'nl','Dutch','','L','81','0','GREGORIAN' UNION ALL -SELECT 'no','Norwegian','','L','82','0','GREGORIAN' UNION ALL -SELECT 'oc','Occitan','','L','83','0','GREGORIAN' UNION ALL -SELECT 'om','Oromo','','L','84','0','GREGORIAN' UNION ALL -SELECT 'or','Oriya','','L','85','0','GREGORIAN' UNION ALL -SELECT 'pa','Punjabi','','L','86','0','GREGORIAN' UNION ALL -SELECT 'pl','Polish','','L','87','0','GREGORIAN' UNION ALL -SELECT 'ps','Pashto','','L','88','0','GREGORIAN' UNION ALL -SELECT 'pt','Portuguese','','L','89','0','GREGORIAN' UNION ALL -SELECT 'qu','Quechua','','L','90','0','GREGORIAN' UNION ALL -SELECT 'rm','Rhaeto-Romance','','L','91','0','GREGORIAN' UNION ALL -SELECT 'rn','Kirundi','','L','92','0','GREGORIAN' UNION ALL -SELECT 'ro','Romanian','','L','93','0','GREGORIAN' UNION ALL -SELECT 'ru','Russian','','L','94','0','GREGORIAN' UNION ALL -SELECT 'rw','Kinyarwanda','','L','95','0','GREGORIAN' UNION ALL -SELECT 'sa','Sanskrit','','L','96','0','GREGORIAN' UNION ALL -SELECT 'sd','Sindhi','','L','97','0','GREGORIAN' UNION ALL -SELECT 'sg','Sangro','','L','98','0','GREGORIAN' UNION ALL -SELECT 'sh','Serbo-Croatian','','L','99','0','GREGORIAN' UNION ALL -SELECT 'si','Singhalese','','L','100','0','GREGORIAN' UNION ALL -SELECT 'sk','Slovak','','L','101','0','GREGORIAN' UNION ALL -SELECT 'sl','Slovenian','','L','102','0','GREGORIAN' UNION ALL -SELECT 'sm','Samoan','','L','103','0','GREGORIAN' UNION ALL -SELECT 'sn','Shona','','L','104','0','GREGORIAN' UNION ALL -SELECT 'so','Somali','','L','105','0','GREGORIAN' UNION ALL -SELECT 'sq','Albanian','','L','106','0','GREGORIAN' UNION ALL -SELECT 'sr','Serbian','','L','107','0','GREGORIAN' UNION ALL -SELECT 'ss','Siswati','','L','108','0','GREGORIAN' UNION ALL -SELECT 'st','Sesotho','','L','109','0','GREGORIAN' UNION ALL -SELECT 'su','Sudanese','','L','110','0','GREGORIAN' UNION ALL -SELECT 'sv','Swedish','','L','111','0','GREGORIAN' UNION ALL -SELECT 'sw','Swahili','','L','112','0','GREGORIAN' UNION ALL -SELECT 'ta','Tamil','','L','113','0','GREGORIAN' UNION ALL -SELECT 'te','Tegulu','','L','114','0','GREGORIAN' UNION ALL -SELECT 'tg','Tajik','','L','115','0','GREGORIAN' UNION ALL -SELECT 'th','Thai','','L','116','0','GREGORIAN' UNION ALL -SELECT 'ti','Tigrinya','','L','117','0','GREGORIAN' UNION ALL -SELECT 'tk','Turkmen','','L','118','0','GREGORIAN' UNION ALL -SELECT 'tl','Tagalog','','L','119','0','GREGORIAN' UNION ALL -SELECT 'tn','Setswana','','L','120','0','GREGORIAN' UNION ALL -SELECT 'to','Tonga','','L','121','0','GREGORIAN' UNION ALL -SELECT 'tr','Turkish','','L','122','0','GREGORIAN' UNION ALL -SELECT 'ts','Tsonga','','L','123','0','GREGORIAN' UNION ALL -SELECT 'tt','Tatar','','L','124','0','GREGORIAN' UNION ALL -SELECT 'tw','Twi','','L','125','0','GREGORIAN' UNION ALL -SELECT 'uk','Ukrainian','','L','126','0','GREGORIAN' UNION ALL -SELECT 'ur','Urdu','','L','127','0','GREGORIAN' UNION ALL -SELECT 'uz','Uzbek','','L','128','0','GREGORIAN' UNION ALL -SELECT 'vi','Vietnamese','','L','129','0','GREGORIAN' UNION ALL -SELECT 'vo','Volapuk','','L','130','0','GREGORIAN' UNION ALL -SELECT 'wo','Wolof','','L','131','0','GREGORIAN' UNION ALL -SELECT 'xh','Xhosa','','L','132','0','GREGORIAN' UNION ALL -SELECT 'yo','Yoruba','','L','133','0','GREGORIAN' UNION ALL -SELECT 'zh','Chinese','','L','134','0','GREGORIAN' UNION ALL -SELECT 'zu','Zulu','','L','135','0','GREGORIAN' ; +INSERT INTO [LANGUAGE] ([LAN_ID],[LAN_LOCATION],[LAN_NAME],[LAN_NATIVE_NAME],[LAN_DIRECTION],[LAN_WEIGHT],[LAN_ENABLED],[LAN_CALENDAR]) +SELECT 'aa','','Afar','','L','0','0','GREGORIAN' UNION ALL +SELECT 'ab','','Abkhazian','','L','1','0','GREGORIAN' UNION ALL +SELECT 'af','','Afrikaans','','L','2','0','GREGORIAN' UNION ALL +SELECT 'am','','Amharic','','L','3','0','GREGORIAN' UNION ALL +SELECT 'ar','','Arabic','','L','4','0','GREGORIAN' UNION ALL +SELECT 'as','','Assamese','','L','5','0','GREGORIAN' UNION ALL +SELECT 'ay','','Aymara','','L','6','0','GREGORIAN' UNION ALL +SELECT 'az','','Azerbaijani','','L','7','0','GREGORIAN' UNION ALL +SELECT 'ba','','Bashkir','','L','8','0','GREGORIAN' UNION ALL +SELECT 'be','','Byelorussian','','L','9','0','GREGORIAN' UNION ALL +SELECT 'bg','BG','Bulgarian','','L','10','0','GREGORIAN' UNION ALL +SELECT 'bh','','Bihari','','L','11','0','GREGORIAN' UNION ALL +SELECT 'bi','','Bislama','','L','12','0','GREGORIAN' UNION ALL +SELECT 'bn','BD','Bengali','','L','13','0','GREGORIAN' UNION ALL +SELECT 'bo','','Tibetan','','L','14','0','GREGORIAN' UNION ALL +SELECT 'br','','Breton','','L','15','0','GREGORIAN' UNION ALL +SELECT 'ca','ES','Catalan','','L','16','0','GREGORIAN' UNION ALL +SELECT 'co','','Corsican','','L','17','0','GREGORIAN' UNION ALL +SELECT 'cs','CZ','Czech','','L','18','0','GREGORIAN' UNION ALL +SELECT 'cy','','Welsh','','L','19','0','GREGORIAN' UNION ALL +SELECT 'da','DK','Danish','','L','20','0','GREGORIAN' UNION ALL +SELECT 'de','DE','German','','L','21','0','GREGORIAN' UNION ALL +SELECT 'dz','','Bhutani','','L','22','0','GREGORIAN' UNION ALL +SELECT 'el','GR','Greek','','L','23','0','GREGORIAN' UNION ALL +SELECT 'en','US','English','','L','24','1','GREGORIAN' UNION ALL +SELECT 'eo','','Esperanto','','L','25','0','GREGORIAN' UNION ALL +SELECT 'es','ES','Spanish','','L','26','0','GREGORIAN' UNION ALL +SELECT 'et','EE','Estonian','','L','27','0','GREGORIAN' UNION ALL +SELECT 'eu','','Basque','','L','28','0','GREGORIAN' UNION ALL +SELECT 'fa','IR','Persian','','R','29','0','PERSIAN' UNION ALL +SELECT 'fi','FI','Finnish','','L','30','0','GREGORIAN' UNION ALL +SELECT 'fj','','Fiji','','L','31','0','GREGORIAN' UNION ALL +SELECT 'fo','FO','Faeroese','','L','32','0','GREGORIAN' UNION ALL +SELECT 'fr','FR','French','','L','33','0','GREGORIAN' UNION ALL +SELECT 'fy','','Frisian','','L','34','0','GREGORIAN' UNION ALL +SELECT 'ga','','Irish','','L','35','0','GREGORIAN' UNION ALL +SELECT 'gd','','Gaelic','','L','36','0','GREGORIAN' UNION ALL +SELECT 'gl','','Galician','','L','37','0','GREGORIAN' UNION ALL +SELECT 'gn','','Guarani','','L','38','0','GREGORIAN' UNION ALL +SELECT 'gu','','Gujarati','','L','39','0','GREGORIAN' UNION ALL +SELECT 'ha','','Hausa','','L','40','0','GREGORIAN' UNION ALL +SELECT 'hi','','Hindi','','L','41','0','GREGORIAN' UNION ALL +SELECT 'hr','HR','Croatian','','L','42','0','GREGORIAN' UNION ALL +SELECT 'hu','HU','Hungarian','','L','43','0','GREGORIAN' UNION ALL +SELECT 'hy','','Armenian','','L','44','0','GREGORIAN' UNION ALL +SELECT 'ia','','Interlingua','','L','45','0','GREGORIAN' UNION ALL +SELECT 'ie','','Interlingue','','L','46','0','GREGORIAN' UNION ALL +SELECT 'ik','','Inupiak','','L','47','0','GREGORIAN' UNION ALL +SELECT 'in','ID','Indonesian','','L','48','0','GREGORIAN' UNION ALL +SELECT 'is','IS','Icelandic','','L','49','0','GREGORIAN' UNION ALL +SELECT 'it','IT','Italian','','L','50','0','GREGORIAN' UNION ALL +SELECT 'iw','IL','Hebrew','','R','51','0','GREGORIAN' UNION ALL +SELECT 'ja','JP','Japanese','','L','52','0','GREGORIAN' UNION ALL +SELECT 'ji','','Yiddish','','L','53','0','GREGORIAN' UNION ALL +SELECT 'jw','','Javanese','','L','54','0','GREGORIAN' UNION ALL +SELECT 'ka','','Georgian','','L','55','0','GREGORIAN' UNION ALL +SELECT 'kk','','Kazakh','','L','56','0','GREGORIAN' UNION ALL +SELECT 'kl','','Greenlandic','','L','57','0','GREGORIAN' UNION ALL +SELECT 'km','','Cambodian','','L','58','0','GREGORIAN' UNION ALL +SELECT 'kn','','Kannada','','L','59','0','GREGORIAN' UNION ALL +SELECT 'ko','KR','Korean','','L','60','0','GREGORIAN' UNION ALL +SELECT 'ks','','Kashmiri','','L','61','0','GREGORIAN' UNION ALL +SELECT 'ku','','Kurdish','','L','62','0','GREGORIAN' UNION ALL +SELECT 'ky','','Kirghiz','','L','63','0','GREGORIAN' UNION ALL +SELECT 'la','','Latin','','L','64','0','GREGORIAN' UNION ALL +SELECT 'ln','','Lingala','','L','65','0','GREGORIAN' UNION ALL +SELECT 'lo','','Laothian','','L','66','0','GREGORIAN' UNION ALL +SELECT 'lt','LT','Lithuanian','','L','67','0','GREGORIAN' UNION ALL +SELECT 'lv','LV','Latvian','','L','68','0','GREGORIAN' UNION ALL +SELECT 'mg','','Malagasy','','L','69','0','GREGORIAN' UNION ALL +SELECT 'mi','','Maori','','L','70','0','GREGORIAN' UNION ALL +SELECT 'mk','','Macedonian','','L','71','0','GREGORIAN' UNION ALL +SELECT 'ml','','Malayalam','','L','72','0','GREGORIAN' UNION ALL +SELECT 'mn','','Mongolian','','L','73','0','GREGORIAN' UNION ALL +SELECT 'mo','','Moldavian','','L','74','0','GREGORIAN' UNION ALL +SELECT 'mr','','Marathi','','L','75','0','GREGORIAN' UNION ALL +SELECT 'ms','MY','Malay','','L','76','0','GREGORIAN' UNION ALL +SELECT 'mt','','Maltese','','L','77','0','GREGORIAN' UNION ALL +SELECT 'my','','Burmese','','L','78','0','GREGORIAN' UNION ALL +SELECT 'na','','Nauru','','L','79','0','GREGORIAN' UNION ALL +SELECT 'ne','','Nepali','','L','80','0','GREGORIAN' UNION ALL +SELECT 'nl','NL','Dutch','','L','81','0','GREGORIAN' UNION ALL +SELECT 'no','NO','Norwegian','','L','82','0','GREGORIAN' UNION ALL +SELECT 'oc','','Occitan','','L','83','0','GREGORIAN' UNION ALL +SELECT 'om','','Oromo','','L','84','0','GREGORIAN' UNION ALL +SELECT 'or','','Oriya','','L','85','0','GREGORIAN' UNION ALL +SELECT 'pa','','Punjabi','','L','86','0','GREGORIAN' UNION ALL +SELECT 'pl','PL','Polish','','L','87','0','GREGORIAN' UNION ALL +SELECT 'ps','','Pashto','','L','88','0','GREGORIAN' UNION ALL +SELECT 'pt','BR','Portuguese','','L','89','0','GREGORIAN' UNION ALL +SELECT 'qu','','Quechua','','L','90','0','GREGORIAN' UNION ALL +SELECT 'rm','','Rhaeto-Romance','','L','91','0','GREGORIAN' UNION ALL +SELECT 'rn','','Kirundi','','L','92','0','GREGORIAN' UNION ALL +SELECT 'ro','RO','Romanian','','L','93','0','GREGORIAN' UNION ALL +SELECT 'ru','RU','Russian','','L','94','0','GREGORIAN' UNION ALL +SELECT 'rw','','Kinyarwanda','','L','95','0','GREGORIAN' UNION ALL +SELECT 'sa','','Sanskrit','','L','96','0','GREGORIAN' UNION ALL +SELECT 'sd','','Sindhi','','L','97','0','GREGORIAN' UNION ALL +SELECT 'sg','','Sangro','','L','98','0','GREGORIAN' UNION ALL +SELECT 'sh','','Serbo-Croatian','','L','99','0','GREGORIAN' UNION ALL +SELECT 'si','','Singhalese','','L','100','0','GREGORIAN' UNION ALL +SELECT 'sk','SK','Slovak','','L','101','0','GREGORIAN' UNION ALL +SELECT 'sl','SI','Slovenian','','L','102','0','GREGORIAN' UNION ALL +SELECT 'sm','','Samoan','','L','103','0','GREGORIAN' UNION ALL +SELECT 'sn','','Shona','','L','104','0','GREGORIAN' UNION ALL +SELECT 'so','','Somali','','L','105','0','GREGORIAN' UNION ALL +SELECT 'sq','','Albanian','','L','106','0','GREGORIAN' UNION ALL +SELECT 'sr','YU','Serbian','','L','107','0','GREGORIAN' UNION ALL +SELECT 'ss','','Siswati','','L','108','0','GREGORIAN' UNION ALL +SELECT 'st','','Sesotho','','L','109','0','GREGORIAN' UNION ALL +SELECT 'su','','Sudanese','','L','110','0','GREGORIAN' UNION ALL +SELECT 'sv','SE','Swedish','','L','111','0','GREGORIAN' UNION ALL +SELECT 'sw','','Swahili','','L','112','0','GREGORIAN' UNION ALL +SELECT 'ta','LK','Tamil','','L','113','0','GREGORIAN' UNION ALL +SELECT 'te','','Tegulu','','L','114','0','GREGORIAN' UNION ALL +SELECT 'tg','','Tajik','','L','115','0','GREGORIAN' UNION ALL +SELECT 'th','TH','Thai','','L','116','0','GREGORIAN' UNION ALL +SELECT 'ti','','Tigrinya','','L','117','0','GREGORIAN' UNION ALL +SELECT 'tk','','Turkmen','','L','118','0','GREGORIAN' UNION ALL +SELECT 'tl','PH','Tagalog','','L','119','0','GREGORIAN' UNION ALL +SELECT 'tn','','Setswana','','L','120','0','GREGORIAN' UNION ALL +SELECT 'to','','Tonga','','L','121','0','GREGORIAN' UNION ALL +SELECT 'tr','TR','Turkish','','L','122','0','GREGORIAN' UNION ALL +SELECT 'ts','','Tsonga','','L','123','0','GREGORIAN' UNION ALL +SELECT 'tt','','Tatar','','L','124','0','GREGORIAN' UNION ALL +SELECT 'tw','','Twi','','L','125','0','GREGORIAN' UNION ALL +SELECT 'uk','UA','Ukrainian','','L','126','0','GREGORIAN' UNION ALL +SELECT 'ur','','Urdu','','L','127','0','GREGORIAN' UNION ALL +SELECT 'uz','','Uzbek','','L','128','0','GREGORIAN' UNION ALL +SELECT 'vi','VN','Vietnamese','','L','129','0','GREGORIAN' UNION ALL +SELECT 'vo','','Volapuk','','L','130','0','GREGORIAN' UNION ALL +SELECT 'wo','','Wolof','','L','131','0','GREGORIAN' UNION ALL +SELECT 'xh','','Xhosa','','L','132','0','GREGORIAN' UNION ALL +SELECT 'yo','','Yoruba','','L','133','0','GREGORIAN' UNION ALL +SELECT 'zh','CN','Chinese','','L','134','0','GREGORIAN' UNION ALL +SELECT 'zu','','Zulu','','L','135','0','GREGORIAN' ; INSERT INTO [ISO_COUNTRY] ([IC_UID],[IC_NAME],[IC_SORT_ORDER]) SELECT 'AD', 'Andorra','' UNION ALL @@ -3082,7 +3082,7 @@ SELECT 'LABEL','ID_DISPLAY_OF','en','of','2014-01-15' UNION ALL SELECT 'LABEL','ID_DELETE_LANGUAGE_WARNING','en','To delete a language you should select a item from the list first.','2014-01-15' UNION ALL -SELECT 'LABEL','ID_DELETE_LANGUAGE_CONFIRM','en','Do you want remove the language "{0}" ?','2014-01-15' +SELECT 'LABEL','ID_DELETE_LANGUAGE_CONFIRM','en','Are you sure you want to delete the language "{0}"?','2014-07-15' UNION ALL SELECT 'LABEL','ID_DELETE_LANGUAGE','en','Remove','2014-01-15' UNION ALL @@ -5642,7 +5642,7 @@ SELECT 'LABEL','ID_PASSWORD_CURRENT_ENTER','en','Enter the current password','20 UNION ALL SELECT 'LABEL','ID_PASSWORD_CURRENT_INCORRECT','en','The current password is incorrect','2014-01-15' UNION ALL -SELECT 'LABEL','ID_MAX_LIFETIME','en','Maximum lifetime cleaned up (ms)','2014-01-15' +SELECT 'LABEL','ID_MAX_LIFETIME','en','Cookie lifetime (seconds)','2014-09-02' UNION ALL SELECT 'LABEL','ID_SUCCESSFUL_CONNECTION','en','Successful connection','2014-01-15' UNION ALL @@ -5840,7 +5840,7 @@ SELECT 'LABEL','ID_LOGIN_WITH_FACEBOOK','en','Login with Facebook!!','2014-01-15 UNION ALL SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP6','en','xxx','2014-01-15' UNION ALL -SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5','en','ProcessMaker uses a workspaces to store data. Please select a valid workspace name and credentials to log in it.','2014-01-15' +SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5','en','ProcessMaker uses workspaces to store data. Please enter a valid workspace name and credentials to login.','2014-09-02' UNION ALL SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP4_2','en','If you are installing ProcessMaker on a remote web server, you will need to get this information from your Database Server.','2014-01-15' UNION ALL @@ -5960,7 +5960,7 @@ SELECT 'LABEL','ID_NOT_PASSED','en','Not Passed.','2014-01-15' UNION ALL SELECT 'LABEL','ID_PREINSTALLATION','en','Pre-installation check','2014-01-15' UNION ALL -SELECT 'LABEL','ID_DIRECTORY_FILE_PERMISSION','en','Directory File Permission','2014-01-15' +SELECT 'LABEL','ID_DIRECTORY_FILE_PERMISSION','en','File Permisions','2014-09-02' UNION ALL SELECT 'LABEL','ID_DATA_CORRECT','en','The data is correct.','2014-01-15' UNION ALL @@ -6899,6 +6899,44 @@ SELECT 'LABEL','ID_PROCESS_VARIABLE_REQUIRED_VARIABLES_FOR_QUERY','en','The vari INSERT INTO [TRANSLATION] ([TRN_CATEGORY],[TRN_ID],[TRN_LANG],[TRN_VALUE],[TRN_UPDATE_DATE]) SELECT 'LABEL','ID_OUTPUT_DOCUMENT_ITS_ASSIGNED','en','The Output Document with {0}: {1} it''s assigned in "{2}".','2014-07-01' + UNION ALL +SELECT 'LABEL','ID_EXISTS_FILES','en','The file exists.','2014-07-17' + UNION ALL +SELECT 'LABEL','ID_FILENAME_REQUIRED','en','The filename is required.','2014-07-17' + UNION ALL +SELECT 'LABEL','ID_VARIABLE_IN_USE','en','The variable with var_uid: {0} is being used by dynaform with dyn_uid: {1}','2014-08-01' + UNION ALL +SELECT 'LABEL','ID_ROUTE_IS_SECJOIN','en','The route is of "SEC-JOIN" type.','2014-07-29' + UNION ALL +SELECT 'LABEL','ID_ROUTE_PARENT_DOES_NOT_EXIST_FOR_ROUTE_SECJOIN','en','The parent route does not exist for this route of "SEC-JOIN" type.','2014-07-29' + UNION ALL +SELECT 'LABEL','ID_GENERATE_BPMN_PROJECT','en','Generate BPMN Project','2014-07-24' + UNION ALL +SELECT 'LABEL','ID_PROCESS_DOES_NOT_EXIST','en','The process with {0}: {1} does not exist.','2014-07-24' + UNION ALL +SELECT 'LABEL','ID_PROJECT_IS_BPMN','en','The project with {0}: {1} is BPMN process.','2014-07-24' + UNION ALL +SELECT 'LABEL','ID_USE_LANGUAGE_URL','en','Use the language of URL','2014-08-08' + UNION ALL +SELECT 'LABEL','ID_SUMMARY_FORM_NO_PERMISSIONS','en','You do not have permission to have access to the summary form','2014-08-26' + UNION ALL +SELECT 'LABEL','ID_SUMMARY_FORM','en','Summary form','2014-08-21' + UNION ALL +SELECT 'LABEL','ID_LANGUAGE_CANT_DELETE_DEFAULT','en','You can''t delete the default language.','2014-08-21' + UNION ALL +SELECT 'LABEL','ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT','en','The format is incorrect, check the following examples: *.* *.png *.pdf, *.doc, *.xls','2014-08-25' + UNION ALL +SELECT 'LABEL','ID_UPLOAD_ERR_NOT_ALLOWED_EXTENSION','en','The file has not been attached because the extension is not allowed or because it doesn''t correspond to the content of it.','2014-08-25' + UNION ALL +SELECT 'LABEL','ID_INPUT_DOC_TYPE_FILE_REQUIRED','en','You must specify the allowed file extensions, use *.* to allow any extension.','2014-08-25' + UNION ALL +SELECT 'LABEL','ID_TINY_SYSTEM_VARIABLE','en','System Variable','2014-08-27' + UNION ALL +SELECT 'LABEL','ID_CHOOSE_PROVIDER','en','Please select provider','2014-08-27' + UNION ALL +SELECT 'LABEL','ID_INDEX','en','Index','2014-08-27' + UNION ALL +SELECT 'LABEL','ID_ERROR_JS_NOT_AVAILABLE','en','Your browser does not support javascript or it is disabled, please use a different browser or activate the javascript. Forms won''t work totally because javascript is used.','2014-08-29' ; INSERT INTO ISO_LOCATION ([IC_UID],[IL_UID],[IL_NAME],[IL_NORMAL_NAME],[IS_UID]) diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index a8c22f11e..c30e9d211 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -20,148 +20,148 @@ INSERT INTO CONTENT (CON_CATEGORY,CON_PARENT,CON_ID,CON_LANG,CON_VALUE) VALUES ('PER_NAME','','00000000000000000000000000000007','en','Reassign case'), ('PER_NAME','','00000000000000000000000000000006','en','All cases'), ('PER_NAME','','00000000000000000000000000000005','en','Create cases'), -('PER_NAME','','00000000000000000000000000000004','en','Factory'), +('PER_NAME','','00000000000000000000000000000004','en','Design processes'), ('PER_NAME','','00000000000000000000000000000003','en','Users'), ('PER_NAME','','00000000000000000000000000000001','en','Login'), ('PER_NAME','','00000000000000000000000000000002','en','Setup'); -INSERT INTO LANGUAGE (LAN_ID,LAN_NAME,LAN_NATIVE_NAME,LAN_DIRECTION,LAN_WEIGHT,LAN_ENABLED,LAN_CALENDAR) VALUES -('aa','Afar','','L','0','0','GREGORIAN'), -('ab','Abkhazian','','L','1','0','GREGORIAN'), -('af','Afrikaans','','L','2','0','GREGORIAN'), -('am','Amharic','','L','3','0','GREGORIAN'), -('ar','Arabic','','L','4','0','GREGORIAN'), -('as','Assamese','','L','5','0','GREGORIAN'), -('ay','Aymara','','L','6','0','GREGORIAN'), -('az','Azerbaijani','','L','7','0','GREGORIAN'), -('ba','Bashkir','','L','8','0','GREGORIAN'), -('be','Byelorussian','','L','9','0','GREGORIAN'), -('bg','Bulgarian','','L','10','0','GREGORIAN'), -('bh','Bihari','','L','11','0','GREGORIAN'), -('bi','Bislama','','L','12','0','GREGORIAN'), -('bn','Bengali','','L','13','0','GREGORIAN'), -('bo','Tibetan','','L','14','0','GREGORIAN'), -('br','Breton','','L','15','0','GREGORIAN'), -('ca','Catalan','','L','16','0','GREGORIAN'), -('co','Corsican','','L','17','0','GREGORIAN'), -('cs','Czech','','L','18','0','GREGORIAN'), -('cy','Welsh','','L','19','0','GREGORIAN'), -('da','Danish','','L','20','0','GREGORIAN'), -('de','German','','L','21','0','GREGORIAN'), -('dz','Bhutani','','L','22','0','GREGORIAN'), -('el','Greek','','L','23','0','GREGORIAN'), -('en','English','','L','24','1','GREGORIAN'), -('eo','Esperanto','','L','25','0','GREGORIAN'), -('es','Spanish','','L','26','0','GREGORIAN'), -('et','Estonian','','L','27','0','GREGORIAN'), -('eu','Basque','','L','28','0','GREGORIAN'), -('fa','Persian','','R','29','0','PERSIAN'), -('fi','Finnish','','L','30','0','GREGORIAN'), -('fj','Fiji','','L','31','0','GREGORIAN'), -('fo','Faeroese','','L','32','0','GREGORIAN'), -('fr','French','','L','33','0','GREGORIAN'), -('fy','Frisian','','L','34','0','GREGORIAN'), -('ga','Irish','','L','35','0','GREGORIAN'), -('gd','Gaelic','','L','36','0','GREGORIAN'), -('gl','Galician','','L','37','0','GREGORIAN'), -('gn','Guarani','','L','38','0','GREGORIAN'), -('gu','Gujarati','','L','39','0','GREGORIAN'), -('ha','Hausa','','L','40','0','GREGORIAN'), -('hi','Hindi','','L','41','0','GREGORIAN'), -('hr','Croatian','','L','42','0','GREGORIAN'), -('hu','Hungarian','','L','43','0','GREGORIAN'), -('hy','Armenian','','L','44','0','GREGORIAN'), -('ia','Interlingua','','L','45','0','GREGORIAN'), -('ie','Interlingue','','L','46','0','GREGORIAN'), -('ik','Inupiak','','L','47','0','GREGORIAN'), -('in','Indonesian','','L','48','0','GREGORIAN'), -('is','Icelandic','','L','49','0','GREGORIAN'), -('it','Italian','','L','50','0','GREGORIAN'), -('iw','Hebrew','','R','51','0','GREGORIAN'), -('ja','Japanese','','L','52','0','GREGORIAN'), -('ji','Yiddish','','L','53','0','GREGORIAN'), -('jw','Javanese','','L','54','0','GREGORIAN'), -('ka','Georgian','','L','55','0','GREGORIAN'), -('kk','Kazakh','','L','56','0','GREGORIAN'), -('kl','Greenlandic','','L','57','0','GREGORIAN'), -('km','Cambodian','','L','58','0','GREGORIAN'), -('kn','Kannada','','L','59','0','GREGORIAN'), -('ko','Korean','','L','60','0','GREGORIAN'), -('ks','Kashmiri','','L','61','0','GREGORIAN'), -('ku','Kurdish','','L','62','0','GREGORIAN'), -('ky','Kirghiz','','L','63','0','GREGORIAN'), -('la','Latin','','L','64','0','GREGORIAN'), -('ln','Lingala','','L','65','0','GREGORIAN'), -('lo','Laothian','','L','66','0','GREGORIAN'), -('lt','Lithuanian','','L','67','0','GREGORIAN'), -('lv','Latvian','','L','68','0','GREGORIAN'), -('mg','Malagasy','','L','69','0','GREGORIAN'), -('mi','Maori','','L','70','0','GREGORIAN'), -('mk','Macedonian','','L','71','0','GREGORIAN'), -('ml','Malayalam','','L','72','0','GREGORIAN'), -('mn','Mongolian','','L','73','0','GREGORIAN'), -('mo','Moldavian','','L','74','0','GREGORIAN'), -('mr','Marathi','','L','75','0','GREGORIAN'), -('ms','Malay','','L','76','0','GREGORIAN'), -('mt','Maltese','','L','77','0','GREGORIAN'), -('my','Burmese','','L','78','0','GREGORIAN'), -('na','Nauru','','L','79','0','GREGORIAN'), -('ne','Nepali','','L','80','0','GREGORIAN'), -('nl','Dutch','','L','81','0','GREGORIAN'), -('no','Norwegian','','L','82','0','GREGORIAN'), -('oc','Occitan','','L','83','0','GREGORIAN'), -('om','Oromo','','L','84','0','GREGORIAN'), -('or','Oriya','','L','85','0','GREGORIAN'), -('pa','Punjabi','','L','86','0','GREGORIAN'), -('pl','Polish','','L','87','0','GREGORIAN'), -('ps','Pashto','','L','88','0','GREGORIAN'), -('pt','Portuguese','','L','89','0','GREGORIAN'), -('qu','Quechua','','L','90','0','GREGORIAN'), -('rm','Rhaeto-Romance','','L','91','0','GREGORIAN'), -('rn','Kirundi','','L','92','0','GREGORIAN'), -('ro','Romanian','','L','93','0','GREGORIAN'), -('ru','Russian','','L','94','0','GREGORIAN'), -('rw','Kinyarwanda','','L','95','0','GREGORIAN'), -('sa','Sanskrit','','L','96','0','GREGORIAN'), -('sd','Sindhi','','L','97','0','GREGORIAN'), -('sg','Sangro','','L','98','0','GREGORIAN'), -('sh','Serbo-Croatian','','L','99','0','GREGORIAN'), -('si','Singhalese','','L','100','0','GREGORIAN'), -('sk','Slovak','','L','101','0','GREGORIAN'), -('sl','Slovenian','','L','102','0','GREGORIAN'), -('sm','Samoan','','L','103','0','GREGORIAN'), -('sn','Shona','','L','104','0','GREGORIAN'), -('so','Somali','','L','105','0','GREGORIAN'), -('sq','Albanian','','L','106','0','GREGORIAN'), -('sr','Serbian','','L','107','0','GREGORIAN'), -('ss','Siswati','','L','108','0','GREGORIAN'), -('st','Sesotho','','L','109','0','GREGORIAN'), -('su','Sudanese','','L','110','0','GREGORIAN'), -('sv','Swedish','','L','111','0','GREGORIAN'), -('sw','Swahili','','L','112','0','GREGORIAN'), -('ta','Tamil','','L','113','0','GREGORIAN'), -('te','Tegulu','','L','114','0','GREGORIAN'), -('tg','Tajik','','L','115','0','GREGORIAN'), -('th','Thai','','L','116','0','GREGORIAN'), -('ti','Tigrinya','','L','117','0','GREGORIAN'), -('tk','Turkmen','','L','118','0','GREGORIAN'), -('tl','Tagalog','','L','119','0','GREGORIAN'), -('tn','Setswana','','L','120','0','GREGORIAN'), -('to','Tonga','','L','121','0','GREGORIAN'), -('tr','Turkish','','L','122','0','GREGORIAN'), -('ts','Tsonga','','L','123','0','GREGORIAN'), -('tt','Tatar','','L','124','0','GREGORIAN'), -('tw','Twi','','L','125','0','GREGORIAN'), -('uk','Ukrainian','','L','126','0','GREGORIAN'), -('ur','Urdu','','L','127','0','GREGORIAN'), -('uz','Uzbek','','L','128','0','GREGORIAN'), -('vi','Vietnamese','','L','129','0','GREGORIAN'), -('vo','Volapuk','','L','130','0','GREGORIAN'), -('wo','Wolof','','L','131','0','GREGORIAN'), -('xh','Xhosa','','L','132','0','GREGORIAN'), -('yo','Yoruba','','L','133','0','GREGORIAN'), -('zh','Chinese','','L','134','0','GREGORIAN'), -('zu','Zulu','','L','135','0','GREGORIAN'); +INSERT INTO LANGUAGE (LAN_ID,LAN_LOCATION,LAN_NAME,LAN_NATIVE_NAME,LAN_DIRECTION,LAN_WEIGHT,LAN_ENABLED,LAN_CALENDAR) VALUES +('aa','','Afar','','L','0','0','GREGORIAN'), +('ab','','Abkhazian','','L','1','0','GREGORIAN'), +('af','','Afrikaans','','L','2','0','GREGORIAN'), +('am','','Amharic','','L','3','0','GREGORIAN'), +('ar','','Arabic','','L','4','0','GREGORIAN'), +('as','','Assamese','','L','5','0','GREGORIAN'), +('ay','','Aymara','','L','6','0','GREGORIAN'), +('az','','Azerbaijani','','L','7','0','GREGORIAN'), +('ba','','Bashkir','','L','8','0','GREGORIAN'), +('be','','Byelorussian','','L','9','0','GREGORIAN'), +('bg','BG','Bulgarian','','L','10','0','GREGORIAN'), +('bh','','Bihari','','L','11','0','GREGORIAN'), +('bi','','Bislama','','L','12','0','GREGORIAN'), +('bn','BD','Bengali','','L','13','0','GREGORIAN'), +('bo','','Tibetan','','L','14','0','GREGORIAN'), +('br','','Breton','','L','15','0','GREGORIAN'), +('ca','ES','Catalan','','L','16','0','GREGORIAN'), +('co','','Corsican','','L','17','0','GREGORIAN'), +('cs','CZ','Czech','','L','18','0','GREGORIAN'), +('cy','','Welsh','','L','19','0','GREGORIAN'), +('da','DK','Danish','','L','20','0','GREGORIAN'), +('de','DE','German','','L','21','0','GREGORIAN'), +('dz','','Bhutani','','L','22','0','GREGORIAN'), +('el','GR','Greek','','L','23','0','GREGORIAN'), +('en','US','English','','L','24','1','GREGORIAN'), +('eo','','Esperanto','','L','25','0','GREGORIAN'), +('es','ES','Spanish','','L','26','0','GREGORIAN'), +('et','EE','Estonian','','L','27','0','GREGORIAN'), +('eu','','Basque','','L','28','0','GREGORIAN'), +('fa','IR','Persian','','R','29','0','PERSIAN'), +('fi','FI','Finnish','','L','30','0','GREGORIAN'), +('fj','','Fiji','','L','31','0','GREGORIAN'), +('fo','FO','Faeroese','','L','32','0','GREGORIAN'), +('fr','FR','French','','L','33','0','GREGORIAN'), +('fy','','Frisian','','L','34','0','GREGORIAN'), +('ga','','Irish','','L','35','0','GREGORIAN'), +('gd','','Gaelic','','L','36','0','GREGORIAN'), +('gl','','Galician','','L','37','0','GREGORIAN'), +('gn','','Guarani','','L','38','0','GREGORIAN'), +('gu','','Gujarati','','L','39','0','GREGORIAN'), +('ha','','Hausa','','L','40','0','GREGORIAN'), +('hi','','Hindi','','L','41','0','GREGORIAN'), +('hr','HR','Croatian','','L','42','0','GREGORIAN'), +('hu','HU','Hungarian','','L','43','0','GREGORIAN'), +('hy','','Armenian','','L','44','0','GREGORIAN'), +('ia','','Interlingua','','L','45','0','GREGORIAN'), +('ie','','Interlingue','','L','46','0','GREGORIAN'), +('ik','','Inupiak','','L','47','0','GREGORIAN'), +('in','ID','Indonesian','','L','48','0','GREGORIAN'), +('is','IS','Icelandic','','L','49','0','GREGORIAN'), +('it','IT','Italian','','L','50','0','GREGORIAN'), +('iw','IL','Hebrew','','R','51','0','GREGORIAN'), +('ja','JP','Japanese','','L','52','0','GREGORIAN'), +('ji','','Yiddish','','L','53','0','GREGORIAN'), +('jw','','Javanese','','L','54','0','GREGORIAN'), +('ka','','Georgian','','L','55','0','GREGORIAN'), +('kk','','Kazakh','','L','56','0','GREGORIAN'), +('kl','','Greenlandic','','L','57','0','GREGORIAN'), +('km','','Cambodian','','L','58','0','GREGORIAN'), +('kn','','Kannada','','L','59','0','GREGORIAN'), +('ko','KR','Korean','','L','60','0','GREGORIAN'), +('ks','','Kashmiri','','L','61','0','GREGORIAN'), +('ku','','Kurdish','','L','62','0','GREGORIAN'), +('ky','','Kirghiz','','L','63','0','GREGORIAN'), +('la','','Latin','','L','64','0','GREGORIAN'), +('ln','','Lingala','','L','65','0','GREGORIAN'), +('lo','','Laothian','','L','66','0','GREGORIAN'), +('lt','LT','Lithuanian','','L','67','0','GREGORIAN'), +('lv','LV','Latvian','','L','68','0','GREGORIAN'), +('mg','','Malagasy','','L','69','0','GREGORIAN'), +('mi','','Maori','','L','70','0','GREGORIAN'), +('mk','','Macedonian','','L','71','0','GREGORIAN'), +('ml','','Malayalam','','L','72','0','GREGORIAN'), +('mn','','Mongolian','','L','73','0','GREGORIAN'), +('mo','','Moldavian','','L','74','0','GREGORIAN'), +('mr','','Marathi','','L','75','0','GREGORIAN'), +('ms','MY','Malay','','L','76','0','GREGORIAN'), +('mt','','Maltese','','L','77','0','GREGORIAN'), +('my','','Burmese','','L','78','0','GREGORIAN'), +('na','','Nauru','','L','79','0','GREGORIAN'), +('ne','','Nepali','','L','80','0','GREGORIAN'), +('nl','NL','Dutch','','L','81','0','GREGORIAN'), +('no','NO','Norwegian','','L','82','0','GREGORIAN'), +('oc','','Occitan','','L','83','0','GREGORIAN'), +('om','','Oromo','','L','84','0','GREGORIAN'), +('or','','Oriya','','L','85','0','GREGORIAN'), +('pa','','Punjabi','','L','86','0','GREGORIAN'), +('pl','PL','Polish','','L','87','0','GREGORIAN'), +('ps','','Pashto','','L','88','0','GREGORIAN'), +('pt','BR','Portuguese','','L','89','0','GREGORIAN'), +('qu','','Quechua','','L','90','0','GREGORIAN'), +('rm','','Rhaeto-Romance','','L','91','0','GREGORIAN'), +('rn','','Kirundi','','L','92','0','GREGORIAN'), +('ro','RO','Romanian','','L','93','0','GREGORIAN'), +('ru','RU','Russian','','L','94','0','GREGORIAN'), +('rw','','Kinyarwanda','','L','95','0','GREGORIAN'), +('sa','','Sanskrit','','L','96','0','GREGORIAN'), +('sd','','Sindhi','','L','97','0','GREGORIAN'), +('sg','','Sangro','','L','98','0','GREGORIAN'), +('sh','','Serbo-Croatian','','L','99','0','GREGORIAN'), +('si','','Singhalese','','L','100','0','GREGORIAN'), +('sk','SK','Slovak','','L','101','0','GREGORIAN'), +('sl','SI','Slovenian','','L','102','0','GREGORIAN'), +('sm','','Samoan','','L','103','0','GREGORIAN'), +('sn','','Shona','','L','104','0','GREGORIAN'), +('so','','Somali','','L','105','0','GREGORIAN'), +('sq','','Albanian','','L','106','0','GREGORIAN'), +('sr','YU','Serbian','','L','107','0','GREGORIAN'), +('ss','','Siswati','','L','108','0','GREGORIAN'), +('st','','Sesotho','','L','109','0','GREGORIAN'), +('su','','Sudanese','','L','110','0','GREGORIAN'), +('sv','SE','Swedish','','L','111','0','GREGORIAN'), +('sw','','Swahili','','L','112','0','GREGORIAN'), +('ta','LK','Tamil','','L','113','0','GREGORIAN'), +('te','','Tegulu','','L','114','0','GREGORIAN'), +('tg','','Tajik','','L','115','0','GREGORIAN'), +('th','TH','Thai','','L','116','0','GREGORIAN'), +('ti','','Tigrinya','','L','117','0','GREGORIAN'), +('tk','','Turkmen','','L','118','0','GREGORIAN'), +('tl','PH','Tagalog','','L','119','0','GREGORIAN'), +('tn','','Setswana','','L','120','0','GREGORIAN'), +('to','','Tonga','','L','121','0','GREGORIAN'), +('tr','TR','Turkish','','L','122','0','GREGORIAN'), +('ts','','Tsonga','','L','123','0','GREGORIAN'), +('tt','','Tatar','','L','124','0','GREGORIAN'), +('tw','','Twi','','L','125','0','GREGORIAN'), +('uk','UA','Ukrainian','','L','126','0','GREGORIAN'), +('ur','','Urdu','','L','127','0','GREGORIAN'), +('uz','','Uzbek','','L','128','0','GREGORIAN'), +('vi','VN','Vietnamese','','L','129','0','GREGORIAN'), +('vo','','Volapuk','','L','130','0','GREGORIAN'), +('wo','','Wolof','','L','131','0','GREGORIAN'), +('xh','','Xhosa','','L','132','0','GREGORIAN'), +('yo','','Yoruba','','L','133','0','GREGORIAN'), +('zh','CN','Chinese','','L','134','0','GREGORIAN'), +('zu','','Zulu','','L','135','0','GREGORIAN'); INSERT INTO ISO_COUNTRY (IC_UID,IC_NAME,IC_SORT_ORDER) VALUES ('AD', 'Andorra',' ') , @@ -2246,7 +2246,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_PRO_TITLE','en','Process Title','2014-01-15') , ( 'LABEL','ID_DISPLAY_OF','en','of','2014-01-15') , ( 'LABEL','ID_DELETE_LANGUAGE_WARNING','en','To delete a language you should select a item from the list first.','2014-01-15') , -( 'LABEL','ID_DELETE_LANGUAGE_CONFIRM','en','Do you want remove the language "{0}" ?','2014-01-15') , +( 'LABEL','ID_DELETE_LANGUAGE_CONFIRM','en','Are you sure you want to delete the language "{0}"?','2014-07-15') , ( 'LABEL','ID_DELETE_LANGUAGE','en','Remove','2014-01-15') , ( 'LABEL','ID_LANGUAGE_DELETED_SUCCESSFULLY','en','Language deleted successfully!','2014-01-15') , ( 'LABEL','ID_LANGUAGE_CANT_DELETE','en','There is {0} cases started with this language, delete action canceled!','2014-01-15') , @@ -3542,7 +3542,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_PASSWORD_CURRENT','en','Current Password','2014-01-15') , ( 'LABEL','ID_PASSWORD_CURRENT_ENTER','en','Enter the current password','2014-01-15') , ( 'LABEL','ID_PASSWORD_CURRENT_INCORRECT','en','The current password is incorrect','2014-01-15') , -( 'LABEL','ID_MAX_LIFETIME','en','Maximum lifetime cleaned up (ms)','2014-01-15') , +( 'LABEL','ID_MAX_LIFETIME','en','Cookie lifetime (seconds)','2014-09-02') , ( 'LABEL','ID_SUCCESSFUL_CONNECTION','en','Successful connection','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_SUCCESS_INSTALLED','en','ProcessMaker was successfully installed
Workspace " {0} " was installed correctly.','2014-01-15') , ( 'LABEL','ID_CONNECTION_ERROR','en','Connection Error: {0}','2014-01-15') , @@ -3642,7 +3642,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_COPYRIGHT','en','Copyright © 2003-2011 Colosa, Inc. All rights reserved.','2014-01-15') , ( 'LABEL','ID_LOGIN_WITH_FACEBOOK','en','Login with Facebook!!','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP6','en','xxx','2014-01-15') , -( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5','en','ProcessMaker uses a workspaces to store data. Please select a valid workspace name and credentials to log in it.','2014-01-15') , +( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5','en','ProcessMaker uses workspaces to store data. Please enter a valid workspace name and credentials to login.','2014-09-02') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP4_2','en','If you are installing ProcessMaker on a remote web server, you will need to get this information from your Database Server.','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP4_1','en','ProcessMaker stores all of its data in a database. This screen gives the installation program the information needed to create this database.','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP3_2','en','If you see "unwriteable" you need to change the permissions on the file or directory to allow ProcessMaker to write to it.','2014-01-15') , @@ -3703,7 +3703,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_CONFIG_DIRECTORY','en','Config Directory','2014-01-15') , ( 'LABEL','ID_NOT_PASSED','en','Not Passed.','2014-01-15') , ( 'LABEL','ID_PREINSTALLATION','en','Pre-installation check','2014-01-15') , -( 'LABEL','ID_DIRECTORY_FILE_PERMISSION','en','Directory File Permission','2014-01-15') , +( 'LABEL','ID_DIRECTORY_FILE_PERMISSION','en','File Permisions','2014-09-02') , ( 'LABEL','ID_DATA_CORRECT','en','The data is correct.','2014-01-15') , ( 'LABEL','ID_EXIST','en','Exist','2014-01-15') , ( 'LABEL','ID_NO_EXIST','en','No exists','2014-01-15') , @@ -4178,7 +4178,26 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_PROCESS_VARIABLE_REQUIRED_VARIABLES_FOR_QUERY','en','The variable "{0}" required the variables "{1}" for the query.','2014-06-30') ; INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ) VALUES -( 'LABEL','ID_OUTPUT_DOCUMENT_ITS_ASSIGNED','en','The Output Document with {0}: {1} it''s assigned in "{2}".','2014-07-01') ; +( 'LABEL','ID_OUTPUT_DOCUMENT_ITS_ASSIGNED','en','The Output Document with {0}: {1} it''s assigned in "{2}".','2014-07-01') , +( 'LABEL','ID_EXISTS_FILES','en','The file exists.','2014-07-17') , +( 'LABEL','ID_FILENAME_REQUIRED','en','The filename is required.','2014-07-17') , +( 'LABEL','ID_VARIABLE_IN_USE','en','The variable with var_uid: {0} is being used by dynaform with dyn_uid: {1}','2014-08-01') , +( 'LABEL','ID_ROUTE_IS_SECJOIN','en','The route is of "SEC-JOIN" type.','2014-07-29') , +( 'LABEL','ID_ROUTE_PARENT_DOES_NOT_EXIST_FOR_ROUTE_SECJOIN','en','The parent route does not exist for this route of "SEC-JOIN" type.','2014-07-29') , +( 'LABEL','ID_GENERATE_BPMN_PROJECT','en','Generate BPMN Project','2014-07-24') , +( 'LABEL','ID_PROCESS_DOES_NOT_EXIST','en','The process with {0}: {1} does not exist.','2014-07-24') , +( 'LABEL','ID_PROJECT_IS_BPMN','en','The project with {0}: {1} is BPMN process.','2014-07-24') , +( 'LABEL','ID_USE_LANGUAGE_URL','en','Use the language of URL','2014-08-08') , +( 'LABEL','ID_SUMMARY_FORM_NO_PERMISSIONS','en','You do not have permission to have access to the summary form','2014-08-26') , +( 'LABEL','ID_SUMMARY_FORM','en','Summary form','2014-08-21') , +( 'LABEL','ID_LANGUAGE_CANT_DELETE_DEFAULT','en','You can''t delete the default language.','2014-08-21') , +( 'LABEL','ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT','en','The format is incorrect, check the following examples: *.* *.png *.pdf, *.doc, *.xls','2014-08-25') , +( 'LABEL','ID_UPLOAD_ERR_NOT_ALLOWED_EXTENSION','en','The file has not been attached because the extension is not allowed or because it doesn''t correspond to the content of it.','2014-08-25') , +( 'LABEL','ID_INPUT_DOC_TYPE_FILE_REQUIRED','en','You must specify the allowed file extensions, use *.* to allow any extension.','2014-08-25') , +( 'LABEL','ID_TINY_SYSTEM_VARIABLE','en','System Variable','2014-08-27') , +( 'LABEL','ID_CHOOSE_PROVIDER','en','Please select provider','2014-08-27') , +( 'LABEL','ID_INDEX','en','Index','2014-08-27') , +( 'LABEL','ID_ERROR_JS_NOT_AVAILABLE','en','Your browser does not support javascript or it is disabled, please use a different browser or activate the javascript. Forms won''t work totally because javascript is used.','2014-08-29') ; INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') , From c6d601cf6885330d35f8fe46e3f9c79f1ae41f31 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Tue, 2 Sep 2014 11:11:22 -0400 Subject: [PATCH 3/8] BUG 15670 Validate the Role Name from the web and Plugins Creation SOLVED - Missing validation when the rol name is empty - When the rol name is empty use the rol code --- rbac/engine/classes/model/Roles.php | 23 ++++++++++++++------ workflow/engine/methods/users/users_Ajax.php | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/rbac/engine/classes/model/Roles.php b/rbac/engine/classes/model/Roles.php index 81d8b251d..480179dbc 100755 --- a/rbac/engine/classes/model/Roles.php +++ b/rbac/engine/classes/model/Roles.php @@ -64,7 +64,7 @@ class Roles extends BaseRoles { $this->setNew(false); $this->getRolName(); - $aFields['ROL_NAME'] = $this->rol_name; + $aFields['ROL_NAME'] = ($this->rol_name != '' ? $this->rol_name: $this->getRolCode()); return $aFields; } else { @@ -83,11 +83,14 @@ class Roles extends BaseRoles { $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); $aRow = $oDataset->getRow(); - + $roles = new Roles(); $roles->load($aRow['ROL_UID']); $aRow['ROL_NAME'] = $roles->getRolName(); - + if ($aRow['ROL_NAME'] == '') { + $aRow['ROL_NAME'] = $roles->getRolCode(); + } + if (is_array($aRow)) { return $aRow; } else { @@ -159,16 +162,16 @@ class Roles extends BaseRoles { $oCriteria->add(RolesPeer::ROL_CREATE_DATE, '', Criteria::NOT_EQUAL); $oCriteria->add(RolesPeer::ROL_UPDATE_DATE, '', Criteria::NOT_EQUAL); $oCriteria->addJoin(RolesPeer::ROL_SYSTEM, SystemsPeer::SYS_UID); - + if ($filter != '') { $oCriteria->add(RolesPeer::ROL_CODE, '%'.$filter.'%', Criteria::LIKE); } - + $oCriteria->setOffset($start); $oCriteria->setLimit($limit); - + $result['LIST'] = $oCriteria; - + return $result; } @@ -183,6 +186,9 @@ class Roles extends BaseRoles { $o = new Roles(); $o->load($row['ROL_UID']); $row['ROL_NAME'] = $o->getRolName(); + if ($row['ROL_NAME'] == '') { + $row['ROL_NAME'] = $o->getRolCode(); + } $aRows[] = $row; } return $aRows; @@ -320,6 +326,9 @@ class Roles extends BaseRoles { if (is_array($row)) { $o = RolesPeer::retrieveByPK($row['ROL_UID']); $row['ROL_NAME'] = $o->getRolName(); + if ($row['ROL_NAME'] == '') { + $row['ROL_NAME'] = $o->getRolCode(); + } return $row; } else { return null; diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php index f175b2e78..85beae03c 100644 --- a/workflow/engine/methods/users/users_Ajax.php +++ b/workflow/engine/methods/users/users_Ajax.php @@ -456,7 +456,7 @@ try { } $row['USR_ROLE_ID'] = $row['USR_ROLE']; - $row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['USR_ROLE']) : $uRole['USR_ROLE']; + $row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['ROL_CODE']) : $uRole['ROL_CODE']; $row['DUE_DATE_OK'] = (date('Y-m-d') > date('Y-m-d', strtotime($row['USR_DUE_DATE']))) ? 0 : 1; $row['LAST_LOGIN'] = isset($aLogin[$row['USR_UID']]) ? $aLogin[$row['USR_UID']] : ''; From dfbe3a10ce93aadff426a5a141a4dbf2155c5d4e Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Tue, 2 Sep 2014 11:57:07 -0400 Subject: [PATCH 4/8] BUG-14448 Addition of images from the jQueryUI library. SOLVED. --- Rakefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Rakefile b/Rakefile index 123d679d1..b341c038c 100644 --- a/Rakefile +++ b/Rakefile @@ -226,6 +226,7 @@ def buildMafe(homeDir, targetDir, mode) puts "\nCopying files into: #{mafeDir}".bold copyFiles({ + "#{homeDir}/lib/jQueryUI/images/*.png" => "#{cssTargetDir}/images/", "#{homeDir}/build/js/designer.js" => "#{mafeDir}/designer.min.js", "#{homeDir}/build/js/mafe.js" => "#{mafeDir}/mafe.min.js", "#{homeDir}/build/css/mafe.css" => "#{mafeDir}/mafe.min.css", From 67ab2682bc0a2379b7a804ac5a21aad41d4d392e Mon Sep 17 00:00:00 2001 From: jennylee Date: Tue, 2 Sep 2014 16:45:44 -0400 Subject: [PATCH 5/8] BUG-15563 Scroll error en IE10 Iframes largos Standards Mode. Cuando se tiene IE10 con Document Mode 'Standards' la pagina aumenta su tamanio y la pagina no se muestra en su totalidad, no dejando ver la parte final de algunos listados, como el listado de New Case, Inbox, lis dynaforms largos, etc. El problema se daba por un bug con el navegador IE10 con el estilo overflow = hidden, problema solucionado con un hotfix para IE10. Se agrego una validacion en js para que cuando se detecte el Document Mode Standards y el borwser IE10 se setee el overflow-y = scroll, lo que soluciona el problema. --- workflow/engine/templates/cases/cases_Load.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/workflow/engine/templates/cases/cases_Load.php b/workflow/engine/templates/cases/cases_Load.php index b6cc8c499..77ba07ed3 100755 --- a/workflow/engine/templates/cases/cases_Load.php +++ b/workflow/engine/templates/cases/cases_Load.php @@ -18,9 +18,12 @@ document.documentElement.style.overflowY = 'hidden'; var oClientWinSize = getClientWindowSize(); - - + + if(document.compatMode == 'CSS1Compat' && document.documentMode == '10'){ + document.documentElement.style.overflowY = 'scroll'; + } + function autoResizeScreen() { oCasesFrame = document.getElementById('casesFrame'); height = getClientWindowSize().height-90; From 93f250daae88d28d0e0efb520ed7554d2ef30ef9 Mon Sep 17 00:00:00 2001 From: Wendy Nestor Date: Wed, 3 Sep 2014 11:51:34 -0400 Subject: [PATCH 6/8] Modificacion del feature database connections --- ...n_tests_database_connections_mysql.feature | 166 +++++++++++++++++ ...sts_database_connections_sqlserver.feature | 171 ++++++++++++++++++ features/bootstrap/RestContext.php | 60 ++++++ 3 files changed, 397 insertions(+) create mode 100644 features/backend/projects/database_connections/main_tests_database_connections_mysql.feature create mode 100644 features/backend/projects/database_connections/main_tests_database_connections_sqlserver.feature diff --git a/features/backend/projects/database_connections/main_tests_database_connections_mysql.feature b/features/backend/projects/database_connections/main_tests_database_connections_mysql.feature new file mode 100644 index 000000000..edef85ebf --- /dev/null +++ b/features/backend/projects/database_connections/main_tests_database_connections_mysql.feature @@ -0,0 +1,166 @@ +@ProcessMakerMichelangelo @RestAPI +Feature: DataBase Connections Main Tests MySQL + Requirements: + a workspace with the process 74737540052e1641ab88249082085472 ("Data Base Connenctions") already loaded + and workspace with the project 87648819953a85c0abc01d3080475981 ("testExecutionOfDerivationScreen") already loaded + there are zero Database Connections in the process + + Background: + Given that I have a valid access_token + + Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections + Given I request "project//database-connections" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the response has record + + Examples: + + | test_description | project | record | + | List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 0 | + | List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 0 | + + + Scenario Outline: Test database connection to test + Given POST this data: + """ + { + "dbs_type": "", + "dbs_server": "", + "dbs_database_name": "", + "dbs_username": "", + "dbs_password": "", + "dbs_port": , + "dbs_encode": "", + "dbs_description": "" + } + """ + And I request "project//database-connection/test" + Then if database-connection is active continue + Then the response status code should be 200 + And the response charset is "UTF-8" + And the content type is "application/json" + + Examples: + + | test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description | + | Test SQL Server db connection .pm | 1 | 74737540052e1641ab88249082085472 | microsoft sql server | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection | + | Test SQL Server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | microsoft sql server | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection | + + + Scenario Outline: Create a new database connection + Given POST this data: + """ + { + "dbs_type": "", + "dbs_server": "", + "dbs_database_name": "", + "dbs_username": "", + "dbs_password": "", + "dbs_port": , + "dbs_encode": "", + "dbs_description": "" + } + """ + And I request "project//database-connection" + Then the response status code should be 201 + And the response charset is "UTF-8" + And the content type is "application/json" + And the type is "object" + And store "dbs_uid" in session array as variable "dbs_uid_" + + Examples: + + | test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description | + | Create SQL Server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection | + | Create SQL Server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection | + + + Scenario Outline: Get the DataBase Connections List when there are exactly one DataBase Connections in each process + Given I request "project//database-connections" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the response has record + + Examples: + + | test_description | project | record | + | List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 1 | + | List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 1 | + + + + Scenario Outline: Update a database connection + Given PUT this data: + """ + { + "dbs_type": "", + "dbs_server": "", + "dbs_database_name": "", + "dbs_username": "", + "dbs_password": "", + "dbs_port": , + "dbs_encode": "", + "dbs_description": "" + } + """ + And that I want to update a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_" + And I request "project//database-connection" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the type is "object" + + Examples: + + | test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description | + | Update sql server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection | + | Update sql server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection | + + + Scenario Outline: Get a single database connection and check some properties + Given that I want to get a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_" + And I request "project//database-connection" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the type is "object" + And that "dbs_type" is set to "" + And that "dbs_server" is set to "" + And that "dbs_database_name" is set to "" + And that "dbs_username" is set to "" + And that "dbs_password" is set to "" + And that "dbs_port" is set to "" + And that "dbs_encode" is set to "" + And that "dbs_description" is set to "" + + Examples: + + | test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description | + | Update sql server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection | + | Update sql server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection | + + + Scenario Outline: Delete all Database Connection created previously in this script + Given that I want to delete a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_" + And I request "project//database-connection" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the type is "object" + + Examples: + + | project | dbs_uid_number | + | 74737540052e1641ab88249082085472 | 1 | + | 87648819953a85c0abc01d3080475981 | 2 | + + + Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections + Given I request "project//database-connections" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the response has record + + Examples: + + | test_description | project | record | + | List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 0 | + | List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 0 | \ No newline at end of file diff --git a/features/backend/projects/database_connections/main_tests_database_connections_sqlserver.feature b/features/backend/projects/database_connections/main_tests_database_connections_sqlserver.feature new file mode 100644 index 000000000..3aad843e3 --- /dev/null +++ b/features/backend/projects/database_connections/main_tests_database_connections_sqlserver.feature @@ -0,0 +1,171 @@ +@ProcessMakerMichelangelo @RestAPI +Feature: DataBase Connections Main Tests SQL Server + Requirements: + a workspace with the process 74737540052e1641ab88249082085472 ("Data Base Connenctions") already loaded + and workspace with the project 87648819953a85c0abc01d3080475981 ("testExecutionOfDerivationScreen") already loaded + there are zero Database Connections in the processes + + Background: + Given that I have a valid access_token + + Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections + Given I request "project//database-connections" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the response has record + + Examples: + + | test_description | project | record | + | List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 0 | + | List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 0 | + + + Scenario Outline: Test database connection to test + Given POST this data: + """ + { + "dbs_type": "", + "dbs_server": "", + "dbs_database_name": "", + "dbs_username": "", + "dbs_password": "", + "dbs_port": , + "dbs_encode": "", + "dbs_description": "" + } + """ + And I request "project//database-connection/test" + Then if database-connection with id "" is active + Then the response status code should be 200 + And the response charset is "UTF-8" + And the content type is "application/json" + + Examples: + + | test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description | + | Test SQL Server db connection .pm | 1 | 74737540052e1641ab88249082085472 | microsoft sql server | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection | + | Test SQL Server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | microsoft sql server | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection | + + + Scenario Outline: Create a new database connection + Given database-connection with id "" is active + And POST this data: + """ + { + "dbs_type": "", + "dbs_server": "", + "dbs_database_name": "", + "dbs_username": "", + "dbs_password": "", + "dbs_port": , + "dbs_encode": "", + "dbs_description": "" + } + """ + And I request "project//database-connection" + Then the response status code should be 201 + And the response charset is "UTF-8" + And the content type is "application/json" + And the type is "object" + And store "dbs_uid" in session array as variable "dbs_uid_" + + Examples: + + | test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description | + | Create SQL Server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection | + | Create SQL Server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection | + + + Scenario Outline: Get the DataBase Connections List when there are exactly one DataBase Connections in each process + Given database-connection with id "" is active + And I request "project//database-connections" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the response has record + + Examples: + + | test_description | project | record | dbs_uid_number | + | List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 1 | 1 | + | List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 1 | 2 | + + + Scenario Outline: Update a database connection + Given database-connection with id "" is active + And PUT this data: + """ + { + "dbs_type": "", + "dbs_server": "", + "dbs_database_name": "", + "dbs_username": "", + "dbs_password": "", + "dbs_port": , + "dbs_encode": "", + "dbs_description": "" + } + """ + And that I want to update a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_" + And I request "project//database-connection" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the type is "object" + + Examples: + + | test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description | + | Update sql server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection | + | Update sql server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection | + + + Scenario Outline: Get a single database connection and check some properties + Given database-connection with id "" is active + And that I want to get a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_" + And I request "project//database-connection" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the type is "object" + And that "dbs_type" is set to "" + And that "dbs_server" is set to "" + And that "dbs_database_name" is set to "" + And that "dbs_username" is set to "" + And that "dbs_password" is set to "" + And that "dbs_port" is set to "" + And that "dbs_encode" is set to "" + And that "dbs_description" is set to "" + + Examples: + + | test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description | + | Update sql server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection | + | Update sql server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection | + + + Scenario Outline: Delete all Database Connection created previously in this script + Given database-connection with id "" is active + And that I want to delete a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_" + And I request "project//database-connection" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the type is "object" + + Examples: + + | project | dbs_uid_number | + | 74737540052e1641ab88249082085472 | 1 | + | 87648819953a85c0abc01d3080475981 | 2 | + + + Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections + Given database-connection with id "" is active + And I request "project//database-connections" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the response has record + + Examples: + + | test_description | project | record | dbs_uid_number | + | List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 0 | 1 | + | List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 0 | 2 | \ No newline at end of file diff --git a/features/bootstrap/RestContext.php b/features/bootstrap/RestContext.php index 2306ada88..3afd0f99c 100644 --- a/features/bootstrap/RestContext.php +++ b/features/bootstrap/RestContext.php @@ -1769,4 +1769,64 @@ class RestContext extends BehatContext $fp = fopen(sys_get_temp_dir() . "/behat.log", "a+"); fwrite($fp, $string . PHP_EOL); } + /** + * @Then /^if database-connection with id "([^"]*)" is active$/ + */ + public function ifDatabaseConnectionWithIdIsActive($dbConnectionId) + { + if(!(isset($this->_response))){ + throw new \Exception('Empty result ' ); + } + $message=""; + $sw_error=false; + if($bodyResponse=json_decode($this->_response->getBody(true))){ + //print_r($bodyResponse); + foreach($bodyResponse as $testDetail){ + $message.=$testDetail->test; + if(isset($testDetail->error)){ + $sw_error=true; + $message .= " -> ".$testDetail->error; + }else{ + $message.=" -> [OK]"; + } + $message.=" | "; + } + + }else{ + throw new \Exception('Empty result ' ); + } + + if (file_exists("session.data")) { + $sessionData = json_decode(file_get_contents("session.data")); + } else { + $sessionData = new StdClass(); + } + if(!isset($sessionData->dbconnectionStatus)){ + $sessionData->dbconnectionStatus = new StdClass(); + } + $sessionData->dbconnectionStatus->$dbConnectionId = !$sw_error; + file_put_contents("session.data", json_encode($sessionData)); + if($sw_error){ + + throw new PendingException($message); + } + } + /** + * @Given /^database-connection with id "([^"]*)" is active$/ + */ + public function databaseConnectionWithIdIsActive($dbConnectionId) + { + if (file_exists("session.data")) { + $sessionData = json_decode(file_get_contents("session.data")); + } else { + $sessionData = new StdClass(); + } + + if(!$sessionData->dbconnectionStatus->$dbConnectionId){ + + + throw new PendingException("Skip inactive dbconnection: $dbConnectionId"); + } + } + } \ No newline at end of file From a6ac05059aaa5ff13a091b4cec4036fa768a8cfc Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Wed, 3 Sep 2014 13:41:00 -0400 Subject: [PATCH 7/8] BUG-14022 Cut frame with user experience mobile, switchable SOLVED - Style not allowed. - A validation was added for version ie 10-11 in file index.html --- gulliver/system/class.g.php | 4 ++-- workflow/engine/skinEngine/simplified/templates/index.html | 5 ++--- workflow/engine/templates/home/index.html | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index 60bb98839..b88654655 100755 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -4385,7 +4385,7 @@ class G } // Next get the name of the useragent yes seperately and for good reason - if (preg_match( '/MSIE/i', $u_agent ) && ! preg_match( '/Opera/i', $u_agent )) { + if ((preg_match('~Trident/7.0; rv:11.0~',$_SERVER["HTTP_USER_AGENT"]) || preg_match( '/MSIE/i', $u_agent )) && ! preg_match( '/Opera/i', $u_agent )) { $bname = 'Internet Explorer'; $ub = "MSIE"; } elseif (preg_match( '/Firefox/i', $u_agent )) { @@ -4419,7 +4419,7 @@ class G if (strripos( $u_agent, "Version" ) < strripos( $u_agent, $ub )) { $version = $matches['version'][0]; } else { - $version = $matches['version'][1]; + $version = isset($matches['version'][1]) ? $matches['version'][1] : ''; } } else { $version = $matches['version'][0]; diff --git a/workflow/engine/skinEngine/simplified/templates/index.html b/workflow/engine/skinEngine/simplified/templates/index.html index 8d663b5fe..6c548b895 100644 --- a/workflow/engine/skinEngine/simplified/templates/index.html +++ b/workflow/engine/skinEngine/simplified/templates/index.html @@ -31,13 +31,12 @@ var h = $(window).height() - 42; $('iframe').height(h); //IE V10-V11 - if (navigator.appVersion.indexOf("MSIE 1") != -1) { + if ((navigator.appVersion.indexOf("MSIE 1") != -1) || (!!(navigator.userAgent.match(/Trident/) && !navigator.userAgent.match(/MSIE/)))) { h = $('iframe').attr('style'); $('iframe').attr('style', h+' padding-top : 40px;'); } - } - + function redirect(url) { var $iframe = $('#iframex'); diff --git a/workflow/engine/templates/home/index.html b/workflow/engine/templates/home/index.html index 749c9c045..ac16e3a99 100644 --- a/workflow/engine/templates/home/index.html +++ b/workflow/engine/templates/home/index.html @@ -33,11 +33,10 @@ var h = $(window).height() - 42; $('iframe').height(h); //IE V10-V11 - if (navigator.appVersion.indexOf("MSIE 1") != -1) { + if ((navigator.appVersion.indexOf("MSIE 1") != -1) || (!!(navigator.userAgent.match(/Trident/) && !navigator.userAgent.match(/MSIE/)))) { h = $('iframe').attr('style'); $('iframe').attr('style', h+' padding-top : 40px;'); } - } function redirect(url) From 95331e198672f435a5237927c943b358090c5632 Mon Sep 17 00:00:00 2001 From: jennylee Date: Wed, 3 Sep 2014 14:51:45 -0400 Subject: [PATCH 8/8] BUG-15563 Scroll error en IE10 Iframes largos Standards Mode. Cuando se tiene IE10 con Document Mode 'Standards' la pagina aumenta su tamanio y la pagina no se muestra en su totalidad, no dejando ver la parte final de algunos listados, como el listado de New Case, Inbox, lis dynaforms largos, etc. El problema se daba por un bug con el navegador IE10 con el estilo overflow = hidden, problema solucionado con un hotfix para IE10. Se agrego 'px' para que el height sea tomado en px (pixeles) con eso se calcula bien el tamanio del iframe. --- workflow/engine/templates/cases/cases_Load.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/workflow/engine/templates/cases/cases_Load.php b/workflow/engine/templates/cases/cases_Load.php index 77ba07ed3..94f70a56f 100755 --- a/workflow/engine/templates/cases/cases_Load.php +++ b/workflow/engine/templates/cases/cases_Load.php @@ -20,17 +20,13 @@ var oClientWinSize = getClientWindowSize(); - if(document.compatMode == 'CSS1Compat' && document.documentMode == '10'){ - document.documentElement.style.overflowY = 'scroll'; - } - function autoResizeScreen() { oCasesFrame = document.getElementById('casesFrame'); height = getClientWindowSize().height-90; - oCasesFrame.style.height = height; + oCasesFrame.style.height = height + 'px';; oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame'); if(oCasesSubFrame){ - oCasesSubFrame.style.height = height-5; + oCasesSubFrame.style.height = (height-5) + 'px';; } else { setTimeout('autoResizeScreen()', 2000);