[TASK] Move language files in rsaauth 72/41572/3
authorMichael Oehlhof <typo3@oehlhof.de>
Fri, 17 Jul 2015 14:33:23 +0000 (16:33 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Fri, 17 Jul 2015 14:48:18 +0000 (16:48 +0200)
Resolves: #68284
Releases: master
Change-Id: Ie825267fea2ce160d8f31a945019f760f8368bb0
Reviewed-on: http://review.typo3.org/41572
Reviewed-by: Andreas Wolf <andreas.wolf@typo3.org>
Tested-by: Andreas Wolf <andreas.wolf@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/rsaauth/Classes/BackendWarnings.php
typo3/sysext/rsaauth/Resources/Private/Language/locallang.xlf [new file with mode: 0644]
typo3/sysext/rsaauth/Resources/Private/Language/locallang_em.xlf [new file with mode: 0644]
typo3/sysext/rsaauth/ext_conf_template.txt
typo3/sysext/rsaauth/hooks/locallang.xlf [deleted file]
typo3/sysext/rsaauth/locallang_em.xlf [deleted file]

index c1db8cf..17af81b 100644 (file)
@@ -31,25 +31,25 @@ class BackendWarnings {
                if ($backend instanceof \TYPO3\CMS\Rsaauth\Backend\CommandLineBackend) {
                        // Not using the PHP extension!
                        $lang = $this->getLanguageService();
-                       $warnings['rsaauth_cmdline'] = $lang->sL('LLL:EXT:rsaauth/hooks/locallang.xlf:hook_using_cmdline');
+                       $warnings['rsaauth_cmdline'] = $lang->sL('LLL:EXT:rsaauth/Resources/Private/Language/locallang.xlf:hook_using_cmdline');
                        // Check the path
                        $extconf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['rsaauth']);
                        $path = trim($extconf['temporaryDirectory']);
                        if ($path == '') {
                                // Path is empty
-                               $warnings['rsaauth'] = $lang->sL('LLL:EXT:rsaauth/hooks/locallang.xlf:hook_empty_directory');
+                               $warnings['rsaauth'] = $lang->sL('LLL:EXT:rsaauth/Resources/Private/Language/locallang.xlf:hook_empty_directory');
                        } elseif (!\TYPO3\CMS\Core\Utility\GeneralUtility::isAbsPath($path)) {
                                // Path is not absolute
-                               $warnings['rsaauth'] = $lang->sL('LLL:EXT:rsaauth/hooks/locallang.xlf:hook_directory_not_absolute');
+                               $warnings['rsaauth'] = $lang->sL('LLL:EXT:rsaauth/Resources/Private/Language/locallang.xlf:hook_directory_not_absolute');
                        } elseif (!@is_dir($path)) {
                                // Path does not represent a directory
-                               $warnings['rsaauth'] = $lang->sL('LLL:EXT:rsaauth/hooks/locallang.xlf:hook_directory_not_exist');
+                               $warnings['rsaauth'] = $lang->sL('LLL:EXT:rsaauth/Resources/Private/Language/locallang.xlf:hook_directory_not_exist');
                        } elseif (!@is_writable($path)) {
                                // Directory is not writable
-                               $warnings['rsaauth'] = $lang->sL('LLL:EXT:rsaauth/hooks/locallang.xlf:hook_directory_not_writable');
+                               $warnings['rsaauth'] = $lang->sL('LLL:EXT:rsaauth/Resources/Private/Language/locallang.xlf:hook_directory_not_writable');
                        } elseif (substr($path, 0, strlen(PATH_site)) == PATH_site) {
                                // Directory is inside the site root
-                               $warnings['rsaauth'] = $lang->sL('LLL:EXT:rsaauth/hooks/locallang.xlf:hook_directory_inside_siteroot');
+                               $warnings['rsaauth'] = $lang->sL('LLL:EXT:rsaauth/Resources/Private/Language/locallang.xlf:hook_directory_inside_siteroot');
                        }
                }
        }
