BUG 5736 FixBug Msg text at save in Dynaform & adjustment in import/export.
This commit is contained in:
@@ -212,7 +212,7 @@ class Language extends BaseLanguage {
|
|||||||
$category,
|
$category,
|
||||||
$id,
|
$id,
|
||||||
$LOCALE,
|
$LOCALE,
|
||||||
trim(str_replace(chr(10), '', stripslashes($rowTranslation['msgstr'])))
|
trim(stripcslashes(str_replace(chr(10), '', $rowTranslation['msgstr'])))
|
||||||
);
|
);
|
||||||
if( $result['codError'] == 0 ) {
|
if( $result['codError'] == 0 ) {
|
||||||
$countItemsSuccess++;
|
$countItemsSuccess++;
|
||||||
@@ -247,7 +247,7 @@ class Language extends BaseLanguage {
|
|||||||
$codes = explode('-', $reference);
|
$codes = explode('-', $reference);
|
||||||
|
|
||||||
if( sizeof($codes) == 2 ) { //is a normal node
|
if( sizeof($codes) == 2 ) { //is a normal node
|
||||||
$dynaform->addChilds($fieldName, Array($LOCALE=>stripslashes($rowTranslation['msgstr'])));
|
$dynaform->addChilds($fieldName, Array($LOCALE=>stripcslashes(str_replace(chr(10), '', $rowTranslation['msgstr']))));
|
||||||
} else if( sizeof($codes) > 2 ) { //is a node child for a language node
|
} else if( sizeof($codes) > 2 ) { //is a node child for a language node
|
||||||
$name = $match[3] == "''" ? '' : $match[3];
|
$name = $match[3] == "''" ? '' : $match[3];
|
||||||
$childNode = Array(
|
$childNode = Array(
|
||||||
@@ -420,7 +420,7 @@ class Language extends BaseLanguage {
|
|||||||
$poFile->addTranslatorComment($aRow1['TRN_CATEGORY'] . '/' . $aRow1['TRN_ID']);
|
$poFile->addTranslatorComment($aRow1['TRN_CATEGORY'] . '/' . $aRow1['TRN_ID']);
|
||||||
$poFile->addReference($aRow1['TRN_CATEGORY'] . '/' . $aRow1['TRN_ID']);
|
$poFile->addReference($aRow1['TRN_CATEGORY'] . '/' . $aRow1['TRN_ID']);
|
||||||
|
|
||||||
$poFile->addTranslation(stripslashes($msgid), stripslashes($msgstr));
|
$poFile->addTranslation(stripcslashes($msgid), stripcslashes($msgstr));
|
||||||
$aMsgids[$msgid] = true;
|
$aMsgids[$msgid] = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user