[TASK] Move language in saltedpasswords 57/41557/3
authorMichael Oehlhof <typo3@oehlhof.de>
Fri, 17 Jul 2015 10:45:00 +0000 (12:45 +0200)
committerAndreas Wolf <andreas.wolf@typo3.org>
Fri, 17 Jul 2015 13:49:20 +0000 (15:49 +0200)
Moved language files in saltedpasswords to Resources/Private/Language

Resolves: #68273
Releases: master
Change-Id: I73eaa24224eb2bccbb6e53272b4a5dc64e30bdba
Reviewed-on: http://review.typo3.org/41557
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
typo3/sysext/saltedpasswords/Resources/Private/Language/locallang.xlf [new file with mode: 0644]
typo3/sysext/saltedpasswords/Resources/Private/Language/locallang_csh_saltedpasswords.xlf [new file with mode: 0644]
typo3/sysext/saltedpasswords/ext_localconf.php
typo3/sysext/saltedpasswords/ext_tables.php
typo3/sysext/saltedpasswords/locallang.xlf [deleted file]
typo3/sysext/saltedpasswords/locallang_csh_saltedpasswords.xlf [deleted file]

index e4259af..ea6c4a2 100644 (file)
@@ -64,7 +64,7 @@ class BulkUpdateFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldPro
                $fieldHtml = '<div class="checkbox"><label><input type="checkbox"' . ' name="' . $fieldName . '"' . ' id="' . $fieldId . '"' . ' value="' . $fieldValue . '"' . ($fieldChecked ? ' checked="checked"' : '') . '></label></div>';
                $additionalFields[$fieldId] = array(
                        'code' => $fieldHtml,
-                       'label' => 'LLL:EXT:saltedpasswords/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.label.canDeactivateSelf',
+                       'label' => 'LLL:EXT:saltedpasswords/Resources/Private/Language/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.label.canDeactivateSelf',
                        'cshKey' => '_txsaltedpasswords',
                        'cshLabel' => $fieldId
                );
@@ -75,7 +75,7 @@ class BulkUpdateFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldPro
                $fieldHtml = '<input type="text" class="form-control" name="' . $fieldName . '" id="' . $fieldId . '" value="' . htmlspecialchars($fieldValue) . '">';
                $additionalFields[$fieldId] = array(
                        'code' => $fieldHtml,
-                       'label' => 'LLL:EXT:saltedpasswords/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.label.numberOfRecords',
+                       'label' => 'LLL:EXT:saltedpasswords/Resources/Private/Language/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.label.numberOfRecords',
                        'cshKey' => '_txsaltedpasswords',
                        'cshLabel' => $fieldId
                );
@@ -95,7 +95,7 @@ class BulkUpdateFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldPro
                // If not, fail validation and issue error message
                if (!is_numeric($submittedData['scheduler_saltedpasswordsBulkUpdateNumberOfRecords']) || (int)$submittedData['scheduler_saltedpasswordsBulkUpdateNumberOfRecords'] < 0) {
                        $result = FALSE;
-                       $parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:saltedpasswords/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.invalidNumberOfRecords'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+                       $parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:saltedpasswords/Resources/Private/Language/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.invalidNumberOfRecords'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
                }
                return $result;
        }
index afa65c0..8102eae 100644 (file)
@@ -93,7 +93,7 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
         * @return string Additional information
         */
        public function getAdditionalInformation() {
-               $information = $GLOBALS['LANG']->sL('LLL:EXT:saltedpasswords/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.label.additionalinformation.deactivateself') . $this->getCanDeactivateSelf() . '; ' . $GLOBALS['LANG']->sL('LLL:EXT:saltedpasswords/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.label.additionalinformation.numberofrecords') . $this->getNumberOfRecords();
+               $information = $GLOBALS['LANG']->sL('LLL:EXT:saltedpasswords/Resources/Private/Language/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.label.additionalinformation.deactivateself') . $this->getCanDeactivateSelf() . '; ' . $GLOBALS['LANG']->sL('LLL:EXT:saltedpasswords/Resources/Private/Language/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.label.additionalinformation.numberofrecords') . $this->getNumberOfRecords();
                return $information;
        }
 
index 511ea0c..5e55924 100644 (file)
@@ -150,7 +150,7 @@ class ExtensionManagerConfigurationUtility {
                $extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['saltedpasswords']);
                $this->extConf['BE'] = array_merge((array)$extConf['BE.'], (array)$requestSetup['BE.']);
                $this->extConf['FE'] = array_merge((array)$extConf['FE.'], (array)$requestSetup['FE.']);
