BUG 6476 improvements to translation support
related tioo commit: 4a7047 Translations Supports was fixed and solve multiples bugs: 6137, 6474, 6476, 6513, 6560, 6597, 6599
This commit is contained in:
Erik Amaru Ortiz
@@ -23,259 +23,12 @@
|
||||
*
|
||||
*/
|
||||
|
||||
require_once "classes/model/Language.php";
|
||||
|
||||
require_once 'classes/model/IsoCountry.php';
|
||||
require_once 'classes/model/Language.php';
|
||||
require_once 'classes/model/Translation.php';
|
||||
|
||||
//G::LoadThirdParty('pear', 'Benchmark/Timer');
|
||||
G::LoadSystem('i18n_po');
|
||||
|
||||
//echo G::getMemoryUsage();
|
||||
//$timer = new Benchmark_Timer();
|
||||
//$timer->start();
|
||||
|
||||
G::LoadClass("system");
|
||||
|
||||
//creating the .po file
|
||||
if( ! isset($_GET['LOCALE']) )
|
||||
throw new Exception('Language Target ID was not set!');
|
||||
|
||||
$sPOFile = PATH_CORE . 'content' . PATH_SEP . 'translations' . PATH_SEP . MAIN_POFILE . '.' . $_GET['LOCALE'] . '.po';
|
||||
$poFile = new i18n_PO($sPOFile);
|
||||
$poFile->buildInit();
|
||||
|
||||
$language = new Language();
|
||||
$language->export();
|
||||
|
||||
$locale = $_GET['LOCALE'];
|
||||
$_TARGET_LANG = $_GET['LOCALE'];
|
||||
$_BASE_LANG = 'en';
|
||||
|
||||
if( strpos($locale, Translation::$localeSeparator) !== false ) {
|
||||
list($LAN_ID, $IC_UID) = explode(Translation::$localeSeparator, $_GET['LOCALE']);
|
||||
$iCountry = new IsoCountry();
|
||||
$iCountryRecord = $iCountry->findById($IC_UID);
|
||||
|
||||
if( ! isset($iCountryRecord['IC_UID']) )
|
||||
throw new Exception("Country Target ID '{$_GET['LAN_ID']}' doesn't exist!");
|
||||
|
||||
$sCountry = $iCountryRecord['IC_NAME'];
|
||||
} else {
|
||||
$LAN_ID = $locale;
|
||||
$sCountry = $IC_UID = '';
|
||||
}
|
||||
|
||||
$langRecord = $language->findById($LAN_ID);
|
||||
|
||||
if( ! isset($langRecord['LAN_NAME']) )
|
||||
throw new Exception("Language Target ID \"{$LAN_ID}\" doesn't exist!");
|
||||
|
||||
$sLanguage = $langRecord['LAN_NAME'];
|
||||
|
||||
//setting headers
|
||||
$poFile->addHeader('Project-Id-Version' , 'ProcessMaker ' . System::getVersion());
|
||||
$poFile->addHeader('POT-Creation-Date' , '');
|
||||
$poFile->addHeader('PO-Revision-Date' , date('Y-m-d H:i:s'));
|
||||
$poFile->addHeader('Last-Translator' , '');
|
||||
$poFile->addHeader('Language-Team' , 'Colosa Developers Team <developers@colosa.com>');
|
||||
$poFile->addHeader('MIME-Version' , '1.0');
|
||||
$poFile->addHeader('Content-Type' , 'text/plain; charset=utf-8');
|
||||
$poFile->addHeader('Content-Transfer_Encoding' , '8bit');
|
||||
$poFile->addHeader('X-Poedit-Language' , ucwords($sLanguage));
|
||||
$poFile->addHeader('X-Poedit-Country' , ucwords($sCountry));
|
||||
$poFile->addHeader('X-Poedit-SourceCharset' , 'utf-8');
|
||||
$poFile->addHeader('Content-Transfer-Encoding' , '8bit');
|
||||
|
||||
//$timer->setMarker('end making po headers');
|
||||
//export translation
|
||||
|
||||
$aLabels = array();
|
||||
$aMsgids = array();
|
||||
|
||||
// selecting of all translations records of base language 'en' in the PM TRANSLATIONS table
|
||||
$oCriteria = new Criteria('workflow');
|
||||
$oCriteria->addSelectColumn(TranslationPeer::TRN_CATEGORY);
|
||||
$oCriteria->addSelectColumn(TranslationPeer::TRN_ID);
|
||||
$oCriteria->addSelectColumn(TranslationPeer::TRN_VALUE);
|
||||
$oCriteria->add(TranslationPeer::TRN_LANG, 'en');
|
||||
$oDataset = TranslationPeer::doSelectRS($oCriteria);
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$oDataset->next();
|
||||
|
||||
while ($aRow1 = $oDataset->getRow()) {
|
||||
if( $LAN_ID != 'en' ){
|
||||
$oCriteria = new Criteria('workflow');
|
||||
$oCriteria->addSelectColumn(TranslationPeer::TRN_VALUE);
|
||||
$oCriteria->add(TranslationPeer::TRN_CATEGORY, $aRow1['TRN_CATEGORY']);
|
||||
$oCriteria->add(TranslationPeer::TRN_ID, $aRow1['TRN_ID']);
|
||||
$oCriteria->add(TranslationPeer::TRN_LANG, $_GET['LOCALE']);
|
||||
$oDataset2 = TranslationPeer::doSelectRS($oCriteria);
|
||||
$oDataset2->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$oDataset2->next();
|
||||
$aRow2 = $oDataset2->getRow();
|
||||
} else {
|
||||
$aRow2 = $aRow1;
|
||||
}
|
||||
$aRow1['TRN_CATEGORY'] = trim($aRow1['TRN_CATEGORY']);
|
||||
|
||||
# Validation
|
||||
# implemented to validate that the TRN_CATEGORY field into TRANSLALTION table is valid
|
||||
# By Erik A. Ortiz <erik@colosa.com> on Thu Feb 4, 2010
|
||||
preg_match("/^[0-9a-zA-Z_-]+/", $aRow1['TRN_CATEGORY'], $sTestResult);
|
||||
|
||||
if( $sTestResult[0] === $aRow1['TRN_CATEGORY']){ #the regular expr. evaluated ()$sTestResult) for $aRow1['TRN_CATEGORY'] must be the same
|
||||
$msgid = trim($aRow1['TRN_VALUE']);
|
||||
|
||||
if ( isset($aMsgids[$msgid]) )
|
||||
$msgid = '[' . $aRow1['TRN_CATEGORY'] . '/' . $aRow1['TRN_ID'] . '] ' . $msgid;
|
||||
|
||||
$poFile->addTranslatorComment('TRANSLATION');
|
||||
$poFile->addTranslatorComment($aRow1['TRN_CATEGORY'] . '/' . $aRow1['TRN_ID']);
|
||||
$poFile->addReference($aRow1['TRN_CATEGORY'] . '/' . $aRow1['TRN_ID']);
|
||||
|
||||
$msgstr = ($aRow2 && $aRow2['TRN_VALUE'] != '' ) ? $aRow2['TRN_VALUE'] : $aRow1['TRN_VALUE'];
|
||||
$poFile->addTranslation(stripslashes($msgid), stripslashes($msgstr));
|
||||
$aMsgids[$msgid] = true;
|
||||
} else { #Autocleaning, delete the inconsistant data
|
||||
$oTranslation = new Translation;
|
||||
$oTranslation->remove($aRow1['TRN_CATEGORY'], $aRow1['TRN_ID'], $_GET['LAN_ID']);
|
||||
}
|
||||
$oDataset->next();
|
||||
}
|
||||
|
||||
//$timer->setMarker('end making 1th .po from db');
|
||||
|
||||
//now find labels in xmlforms
|
||||
/************/
|
||||
$aExceptionFields = array('', 'javascript', 'hidden', 'phpvariable', 'private', 'toolbar', 'xmlmenu', 'toolbutton', 'cellmark', 'grid');
|
||||
|
||||
//find all xml files into PATH_XMLFORM
|
||||
$aXMLForms = glob(PATH_XMLFORM . '*/*.xml');
|
||||
//from a sublevel to
|
||||
$aXMLForms2 = glob(PATH_XMLFORM . '*/*/*.xml');
|
||||
$aXMLForms = array_merge($aXMLForms, $aXMLForms2);
|
||||
|
||||
$aEnglishLabel = array();
|
||||
$aOptions = array();
|
||||
$nodesNames = Array();
|
||||
|
||||
G::loadSystem('dynaformhandler');
|
||||
|
||||
foreach ($aXMLForms as $xmlFormPath) {
|
||||
$xmlFormFile = str_replace( chr(92), '/', $xmlFormPath);
|
||||
$xmlFormFile = str_replace( PATH_XMLFORM, '', $xmlFormPath);
|
||||
|
||||
$dynaForm = new dynaFormHandler($xmlFormPath);
|
||||
|
||||
$dynaNodes = $dynaForm->getFields();
|
||||
|
||||
//get all fields of each xmlform
|
||||
foreach ($dynaNodes as $oNode) {
|
||||
|
||||
$sNodeName = $oNode->nodeName;
|
||||
//$arrayNode = $dynaForm->getArray($oNode, Array('type', $_BASE_LANG, $_BASE_LANG));
|
||||
$arrayNode = $dynaForm->getArray($oNode);
|
||||
//if has not native language translation
|
||||
if( ! isset($arrayNode[$_BASE_LANG]) || ! isset($arrayNode['type']) || ( isset($arrayNode['type']) && in_array($arrayNode['type'], $aExceptionFields)) ){
|
||||
continue; //just continue with the next node
|
||||
}
|
||||
|
||||
// Getting the Base Origin Text
|
||||
if( ! is_array($arrayNode[$_BASE_LANG]) )
|
||||
$originNodeText = trim($arrayNode[$_BASE_LANG]);
|
||||
else {
|
||||
$langNode = $arrayNode[$_BASE_LANG][0];
|
||||
$originNodeText = $langNode['__nodeText__'];
|
||||
}
|
||||
|
||||
// Getting the Base Target Text
|
||||
if( isset($arrayNode[$_TARGET_LANG]) ) {
|
||||
if( ! is_array($arrayNode[$_TARGET_LANG]) )
|
||||
$targetNodeText = trim($arrayNode[$_TARGET_LANG]);
|
||||
else {
|
||||
$langNode = $arrayNode[$_TARGET_LANG][0];
|
||||
$targetNodeText = $langNode['__nodeText__'];
|
||||
}
|
||||
} else {
|
||||
$targetNodeText = $originNodeText;
|
||||
}
|
||||
|
||||
$nodeName = $arrayNode['__nodeName__'];
|
||||
$nodeType = $arrayNode['type'];
|
||||
|
||||
$msgid = $originNodeText;
|
||||
|
||||
// if the nodeName already exists in the po file, we need to create other msgid
|
||||
if( isset($aMsgids[$msgid]) )
|
||||
$msgid = '[' . $xmlFormFile . '?' . $nodeName . '] ' . $originNodeText;
|
||||
|
||||
$poFile->addTranslatorComment($xmlFormFile . '?' . $nodeName);
|
||||
$poFile->addTranslatorComment($xmlFormFile);
|
||||
$poFile->addReference($nodeType . ' - ' . $nodeName);
|
||||
$poFile->addTranslation(stripslashes($msgid), stripslashes($targetNodeText));
|
||||
|
||||
$aMsgids[$msgid] = true;
|
||||
|
||||
//if this node has options child nodes
|
||||
if( isset($arrayNode[$_BASE_LANG]) && isset($arrayNode[$_BASE_LANG][0]) && isset($arrayNode[$_BASE_LANG][0]['option']) ){
|
||||
|
||||
$originOptionNode = $arrayNode[$_BASE_LANG][0]['option']; //get the options
|
||||
|
||||
$targetOptionExists = false;
|
||||
if( isset($arrayNode[$_TARGET_LANG]) && isset($arrayNode[$_TARGET_LANG][0]) && isset($arrayNode[$_TARGET_LANG][0]['option']) ) {
|
||||
$targetOptionNode = $arrayNode[$_TARGET_LANG][0]['option'];
|
||||
$targetOptionExists = true;
|
||||
}
|
||||
|
||||
if ( ! is_array($originOptionNode) ){
|
||||
if( is_string($originOptionNode) ){
|
||||
$poFile->addTranslatorComment($xmlFormFile . '?' . $nodeName . '-'. $originOptionNode);
|
||||
$poFile->addTranslatorComment($xmlFormFile);
|
||||
$poFile->addReference($nodeType . ' - ' . $nodeName . ' - ' . $originOptionNode);
|
||||
$poFile->addTranslation(stripslashes($msgid), stripslashes($originOptionNode));
|
||||
}
|
||||
} else {
|
||||
foreach( $originOptionNode as $optionNode ) {
|
||||
$optionName = $optionNode['name'];
|
||||
$originOptionValue = $optionNode['__nodeText__'];
|
||||
|
||||
if( $targetOptionExists ){
|
||||
|
||||
$targetOptionValue = getMatchDropdownOptionValue($optionName, $targetOptionNode);
|
||||
if( $targetOptionValue === false ){
|
||||
$targetOptionValue = $originOptionValue;
|
||||
}
|
||||
} else {
|
||||
$targetOptionValue = $originOptionValue;
|
||||
}
|
||||
|
||||
$msgid = '[' . $xmlFormFile . '?' . $nodeName . '-' . $optionName . ']';
|
||||
$poFile->addTranslatorComment($xmlFormFile . '?' . $nodeName . '-'. $optionName);
|
||||
$poFile->addTranslatorComment($xmlFormFile);
|
||||
$poFile->addReference($nodeType . ' - ' . $nodeName . ' - ' . $optionName);
|
||||
$poFile->addTranslation($msgid, stripslashes($targetOptionValue));
|
||||
}
|
||||
}
|
||||
}
|
||||
} //end foreach
|
||||
|
||||
}
|
||||
|
||||
//
|
||||
//$timer->setMarker('end xml files processed');
|
||||
//$profiling = $timer->getProfiling();
|
||||
//$timer->stop(); $timer->display();
|
||||
//echo G::getMemoryUsage();
|
||||
//die;
|
||||
//g::pr($profiling);
|
||||
|
||||
G::streamFile($sPOFile, true);
|
||||
|
||||
function getMatchDropdownOptionValue($name, $options){
|
||||
foreach($options as $option){
|
||||
if($name == $option['name']){
|
||||
return $option['__nodeText__'];
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -22,6 +22,8 @@
|
||||
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
|
||||
*
|
||||
*/
|
||||
require_once "classes/model/Language.php";
|
||||
|
||||
global $RBAC;
|
||||
$access = $RBAC->userCanAccess('PM_SETUP_ADVANCE');
|
||||
|
||||
@@ -48,7 +50,6 @@ try {
|
||||
|
||||
$sMaxExecutionTime = ini_get('max_execution_time');
|
||||
ini_set('max_execution_time', '0');
|
||||
G::LoadClass('languages');
|
||||
G::LoadClass('configuration');
|
||||
|
||||
$languageFile = $_FILES['form']['tmp_name']['LANGUAGE_FILENAME'];
|
||||
@@ -66,12 +67,9 @@ try {
|
||||
fclose($handle);
|
||||
}
|
||||
|
||||
$languages = new languages();
|
||||
$language = new Language();
|
||||
$configuration = new Configurations;
|
||||
$importResults = $languages->importLanguage($languageFile);
|
||||
|
||||
//G::SendTemporalMessage('IMPORT_LANGUAGE_SUCCESS', 'info', 'labels');
|
||||
//G::header('location: languages');
|
||||
$importResults = $language->import($languageFile);
|
||||
|
||||
$result->msg = G::LoadTranslation('IMPORT_LANGUAGE_SUCCESS') . "\n";
|
||||
$result->msg .= "PO File num. records: " . $importResults->recordsCount . "\n";
|
||||
|
||||
Reference in New Issue
Block a user