diff --git a/typo3/sysext/rsaauth/Resources/Private/Language/locallang.xlf b/typo3/sysext/rsaauth/Resources/Private/Language/locallang.xlf
new file mode 100644 (file)
index 0000000..4b5d498
--- /dev/null
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814911" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:35Z" product-name="rsaauth">
+               <header/>
+               <body>
+                       <trans-unit id="hook_empty_directory">
+                               <source>RSA temporary directory is empty. This is a security risk. Please, go to the Extension Manager, select the "RSA authentication" extension and set the directory according to instructions there.</source>
+                       </trans-unit>
+                       <trans-unit id="hook_directory_not_absolute">
+                               <source>RSA temporary directory path is not absolute. This may cause RSA authentication errors and it is a security risk. Please, go to the Extension Manager, select the "RSA authentication" extension and set the directory according to instructions there.</source>
+                       </trans-unit>
+                       <trans-unit id="hook_directory_not_exist">
+                               <source>RSA temporary directory does not exist. This is a security risk because an insecure directory will be used for RSA operations. Please, go to the Extension Manager, select the "RSA authentication" extension and set the directory according to instructions there.</source>
+                       </trans-unit>
+                       <trans-unit id="hook_directory_not_writable">
+                               <source>RSA temporary directory is not writable. This may cause RSA authentication errors and it is a security risk. Please, go to the Extension Manager, select the "RSA authentication" extension and set the directory according to instructions there.</source>
+                       </trans-unit>
+                       <trans-unit id="hook_directory_inside_siteroot">
+                               <source>RSA temporary directory is inside the web site root directory. This is a security risk. Please, go to the Extension Manager, select the "RSA authentication" extension and set the directory according to instructions there.</source>
+                       </trans-unit>
+                       <trans-unit id="hook_using_cmdline">
+                               <source>RSA authentication could not detect the openssl PHP extension. Currently RSA authentication uses a command line openssl utility. This is slower and less secure. Please, consider installing openssl PHP extension.</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
diff --git a/typo3/sysext/rsaauth/Resources/Private/Language/locallang_em.xlf b/typo3/sysext/rsaauth/Resources/Private/Language/locallang_em.xlf
new file mode 100644 (file)
index 0000000..ab1ad25
--- /dev/null
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814912" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:32Z" product-name="rsaauth">
+               <header/>
+               <body>
+                       <trans-unit id="rsaauth.config.temporaryDirectory">
+                               <source>Path to the temporary directory:This directory will contain temporary files for encryption/decrytion. It should be located outside of the web site root and it should not be /tmp. Directory permissions should be 0700 and the owner should be the web server user. If left empty, typo3conf/ will be used and it is INSECURE! Make sure that the directory is included into open_basedir if you use this setting.</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
index 3ea7161..b46c057 100644 (file)
@@ -1,2 +1,2 @@
-# cat=basic/enable; type=string; label=LLL:EXT:rsaauth/locallang_em.xlf:rsaauth.config.temporaryDirectory
+# cat=basic/enable; type=string; label=LLL:EXT:rsaauth/Resources/Private/Language/locallang_em.xlf:rsaauth.config.temporaryDirectory
 temporaryDirectory =
diff --git a/typo3/sysext/rsaauth/hooks/locallang.xlf b/typo3/sysext/rsaauth/hooks/locallang.xlf
deleted file mode 100644 (file)
index 4b5d498..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814911" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:35Z" product-name="rsaauth">
-               <header/>
-               <body>
-                       <trans-unit id="hook_empty_directory">
-                               <source>RSA temporary directory is empty. This is a security risk. Please, go to the Extension Manager, select the "RSA authentication" extension and set the directory according to instructions there.</source>
-                       </trans-unit>
-                       <trans-unit id="hook_directory_not_absolute">
-                               <source>RSA temporary directory path is not absolute. This may cause RSA authentication errors and it is a security risk. Please, go to the Extension Manager, select the "RSA authentication" extension and set the directory according to instructions there.</source>
-                       </trans-unit>
-                       <trans-unit id="hook_directory_not_exist">
-                               <source>RSA temporary directory does not exist. This is a security risk because an insecure directory will be used for RSA operations. Please, go to the Extension Manager, select the "RSA authentication" extension and set the directory according to instructions there.</source>
-                       </trans-unit>
-                       <trans-unit id="hook_directory_not_writable">
-                               <source>RSA temporary directory is not writable. This may cause RSA authentication errors and it is a security risk. Please, go to the Extension Manager, select the "RSA authentication" extension and set the directory according to instructions there.</source>
-                       </trans-unit>
-                       <trans-unit id="hook_directory_inside_siteroot">
-                               <source>RSA temporary directory is inside the web site root directory. This is a security risk. Please, go to the Extension Manager, select the "RSA authentication" extension and set the directory according to instructions there.</source>
-                       </trans-unit>
-                       <trans-unit id="hook_using_cmdline">
-                               <source>RSA authentication could not detect the openssl PHP extension. Currently RSA authentication uses a command line openssl utility. This is slower and less secure. Please, consider installing openssl PHP extension.</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>
diff --git a/typo3/sysext/rsaauth/locallang_em.xlf b/typo3/sysext/rsaauth/locallang_em.xlf
deleted file mode 100644 (file)
index ab1ad25..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814912" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:32Z" product-name="rsaauth">
-               <header/>
-               <body>
-                       <trans-unit id="rsaauth.config.temporaryDirectory">
-                               <source>Path to the temporary directory:This directory will contain temporary files for encryption/decrytion. It should be located outside of the web site root and it should not be /tmp. Directory permissions should be 0700 and the owner should be the web server user. If left empty, typo3conf/ will be used and it is INSECURE! Make sure that the directory is included into open_basedir if you use this setting.</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>