From 98e5f5339d80956c282e75b87f5145c0b52bd20f Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Mon, 3 Oct 2011 18:53:04 -0400 Subject: [PATCH] BUG 0000 updating base translations --- gulliver/thirdparty/phing/Phing.php | 8 +++--- .../translations/english/processmaker.en.po | 26 ++++++++++++++++--- workflow/engine/data/mssql/insert.sql | 8 +++++- workflow/engine/data/mysql/insert.sql | 7 +++-- 4 files changed, 39 insertions(+), 10 deletions(-) diff --git a/gulliver/thirdparty/phing/Phing.php b/gulliver/thirdparty/phing/Phing.php index e45e80dd3..dec14204c 100644 --- a/gulliver/thirdparty/phing/Phing.php +++ b/gulliver/thirdparty/phing/Phing.php @@ -860,9 +860,11 @@ class Phing { } } - $ret = include_once($path); - - if ($ret === false) { + + die($path); + if (!is_file($path)) { + + $ret = include_once($path); $e = new BuildException("Error importing $path"); if (self::getMsgOutputLevel() === PROJECT_MSG_DEBUG) { // We can't log this because listeners belong diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 3aadce806..8265ebb73 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -1,8 +1,8 @@ msgid "" msgstr "" -"Project-Id-Version: ProcessMaker (Branch 2.0) 2.0.33.rc4-3-gba32c01\n" +"Project-Id-Version: ProcessMaker (Branch 2.0) 2.0.33.rc5-5-gb79d80c\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2011-09-28 14:21:09\n" +"PO-Revision-Date: 2011-10-03 18:51:36\n" "Last-Translator: \n" "Language-Team: Colosa Developers Team \n" "MIME-Version: 1.0\n" @@ -11020,8 +11020,8 @@ msgstr "Export to CSV" # TRANSLATION # LABEL/ID_IMPORT_CSV #: LABEL/ID_IMPORT_CSV -msgid "Import to CSV" -msgstr "Import to CSV" +msgid "Import from CSV" +msgstr "Import from CSV" # TRANSLATION # LABEL/ID_NOT_PM_FILE @@ -11221,6 +11221,24 @@ msgstr "New Note" msgid "Cancel New Note" msgstr "Cancel New Note" +# TRANSLATION +# LABEL/ID_THERE_MUST__LEAST_HOLIDAY +#: LABEL/ID_THERE_MUST__LEAST_HOLIDAY +msgid "There must be at least a holiday" +msgstr "There must be at least a holiday" + +# TRANSLATION +# LABEL/ID_CASES_NOTES_CANCEL +#: LABEL/ID_CASES_NOTES_CANCEL +msgid "Cancel this note" +msgstr "Cancel this note" + +# TRANSLATION +# LABEL/ID_CASES_NOTES_ADD +#: LABEL/ID_CASES_NOTES_ADD +msgid "Add new note" +msgstr "Add new note" + # 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 40454a753..bca79029f 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -5087,7 +5087,7 @@ SELECT 'LABEL','ID_IMPORT_DATA_CSV','en','Import Data from CSV file','2011-09-05 UNION ALL SELECT 'LABEL','ID_EXPORT_CSV','en','Export to CSV','2011-09-05' UNION ALL -SELECT 'LABEL','ID_IMPORT_CSV','en','Import to CSV','2011-09-05' +SELECT 'LABEL','ID_IMPORT_CSV','en','Import from CSV','2011-09-29' UNION ALL SELECT 'LABEL','ID_NOT_PM_FILE','en','This is not a .pm file','2011-09-08' UNION ALL @@ -5156,6 +5156,12 @@ SELECT 'LABEL','ID_POSTED_AT','en','Posted at','2011-09-22' SELECT 'LABEL','ID_NEW_NOTE','en','New Note','2011-09-22' UNION ALL SELECT 'LABEL','ID_CANCEL_NEW_NOTE','en','Cancel New Note','2011-09-22' + UNION ALL +SELECT 'LABEL','ID_THERE_MUST__LEAST_HOLIDAY','en','There must be at least a holiday','2011-09-29' + UNION ALL +SELECT 'LABEL','ID_CASES_NOTES_CANCEL','en','Cancel this note','2011-10-03' + UNION ALL +SELECT 'LABEL','ID_CASES_NOTES_ADD','en','Add new note','2011-10-03' ; 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 c67387a8c..45e0fae02 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -3253,7 +3253,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_EXPORT_DATA_CSV','en','Export Data from CSV file','2011-09-05') , ( 'LABEL','ID_IMPORT_DATA_CSV','en','Import Data from CSV file','2011-09-05') , ( 'LABEL','ID_EXPORT_CSV','en','Export to CSV','2011-09-05') , -( 'LABEL','ID_IMPORT_CSV','en','Import to CSV','2011-09-05') , +( 'LABEL','ID_IMPORT_CSV','en','Import from CSV','2011-09-29') , ( 'LABEL','ID_NOT_PM_FILE','en','This is not a .pm file','2011-09-08') , ( 'LABEL','ID_PMTABLES_RESERVED_FIELDNAME_WARNING','en','The word {0} is reserved by the database engine please set another one.','2011-09-14') , ( 'LABEL','ID_TABLE_NAME_IS_REQUIRED','en','Table Name is required.','2011-09-14') , @@ -3288,7 +3288,10 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_CALENDAR_UPDATED_SUCCESSFULLY','en','Your calendar has been updated successfully','2011-09-20') , ( 'LABEL','ID_POSTED_AT','en','Posted at','2011-09-22') , ( 'LABEL','ID_NEW_NOTE','en','New Note','2011-09-22') , -( 'LABEL','ID_CANCEL_NEW_NOTE','en','Cancel New Note','2011-09-22') ; +( 'LABEL','ID_CANCEL_NEW_NOTE','en','Cancel New Note','2011-09-22') , +( 'LABEL','ID_THERE_MUST__LEAST_HOLIDAY','en','There must be at least a holiday','2011-09-29') , +( 'LABEL','ID_CASES_NOTES_CANCEL','en','Cancel this note','2011-10-03') , +( 'LABEL','ID_CASES_NOTES_ADD','en','Add new note','2011-10-03') ; INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') ,