Problem/Motivation

File translator is missing an option to encode xliff data with CDATA.

Proposed resolution

Add xliff_cdata check Xliff plugin for file translator.

CommentFileSizeAuthor
#10 support_cdata_in_file-2650106-10.patch5.83 KBmbovan
#7 support_cdata_in_file-2650106-7-interdiff.txt2.4 KBmbovan
#7 support_cdata_in_file-2650106-7.patch8.84 KBmbovan
#5 support_cdata_in_file-2650106-5-interdiff.txt1.04 KBmbovan
#5 support_cdata_in_file-2650106-5.patch8.44 KBmbovan
#4 support_cdata_in_file-2650106-4-interdiff.txt3.36 KBmbovan
#4 support_cdata_in_file-2650106-4.patch8.26 KBmbovan
#3 support_cdata_in_file-2650106-3-interdiff.txt7.21 KBmbovan
#3 support_cdata_in_file-2650106-3.patch7.22 KBmbovan
#2 support_cdata_in_file-2650106-2.patch679 bytesmbovan

Comments

mbovan created an issue. See original summary.

mbovan’s picture

mbovan commented
Status: Active » Needs review
StatusFileSize
new support_cdata_in_file-2650106-2.patch679 bytes

Fixed.

mbovan’s picture

mbovan commented
StatusFileSize
new support_cdata_in_file-2650106-3.patch7.22 KB
new support_cdata_in_file-2650106-3-interdiff.txt7.21 KB

Added "CDATA" option to File translator settings form. Provided tests...

mbovan’s picture

mbovan commented
StatusFileSize
new support_cdata_in_file-2650106-4.patch8.26 KB
new support_cdata_in_file-2650106-4-interdiff.txt3.36 KB

Improved tests.

mbovan’s picture

mbovan commented
StatusFileSize
new support_cdata_in_file-2650106-5.patch8.44 KB
new support_cdata_in_file-2650106-5-interdiff.txt1.04 KB

This should be fine. :)

berdir’s picture

berdir
Primary language German
Location Switzerland
commented
Status: Needs review » Needs work 
+++ b/translators/tmgmt_file/src/FileTranslatorUi.php
@@ -41,6 +41,21 @@ class FileTranslatorUi extends TranslatorPluginUiBase {
+
+    $form['xliff_message'] = array(
+      '#type' => 'container',
+      '#markup' => t('By selecting CDATA option, XLIFF processing will be ignored.'),
+      '#attributes' => array(
+        'class' => array('messages messages--warning'),
+      ),

This is actually not correct. For export, it's the other way round. We should be consistent and in that case, also check cdata first. And possibly move the cdata option first in the UI then.

mbovan’s picture

mbovan commented
Status: Needs work » Needs review
StatusFileSize
new support_cdata_in_file-2650106-7.patch8.84 KB
new support_cdata_in_file-2650106-7-interdiff.txt2.4 KB

Fixed export and moved CDATA before processing in UI.

  • Berdir committed 53c8007 on 8.x-1.x authored by mbovan 
    Issue #2650106 by mbovan: Support CDATA in File translator
berdir’s picture

berdir
Primary language German
Location Switzerland
commented
Version: 8.x-1.x-dev » 7.x-1.x-dev
Status: Needs review » Patch (to be ported)

Committed, now to the backport.

mbovan’s picture

mbovan commented
Status: Patch (to be ported) » Needs review
StatusFileSize
new support_cdata_in_file-2650106-10.patch5.83 KB

Ported to D7.

Status: Needs review » Needs work

The last submitted patch, 10: support_cdata_in_file-2650106-10.patch, failed testing.

mbovan’s picture

mbovan commented
Status: Needs work » Needs review

Failed in some unrelated test.

berdir’s picture

berdir
Primary language German
Location Switzerland
commented
Status: Needs review » Fixed

Thanks, committed.

  • Berdir committed 0a5e1f3 on 7.x-1.x authored by mbovan 
    Issue #2650106 by mbovan: Support CDATA in File translator

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.