-               $GLOBALS['LANG']->includeLLFile('EXT:saltedpasswords/locallang.xlf');
+               $GLOBALS['LANG']->includeLLFile('EXT:saltedpasswords/Resources/Private/Language/locallang.xlf');
        }
 
        /**
diff --git a/typo3/sysext/saltedpasswords/Resources/Private/Language/locallang.xlf b/typo3/sysext/saltedpasswords/Resources/Private/Language/locallang.xlf
new file mode 100644 (file)
index 0000000..29bba10
--- /dev/null
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814981" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:37Z" product-name="saltedpasswords">
+               <header/>
+               <body>
+                       <trans-unit id="ext.saltedpasswords.title.tx_saltedpasswords_salts_phpass">
+                               <source>Portable PHP password hashing (phpass)</source>
+                       </trans-unit>
+                       <trans-unit id="ext.saltedpasswords.title.tx_saltedpasswords_salts_md5">
+                               <source>MD5 salted hashing (secure)</source>
+                       </trans-unit>
+                       <trans-unit id="ext.saltedpasswords.title.tx_saltedpasswords_salts_blowfish">
+                               <source>Blowfish salted hashing (advanced)</source>
+                       </trans-unit>
+                       <trans-unit id="ext.saltedpasswords.title.phpasssalt">
+                               <source>Portable PHP password hashing (phpass)</source>
+                       </trans-unit>
+                       <trans-unit id="ext.saltedpasswords.title.md5salt">
+                               <source>MD5 salted hashing (secure)</source>
+                       </trans-unit>
+                       <trans-unit id="ext.saltedpasswords.title.blowfishsalt">
+                               <source>Blowfish salted hashing (advanced)</source>
+                       </trans-unit>
+                       <trans-unit id="ext.saltedpasswords.tasks.bulkupdate.name">
+                               <source>Convert user passwords to salted hashes</source>
+                       </trans-unit>
+                       <trans-unit id="ext.saltedpasswords.tasks.bulkupdate.description">
+                               <source>Update all frontend and backend user passwords to salted hashes. This task deactivates itself when completed.</source>
+                       </trans-unit>
+                       <trans-unit id="ext.saltedpasswords.tasks.bulkupdate.label.numberOfRecords">
+                               <source>The number of records to process on each run</source>
+                       </trans-unit>
+                       <trans-unit id="ext.saltedpasswords.tasks.bulkupdate.invalidNumberOfRecords">
+                               <source>The number of records to process on each run must be greater than zero and numeric.</source>
+                       </trans-unit>
+                       <trans-unit id="ext.saltedpasswords.tasks.bulkupdate.label.canDeactivateSelf">
+                               <source>Deactivate if all records are converted</source>
+                       </trans-unit>
+                       <trans-unit id="ext.saltedpasswords.tasks.bulkupdate.label.additionalinformation.deactivateself">
+                               <source>Deactivate=</source>
+                       </trans-unit>
+                       <trans-unit id="ext.saltedpasswords.tasks.bulkupdate.label.additionalinformation.numberofrecords">
+                               <source>Number of records=</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
diff --git a/typo3/sysext/saltedpasswords/Resources/Private/Language/locallang_csh_saltedpasswords.xlf b/typo3/sysext/saltedpasswords/Resources/Private/Language/locallang_csh_saltedpasswords.xlf
new file mode 100644 (file)
index 0000000..8849b75
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814982" source-language="en" datatype="plaintext" original="messages" date="2012-02-22T00:00:00Z" product-name="saltedpasswords">
+               <header/>
+               <body>
+                       <trans-unit id="task_saltedpasswordsBulkUpdateNumberOfRecords.alttitle">
+                               <source>Number of records to process</source>
+                       </trans-unit>
+                       <trans-unit id="task_saltedpasswordsBulkUpdateNumberOfRecords.description">
+                               <source>Number of records to process for each run. If enabled for both FE &amp; BE, the value will be doubled.</source>
+                       </trans-unit>
+                       <trans-unit id="task_saltedpasswordsBulkUpdateNumberOfRecords.details" xml:space="preserve">
+                               <source>Converting a password to a salted hash takes some milliseconds (~100ms on an entry system in 2010).
+                                       If all users are updated in one run, the task might run a long time if a lot of users must be handled.
+                                       Therefore only a small number of frontend and backend users are processed.
+                                       If saltedpasswords is enabled for both FE &amp; BE, this value will be doubled.</source>
+                       </trans-unit>
+                       <trans-unit id="task_saltedpasswordsBulkUpdateCanDeactivateSelf.alttitle">
+                               <source>Deactivate this task</source>
+                       </trans-unit>
+                       <trans-unit id="task_saltedpasswordsBulkUpdateCanDeactivateSelf.description" xml:space="preserve">
+                               <source>Whether the task should deactivate itself after all records are processed.
+                                       Uncheck this if you are importing users from an external source and/or need to run this task periodically.</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
index 56227c0..dd160d1 100644 (file)
@@ -28,7 +28,7 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/saltedpasswords']['saltMethods']
 // Register bulk update task
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\TYPO3\CMS\Saltedpasswords\Task\BulkUpdateTask::class] = array(
        'extension' => 'saltedpasswords',
-       'title' => 'LLL:EXT:saltedpasswords/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.name',
-       'description' => 'LLL:EXT:saltedpasswords/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.description',
+       'title' => 'LLL:EXT:saltedpasswords/Resources/Private/Language/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.name',
+       'description' => 'LLL:EXT:saltedpasswords/Resources/Private/Language/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.description',
        'additionalFields' => \TYPO3\CMS\Saltedpasswords\Task\BulkUpdateFieldProvider::class
 );
index 1053de8..7391d56 100644 (file)
@@ -2,4 +2,4 @@
 defined('TYPO3_MODE') or die();
 
 // Add context sensitive help (csh) for scheduler task
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_txsaltedpasswords', 'EXT:saltedpasswords/locallang_csh_saltedpasswords.xlf');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_txsaltedpasswords', 'EXT:saltedpasswords/Resources/Private/Language/locallang_csh_saltedpasswords.xlf');
diff --git a/typo3/sysext/saltedpasswords/locallang.xlf b/typo3/sysext/saltedpasswords/locallang.xlf
deleted file mode 100644 (file)
index 29bba10..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814981" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:37Z" product-name="saltedpasswords">
-               <header/>
-               <body>
-                       <trans-unit id="ext.saltedpasswords.title.tx_saltedpasswords_salts_phpass">
-                               <source>Portable PHP password hashing (phpass)</source>
-                       </trans-unit>
-                       <trans-unit id="ext.saltedpasswords.title.tx_saltedpasswords_salts_md5">
-                               <source>MD5 salted hashing (secure)</source>
-                       </trans-unit>
-                       <trans-unit id="ext.saltedpasswords.title.tx_saltedpasswords_salts_blowfish">
-                               <source>Blowfish salted hashing (advanced)</source>
-                       </trans-unit>
-                       <trans-unit id="ext.saltedpasswords.title.phpasssalt">
-                               <source>Portable PHP password hashing (phpass)</source>
-                       </trans-unit>
-                       <trans-unit id="ext.saltedpasswords.title.md5salt">
-                               <source>MD5 salted hashing (secure)</source>
-                       </trans-unit>
-                       <trans-unit id="ext.saltedpasswords.title.blowfishsalt">
-                               <source>Blowfish salted hashing (advanced)</source>
-                       </trans-unit>
-                       <trans-unit id="ext.saltedpasswords.tasks.bulkupdate.name">
-                               <source>Convert user passwords to salted hashes</source>
-                       </trans-unit>
-                       <trans-unit id="ext.saltedpasswords.tasks.bulkupdate.description">
-                               <source>Update all frontend and backend user passwords to salted hashes. This task deactivates itself when completed.</source>
-                       </trans-unit>
-                       <trans-unit id="ext.saltedpasswords.tasks.bulkupdate.label.numberOfRecords">
-                               <source>The number of records to process on each run</source>
-                       </trans-unit>
-                       <trans-unit id="ext.saltedpasswords.tasks.bulkupdate.invalidNumberOfRecords">
-                               <source>The number of records to process on each run must be greater than zero and numeric.</source>
-                       </trans-unit>
-                       <trans-unit id="ext.saltedpasswords.tasks.bulkupdate.label.canDeactivateSelf">
-                               <source>Deactivate if all records are converted</source>
-                       </trans-unit>
-                       <trans-unit id="ext.saltedpasswords.tasks.bulkupdate.label.additionalinformation.deactivateself">
-                               <source>Deactivate=</source>
-                       </trans-unit>
-                       <trans-unit id="ext.saltedpasswords.tasks.bulkupdate.label.additionalinformation.numberofrecords">
-                               <source>Number of records=</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>
diff --git a/typo3/sysext/saltedpasswords/locallang_csh_saltedpasswords.xlf b/typo3/sysext/saltedpasswords/locallang_csh_saltedpasswords.xlf
deleted file mode 100644 (file)
index 8849b75..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814982" source-language="en" datatype="plaintext" original="messages" date="2012-02-22T00:00:00Z" product-name="saltedpasswords">
-               <header/>
-               <body>
-                       <trans-unit id="task_saltedpasswordsBulkUpdateNumberOfRecords.alttitle">
-                               <source>Number of records to process</source>
-                       </trans-unit>
-                       <trans-unit id="task_saltedpasswordsBulkUpdateNumberOfRecords.description">
-                               <source>Number of records to process for each run. If enabled for both FE &amp; BE, the value will be doubled.</source>
-                       </trans-unit>
-                       <trans-unit id="task_saltedpasswordsBulkUpdateNumberOfRecords.details" xml:space="preserve">
-                               <source>Converting a password to a salted hash takes some milliseconds (~100ms on an entry system in 2010).
-                                       If all users are updated in one run, the task might run a long time if a lot of users must be handled.
-                                       Therefore only a small number of frontend and backend users are processed.
-                                       If saltedpasswords is enabled for both FE &amp; BE, this value will be doubled.</source>
-                       </trans-unit>
-                       <trans-unit id="task_saltedpasswordsBulkUpdateCanDeactivateSelf.alttitle">
-                               <source>Deactivate this task</source>
-                       </trans-unit>
-                       <trans-unit id="task_saltedpasswordsBulkUpdateCanDeactivateSelf.description" xml:space="preserve">
-                               <source>Whether the task should deactivate itself after all records are processed.
-                                       Uncheck this if you are importing users from an external source and/or need to run this task periodically.</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>