7269[BUGFIX] locallangXMLOverride is broken since the switch to XLIFF
Commit message
Review
-
Code review CR +2
- Xavier Perseguers +2
- Dominique Feyer +1
-
Verified V +2
- Xavier Perseguers +2
- Dominique Feyer +1
Files 11
- t3lib/l10n/parser/class.t3lib_l10n_parser_llxml.php3+13 −3
- t3lib/l10n/class.t3lib_l10n_factory.php+5 −4
- t3lib/class.t3lib_div.php+8 −0
- tests/t3lib/l10n/parser/fixtures/fr.locallang.xlfnew+20 −0
- tests/t3lib/l10n/parser/fixtures/fr.locallang_override.xlfnew+16 −0
- tests/t3lib/l10n/parser/fixtures/locallang.xlfnew+17 −0
- tests/t3lib/l10n/parser/fixtures/locallang.xmlnew+20 −0
- tests/t3lib/l10n/parser/fixtures/locallang_override.xlfnew+14 −0
- tests/t3lib/l10n/parser/fixtures/locallang_override.xmlnew+18 −0
- tests/t3lib/l10n/parser/class.t3lib_l10n_parser_llxmlTest.phpnew+159 −0
- tests/t3lib/l10n/parser/class.t3lib_l10n_parser_xliffTest.phpnew+185 −0
Review log 23
-
Oliver Klee commented on patch set 1 12/21/11, 14:59
(1 inline comment) -
Xavier Perseguers commented on patch set 1 12/21/11, 14:59
(1 inline comment) -
Xavier Perseguers uploaded patch set 2 12/21/11, 14:59
-
Xavier Perseguers uploaded patch set 3 12/21/11, 14:59
-
Xavier Perseguers uploaded patch set 4 12/21/11, 14:59
-
Xavier Perseguers commented on patch set 4 12/21/11, 14:59
Fails OK, just a push in order for all of us to have the unit tests in place. It currently fails while overriding XLIFF -
Xavier Perseguers commented on patch set 5 12/21/11, 14:59
Verified; Looks good to me, but someone else must approve -
Xavier Perseguers uploaded patch set 5 12/21/11, 14:59
-
Xavier Perseguers commented on patch set 5 V 0 12/21/11, 14:59
by team member; Looks good to me, approved -
Georg Ringer commented on patch set 1 12/21/11, 14:59
Looks good to me, but someone else must approveclass.t3lib_l10n_parser_llxml.php:88you can do a strict comparison for count() too -
Steffen Ritter commented on patch set 2 12/21/11, 14:59
what about offering the possiblity to just put an "path" to the folder of the xliff file and then behave as normal with searching the correct language itself, if not found, use default. -
Dominique Feyer commented on patch set 2 12/21/11, 14:59
Verified; Looks good to me, but someone else must approve -
Dominique Feyer commented on patch set 2 12/21/11, 14:59
Currently XLIFF override work like this: Override default translation: $GLOBALS['TYPO3_CONF_VARS']['SYS']['locallangXMLOverride']['path/to/originalTranslationFile.xml'][] = 'path/to/otherTranslationFile.xlf' Override fr translation: $GLOBALS['TYPO3_CONF_VARS']['SYS']['locallangXMLOverride']['fr']['path/to/originalTranslationFile.xml'][] = 'path/to/fr.otherTranslationFile.xlf' But the current implementation has bugs with this, I push a patch asap to solve the issue in the next release -
Dominique Feyer commented on patch set 2 12/21/11, 14:59
This patch need more test, override with LLXML work fine, but we need to test XLIFF override. XLIFF can contain only 1 language per file, so we need to have multiple file, list locallang.xlf, fr.locallang.xlf, ... to override multiple language. -
Dominique Feyer commented on patch set 5 12/21/11, 14:59
Verified; Looks good to me, but someone else must approve Well done my friendly ghost -
Mr. Jenkins commented on patch set 1 12/21/11, 14:59
Build Successful https://ci.typo3.org/job/typo3-v4-core-gerrit/2754/ : SUCCESS -
Mr. Jenkins commented on patch set 2 12/21/11, 14:59
Build Successful https://ci.typo3.org/job/typo3-v4-core-gerrit/2761/ : SUCCESS -
Mr. Jenkins commented on patch set 3 12/21/11, 14:59
Build Successful https://ci.typo3.org/job/typo3-v4-core-gerrit/2843/ : SUCCESS -
Mr. Jenkins commented on patch set 4 12/21/11, 14:59
Build Successful https://ci.typo3.org/job/typo3-v4-core-gerrit/2844/ : SUCCESS -
Mr. Jenkins commented on patch set 5 12/21/11, 14:59
Build Successful https://ci.typo3.org/job/typo3-v4-core-gerrit/2845/ : SUCCESS -
Lars commented on patch set 1 12/21/11, 14:59
Fails; I would prefer that you didn't submit this This patch does not work well with default-translations, you must also intersect with $parsedDataTarget array. -
Lars commented on patch set 2 12/21/11, 14:59
Verified; Looks good to me, but someone else must approve This patch I've now successfully tested for several days, locallangXMLOverride-settings for LLXML files no works fine again. -
Xavier Perseguers merged patch set 5 12/21/11, 14:59