Merged in feature/FBI-2187 (pull request #6123)

FBI-2187

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>

workflow/engine/classes/model/Language.php

@@ -121,34 +121,31 @@ class Language extends BaseLanguage
         }
     }
 
-    /*
+    /**
      * Import a language file
      *
-     * @author Erik Amaru Ortiz <erik@colosa.com, aortiz.erik@gmail>
+     * @param string $languageFile
-     * @param string $sLanguageFile
+     * @param bool $updateXml
-     * @param string $bXml
+     * @param bool $updateDB
-     * @return void
+     * @param bool $generateMafe
+     * @return Object
+     * @throws Exception
      */
-    public function import ($sLanguageFile, $updateXml = true, $updateDB = true, $generateMafe = true)
+    public function import($languageFile, $updateXml = true, $updateDB = true, $generateMafe = true)
     {
         try {
-            
+            $translation = new Translation();
-            //get labels MichelangeloFE
             try {
-                $oTranslation = new Translation();
+                //We get all MichelangeloFE and PMDynaform translatable labels.
-                $MichelangeloFE = PATH_HOME . "../workflow/public_html/lib/js";
+                $labels = array_merge(self::getLabelsMafe(), self::getLabelsPMDynaform());
-                if (file_exists($MichelangeloFE)) {
-                    $labels = self::readLabelsDirectory($MichelangeloFE, true);
                 foreach ($labels as $label) {
-                        $oTranslation->addTranslation('LABEL', 'ID_MAFE_' . G::encryptOld($label), 'en', $label);
+                    $translation->addTranslation('LABEL', 'ID_MAFE_' . G::encryptOld($label), 'en', $label);
-                    }
                 }
             } catch (Exception $e) {
                 error_log($e->getMessage());
             }
 
-
+            $POFile = new i18n_PO($languageFile);
-            $POFile = new i18n_PO( $sLanguageFile );
             $POFile->readInit();
             $POHeaders = $POFile->getHeaders();
 
@@ -186,7 +183,6 @@ class Language extends BaseLanguage
                 $LOCALE = $languageID;
             }
 
-            $oTranslation = new Translation();
             $countItems = 0;
             $countItemsSuccess = 0;
             $errorMsg = '';
@@ -225,7 +221,7 @@ class Language extends BaseLanguage
                 if ($identifier == 'TRANSLATION') {
                     if ($updateDB) {
                         list ($category, $id) = explode('/', $context);
-                        $result = $oTranslation->addTranslation( $category, $id, $LOCALE, trim( stripcslashes( str_replace( chr( 10 ), '', $rowTranslation['msgstr'] ) ) ) );
+                        $result = $translation->addTranslation($category, $id, $LOCALE, trim(stripcslashes(str_replace(chr(10), '', $rowTranslation['msgstr']))));
                         if ($result['codError'] == 0) {
                             $countItemsSuccess++;
                         } else {
@@ -274,8 +270,8 @@ class Language extends BaseLanguage
                 }
             }
 
-            $oLanguage = new Language();
+            $language = new Language();
-            $oLanguage->update( array ('LAN_ID' => $languageID,'LAN_ENABLED' => '1'
+            $language->update(array('LAN_ID' => $languageID, 'LAN_ENABLED' => '1'
             ));
 
             if ($updateXml) {
@@ -300,23 +296,23 @@ class Language extends BaseLanguage
             G::auditLog("UploadLanguage", "Language: " . $languageID);
 
             return $results;
-        } catch (Exception $oError) {
+        } catch (Exception $error) {
-            throw ($oError);
+            throw ($error);
         }
     }
 
-    //export
+    /**
+     * Export language to Download
+     * @throws Exception
+     */
     public function export ()
     {
-        //get labels MichelangeloFE
+        $translation = new Translation();
         try {
-            $oTranslation = new Translation();
+            //We get all MichelangeloFE and PMDynaform translatable labels.
-            $MichelangeloFE = PATH_HOME . "../workflow/public_html/lib/js";
+            $labels = array_merge(self::getLabelsMafe(), self::getLabelsPMDynaform());
-            if (file_exists($MichelangeloFE)) {
-                $labels = self::readLabelsDirectory($MichelangeloFE, true);
             foreach ($labels as $label) {
-                    $oTranslation->addTranslation('LABEL', 'ID_MAFE_' . G::encryptOld($label), 'en', $label);
+                $translation->addTranslation('LABEL', 'ID_MAFE_' . G::encryptOld($label), 'en', $label);
-                }
             }
         } catch (Exception $e) {
             error_log($e->getMessage());
@@ -412,8 +408,7 @@ class Language extends BaseLanguage
 
             // IF the translations id "TRN_ID" has invalid characteres or has not accepted categories
             if ($sTestResult[0] !== $trnCategory || ($trnCategory != 'LABEL' && $trnCategory != 'JAVASCRIPT')) {
-                $oTranslation = new Translation();
+                $translation->remove( $aRow1['TRN_CATEGORY'], $aRow1['TRN_ID'], 'en' ); //remove not accepted translations
-                $oTranslation->remove( $aRow1['TRN_CATEGORY'], $aRow1['TRN_ID'], 'en' ); //remove not accepted translations
                 continue; //jump to next iteration
             }
 
@@ -561,6 +556,67 @@ class Language extends BaseLanguage
         G::auditLog("ExportLanguage", "Language: ".$_GET['LOCALE']);
         G::streamFile( $sPOFile, true );
     }
+
+    /**
+     * Get Labels MAFE (Michelangelo Project)
+     * @return array
+     */
+    public static function getLabelsMafe()
+    {
+        $labels = [];
+        $buildhash = PATH_HTML . "lib/buildhash";
+        if (!file_exists($buildhash)) {
+            throw new RuntimeException("Unable to generate labels for MAFE!.\nMissing file '{$buildhash}'.");
+        }
+        $buildhash = file_get_contents($buildhash);
+
+        $michelangeloFE = PATH_HTML . "lib/js";
+        $pathFileMafe = array_pop(glob($michelangeloFE . '/' . '*' . $buildhash . '*', GLOB_BRACE));
+        if (file_exists($pathFileMafe) && is_readable($pathFileMafe)) {
+            $labels = self::readLabelsDirectory($pathFileMafe, true);
+        }
+        return $labels;
+    }
+
+    /**
+     * Get Labels PMDynaform (PMDynaform Project)
+     * @return array
+     */
+    public static function getLabelsPMDynaform()
+    {
+        $labels = [];
+        $pathFilePMDynaform = PATH_HTML . "lib/pmdynaform/build/js/PMDynaform.js";
+        if (file_exists($pathFilePMDynaform) && is_readable($pathFilePMDynaform)) {
+            $labels = self::readLabelsDirectory($pathFilePMDynaform, true);
+        }
+        return $labels;
+    }
+
+    /**
+     * We read all labels
+     * @param $path
+     * @param bool $unique
+     * @return array
+     */
+    public static function readLabelsDirectory($path, $unique = false)
+    {
+        $labels = [];
+        if (is_file($path)) {
+            $info = pathinfo($path);
+            if (strtolower($info["extension"]) === "js") {
+                $file = file_get_contents($path);
+                //search string 'xx\'xx\'xx'.translate()
+                $labels = array_merge($labels, self::readLabelsFile($file, "'"));
+                //search string "xx\"xx\"xx".translate()
+                $labels = array_merge($labels, self::readLabelsFile($file, "\""));
+            }
+        }
+        if ($unique) {
+            $labels = array_unique($labels);
+        }
+        return $labels;
+    }
+
     public function updateLanguagePlugin ($plugin, $idLanguage)
     {
         if (!file_exists(PATH_PLUGINS . $plugin)) {
@@ -836,33 +892,6 @@ class Language extends BaseLanguage
         }
     }
 
-    public static function readLabelsDirectory($path, $unique = false)
-    {
-        $labels = array();
-        $items = opendir($path);
-        while (false !== ($item = readdir($items))) {
-            $a = $path . "/" . $item;
-            if ($item !== "." && $item !== ".." && is_dir($a)) {
-                $labels = array_merge($labels, self::readLabelsDirectory($a, false));
-            }
-            if (is_file($a)) {
-                $info = pathinfo($a);
-                if ($info["extension"] === "js" || $info["extension"] === "JS") {
-                    $file = file_get_contents($a);
-                    //search string 'xx\'xx\'xx'.translate()
-                    $labels = array_merge($labels, self::readLabelsFile($file, "'"));
-                    //search string "xx\"xx\"xx".translate()
-                    $labels = array_merge($labels, self::readLabelsFile($file, "\""));
-                }
-            }
-        }
-        if ($unique) {
-            $labels = array_unique($labels);
-        }
-        closedir($items);
-        return $labels;
-    }
-
     public static function readLabelsFile($file, $sep)
     {
         $labels = array();

workflow/engine/templates/cases/pmdynaform.html

@@ -12,6 +12,7 @@
         <link rel="stylesheet" href="/css/{sys_skin}-pm3.css">
         <link rel="stylesheet" href="/lib/pmdynaform/libs/font-awesome-4.6.3/css/font-awesome.min.css">
 
+        <script type="text/javascript" src="/translations/translationsMafe.js"></script>
         <script type="text/javascript" src="/lib/pmdynaform/libs/moment/moment.min.js"></script>
         <script type="text/javascript" src="/lib/pmdynaform/libs/jquery/jquery-1.11.js"></script>
         <script type="text/javascript" src="/lib/pmdynaform/libs/bootstrap-3.1.1/js/bootstrap.min.js"></script>