[BUGFIX] Streamline XLIFF identifiers for saltedpasswords 63/41963/2
authorDaniel Goerz <ervaude@gmail.com>
Sun, 26 Jul 2015 07:49:36 +0000 (09:49 +0200)
committerXavier Perseguers <xavier@typo3.org>
Sun, 26 Jul 2015 15:50:43 +0000 (17:50 +0200)
Change-Id: I53c39a7636c4662e63827d6184c616e3ebd75bce
Resolves: #68539
Releases: master
Reviewed-on: http://review.typo3.org/41963
Reviewed-by: Xavier Perseguers <xavier@typo3.org>
Tested-by: Xavier Perseguers <xavier@typo3.org>
typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
typo3/sysext/saltedpasswords/Resources/Private/Language/locallang.xlf

index df0a911..7641b75 100755 (executable)
@@ -212,7 +212,7 @@ class ExtensionManagerConfigurationUtility {
                                $this->setErrorLevel('warning');
                                $problems[] = $lang->getLL('ext.saltedpasswords.configuration.message.warningForceSalted') . '<br />
                                        <strong><i>' . $lang->getLL('ext.saltedpasswords.configuration.label.warning') . '</i></strong> ' .
-                                       $lang->getLL('ext.saltedpasswords.configuration.message.warningForceSaltedNote');
+                                       $lang->getLL('ext.saltedpasswords.configuration.message.warningForceSaltedNoteForBackend');
                        } else {
                                // Inform the user that things like openid won't work anymore
                                $this->setErrorLevel('info');
@@ -318,7 +318,7 @@ class ExtensionManagerConfigurationUtility {
                                        $this->setErrorLevel('warning');
                                        $problems[] = nl2br($lang->getLL('ext.saltedpasswords.configuration.message.infoForceSalted')) .
                                                '<strong><i>' . $lang->getLL('ext.saltedpasswords.configuration.label.important') .
-                                               '</i></strong> ' . $lang->getLL('ext.saltedpasswords.configuration.message.warningForceSaltedNote');
+                                               '</i></strong> ' . $lang->getLL('ext.saltedpasswords.configuration.message.warningForceSaltedNoteForFrontend');
                                } else {
                                        // Inform the user that things like openid won't work anymore
                                        $this->setErrorLevel('info');
index f6b53f0..db193ac 100644 (file)
@@ -97,7 +97,7 @@ Use the Install Tool to set the Security-Level for the backend to "normal" ($TYP
                        <trans-unit id="ext.saltedpasswords.configuration.label.warning">
                                <source>WARNING:</source>
                        </trans-unit>
-                       <trans-unit id="ext.saltedpasswords.configuration.message.warningForceSaltedNote">
+                       <trans-unit id="ext.saltedpasswords.configuration.message.warningForceSaltedNoteForBackend">
                                <source>This may lock you out of the backend!</source>
                        </trans-unit>
                        <trans-unit id="ext.saltedpasswords.configuration.message.infoOnlyBackendAuthService">
@@ -136,10 +136,7 @@ It is not possible to set "updatePasswd" and "forceSalted" at the same time. Ple
                        <trans-unit id="ext.saltedpasswords.configuration.message.warningRsaauthNotInstalledButConfigured">
                                <source>The "rsaauth" extension is not installed, but TYPO3 CMS is configured to use it. Either install the extension or adapt the configuration by setting [FE][loginSecurityLevel] to "normal" in the Install Tool.</source>
                        </trans-unit>
-                       <trans-unit id="ext.saltedpasswords.configuration.message.warningRsaauthNotInstalledButConfigured">
-                               <source>The "rsaauth" extension is not installed, but TYPO3 CMS is configured to use it. Either install the extension or adapt the configuration by setting [FE][loginSecurityLevel] to "normal" in the Install Tool.</source>
-                       </trans-unit>
-                       <trans-unit id="ext.saltedpasswords.configuration.message.warningForceSaltedNote">
+                       <trans-unit id="ext.saltedpasswords.configuration.message.warningForceSaltedNoteForFrontend">
                                <source>Because of this, it is not possible to login with users not having a salted password hash (e.g. existing frontend users).</source>
                        </trans-unit>
                        <trans-unit id="ext.saltedpasswords.configuration.message.infoOnlyFrontendAuthService">
@@ -153,4 +150,4 @@ It is not possible to set "updatePasswd" and "forceSalted" at the same time. Ple
                        </trans-unit>
                </body>
        </file>
-</xliff>
\ No newline at end of file
+</xliff>