Merge pull request #123 in ADI/active-directory-integration2 from rel…

…ease/ADI-586-nadi-2.1.1-release-vorbereitung to develop

* commit '1cace332d91a21eec054badb788970b392b7f946':
  ADI-586 * added translation for 'show log output' button * added inline todo for @dme to check
  ADI-586 * fixed missing translations for brute-force-protection
  updated Translations

classes/Adi/Configuration/Ui/Layout.php

@@ -217,14 +217,16 @@ private static function create()
 				// Group name
 				__('Brute-Force-Protection', 'next-active-directory-integration') => array(
 					// Group description
-					self::DESCRIPTION => __(
-                        'For security reasons you can use the following options to prevent brute force attacks on your user accounts. <br>' .
-					    '<div class="update-message notice inline notice-warning notice-alt">'.
-                        'We highly recommend you to use <a href="https://wordpress.org/plugins/better-wp-security/">iThemes Security</a> to secure your WordPress environment. <br>' .
-                        'NADI Brute Force Protection will not receive updates anymore after the NADI v2.0.13 release and we are planning on removing it completely later this year.' .
-                        '</div>',
+					self::DESCRIPTION => array(
+					    __(
+                            'For security reasons you can use the following options to prevent brute force attacks on your user accounts.',
+                            'next-active-directory-integration'
+                        ),
+                        // editing translations with loco-translate will not detect concatenated strings
+                        __(
+					    '<div class="update-message notice inline notice-warning notice-alt"> We highly recommend you to use <a href="https://wordpress.org/plugins/better-wp-security/">iThemes Security</a> to secure your WordPress environment. <br> NADI Brute Force Protection will not receive updates anymore after the NADI v2.0.13 release and we are planning on removing it completely later this year. </div>',
 						'next-active-directory-integration'
-					),
+					)),
 					// Group elements in group
 					self::OPTIONS     => array(
 						NextADInt_Adi_Configuration_Options::MAX_LOGIN_ATTEMPTS,

classes/Adi/Synchronization/Ui/SyncToActiveDirectoryPage.php

@@ -85,8 +85,9 @@ public function renderAdmin()
 			'userId' => __('User-ID: (optional)', 'next-active-directory-integration'),
 			'repeatAction' => __('Repeat WordPress to Active Directory synchronization', 'next-active-directory-integration'),
 			'startAction' => __('Start WordPress to Active Directory synchronization', 'next-active-directory-integration'),
-			'syncDisabled' => __('Check that a connection to a domain controller is established and \'Enable sync to AD\' is checked. Also, a service account has to be provided.', 'next-active-directory-integration')
-		);
+			'syncDisabled' => __('Check that a connection to a domain controller is established and \'Enable sync to AD\' is checked. Also, a service account has to be provided.', 'next-active-directory-integration'),
+            'showLogOutput' => __('Show log output', 'next-active-directory-integration')
+        );
 		$params['i18n'] = NextADInt_Core_Util_EscapeUtil::escapeHarmfulHtml($i18n);
 
 		// render

classes/Adi/Synchronization/Ui/SyncToWordPressPage.php

@@ -84,8 +84,9 @@ public function renderAdmin()
 			'descriptionLine2' => __('Settings like auth-code etc. depends on the current blog. So be careful which blog you are using. Here are some examples:', 'next-active-directory-integration'),
 			'repeatAction' => __('Repeat AD to WordPress synchronization', 'next-active-directory-integration'),
 			'startAction' => __('Start AD to WordPress synchronization', 'next-active-directory-integration'),
-			'syncDisabled' => __('Check that a connection to a domain controller is established and \'Enable sync to WordPress\' is checked. Also, a service account has to be provided.', 'next-active-directory-integration')
-		);
+			'syncDisabled' => __('Check that a connection to a domain controller is established and \'Enable sync to WordPress\' is checked. Also, a service account has to be provided.', 'next-active-directory-integration'),
+            'showLogOutput' => __('Show log output', 'next-active-directory-integration')
+        );
 		$params['i18n'] = NextADInt_Core_Util_EscapeUtil::escapeHarmfulHtml($i18n);
 
 		$this->display(self::TEMPLATE, $params);

classes/Adi/Ui/ConnectivityTestPage.php

@@ -96,6 +96,8 @@ public function renderAdmin()
 		$params['nonce'] = wp_create_nonce(self::NONCE); // add nonce for security
 		$params['message'] = $this->result;
 		$params['log'] = $this->log;
+
+		// TODO @dme duplicated code?
         $params['i18n'] = array(
             'title' => __('Test Active Directory authentication', 'next-active-directory-integration'),
             'descriptionLine1' => __('Please enter the username and password for the account you want to authenticate with. After submitting the request you will get the debug output.', 'next-active-directory-integration'),
@@ -104,7 +106,8 @@ public function renderAdmin()
             'username' => __('Username:', 'next-active-directory-integration'),
             'password' => __('Password (will be shown):', 'next-active-directory-integration'),
             'tryAgain' => __('Try to authenticate again', 'next-active-directory-integration'),
-            'tryAuthenticate' => __('Try to authenticate', 'next-active-directory-integration')
+            'tryAuthenticate' => __('Try to authenticate', 'next-active-directory-integration'),
+            'showLogOutput' => __('Show log output', 'next-active-directory-integration')
         );
 
 		$i18n = array(
@@ -115,7 +118,8 @@ public function renderAdmin()
             'username' => __('Username:', 'next-active-directory-integration'),
             'password' => __('Password (will be shown):', 'next-active-directory-integration'),
             'tryAgain' => __('Try to authenticate again', 'next-active-directory-integration'),
-            'tryAuthenticate' => __('Try to authenticate', 'next-active-directory-integration')
+            'tryAuthenticate' => __('Try to authenticate', 'next-active-directory-integration'),
+            'showLogOutput' => __('Show log output', 'next-active-directory-integration')
         );
 		$params['i18n'] = NextADInt_Core_Util_EscapeUtil::escapeHarmfulHtml($i18n);