[BUGFIX] Invalid syntax for swapping arguments in sprintf() 51/38351/2
authorXavier Perseguers <xavier@typo3.org>
Mon, 30 Mar 2015 12:38:10 +0000 (14:38 +0200)
committerXavier Perseguers <xavier@typo3.org>
Mon, 30 Mar 2015 12:55:45 +0000 (14:55 +0200)
The position specifier must include a trailing $ to be effective.

Releases: master, 6.2
Resolves: #66148
Related: #66146
Change-Id: I84ea17882448f945752cb1a9b5817a850410a3bd
Reviewed-on: http://review.typo3.org/38348
Reviewed-by: Andreas Fernandez <andreas.fernandez@aspedia.de>
Tested-by: Andreas Fernandez <andreas.fernandez@aspedia.de>
Reviewed-by: Xavier Perseguers <xavier@typo3.org>
Tested-by: Xavier Perseguers <xavier@typo3.org>
Reviewed-on: http://review.typo3.org/38351

typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
typo3/sysext/extensionmanager/Resources/Private/Language/locallang.xlf
typo3/sysext/install/Resources/Private/Language/Report/locallang.xlf

index b37aec3..2542bb2 100644 (file)
@@ -422,7 +422,7 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $this->subject->enableLogging = TRUE;
                $this->subject->errorLog = array();
                $logDetails = $this->getUniqueId('details');
-               $this->subject->log('', 23, 0, 42, 1, '%1s' . $logDetails . '%2s', -1, array('foo', 'bar'));
+               $this->subject->log('', 23, 0, 42, 1, '%1$s' . $logDetails . '%2$s', -1, array('foo', 'bar'));
                $expected = 'foo' . $logDetails . 'bar';
                $this->assertStringEndsWith($expected, $this->subject->errorLog[0]);
        }
index 711e51b..7de8115 100644 (file)
                                <source>The following extensions are insecure and usage might damage your system. Please update these extensions as soon as possible or remove them from your system:&lt;br&gt;&lt;br&gt;%s</source>
                        </trans-unit>
                        <trans-unit id="report.status.loadedExtensions.insecureExtensionLoaded.message.extension" xml:space="preserve">
-                               <source>&lt;strong&gt;%1s&lt;/strong&gt; (version %2s)&lt;br&gt;</source>
+                               <source>&lt;strong&gt;%1$s&lt;/strong&gt; (version %2$s)&lt;br&gt;</source>
                        </trans-unit>
                        <trans-unit id="report.status.existingExtensions.title" xml:space="preserve">
                                <source>Security status of existing, but not loaded extensions</source>
                                <source>The following extensions were found on your system, but are currently not installed. Please delete the extensions using the extension manager:&lt;br&gt;&lt;br&gt;%s</source>
                        </trans-unit>
                        <trans-unit id="report.status.existingExtensions.insecureExtensionExists.message.extension" xml:space="preserve">
-                               <source>&lt;strong&gt;%1s&lt;/strong&gt; (version %2s)&lt;br&gt;</source>
+                               <source>&lt;strong&gt;%1$s&lt;/strong&gt; (version %2$s)&lt;br&gt;</source>
                        </trans-unit>
                        <trans-unit id="report.status.loadedOutdatedExtensions.title" xml:space="preserve">
                                <source>Outdated status of loaded extensions</source>
                                <source>The following extensions are outdated and may not be compatible with your installation. Please make sure these extensions are compatible and ask the extension author to publish updates:&lt;br&gt;&lt;br&gt;%s</source>
                        </trans-unit>
                        <trans-unit id="report.status.loadedOutdatedExtensions.outdatedExtensionLoaded.message.extension" xml:space="preserve">
-                               <source>&lt;strong&gt;%1s&lt;/strong&gt; (version %2s)&lt;br&gt;</source>
+                               <source>&lt;strong&gt;%1$s&lt;/strong&gt; (version %2$s)&lt;br&gt;</source>
                        </trans-unit>
                        <trans-unit id="report.status.existingOutdatedExtensions.title" xml:space="preserve">
                                <source>Outdated status of existing, but not loaded extensions</source>
                                <source>The following extensions were found on your system, but are currently not installed. Please make sure they are compatible with your system before installing them:&lt;br&gt;&lt;br&gt;%s</source>
                        </trans-unit>
                        <trans-unit id="report.status.existingOutdatedExtensions.outdatedExtensionExists.message.extension" xml:space="preserve">
-                               <source>&lt;strong&gt;%1s&lt;/strong&gt; (version %2s)&lt;br&gt;</source>
+                               <source>&lt;strong&gt;%1$s&lt;/strong&gt; (version %2$s)&lt;br&gt;</source>
                        </trans-unit>
                </body>
        </file>
index 539cd50..4510df1 100644 (file)
@@ -7,7 +7,7 @@
                                <source>System environment check</source>
                        </trans-unit>
                        <trans-unit id="environment.status.value" xml:space="preserve">
-                               <source>%1s Test(s)</source>
+                               <source>%1$s Test(s)</source>
                        </trans-unit>
                        <trans-unit id="environment.status.message.error" xml:space="preserve">
                                <source>The system environment check returned errors. Those errors will affect the functionality and stability of your TYPO3 CMS instance. Please check the install tool "System environment" for all details.</source>