Merge branch 'pupi1985-patch-25' into dev

qa-include/qa-lang-admin.php

@@ -37,6 +37,7 @@
 		'add_widget_button' => 'Add Widget',
 		'add_widget_link' => ' - ^1add widget^2',
 		'admin_title' => 'Administration center',
+		'approve_user_popup' => 'Approve user',
 		'after_footer' => 'After links in footer',
 		'after_main_menu' => 'After tabs at top',
 		'after_x_tab' => 'After "^" tab',
@@ -54,6 +55,7 @@
 		'blobs_to_disk_note' => '- migrate all uploaded images and documents from the database to disk files',
 		'block_button' => 'block',
 		'block_ips_note' => 'Use a hyphen for ranges or * to match any number. Examples: 192.168.0.4 , 192.168.0.0-192.168.0.31 , 192.168.0.*',
+		'block_user_popup' => 'Block user',
 		'block_words_note' => 'Use a * to match any letters. Examples: doh (will only match exact word doh) , doh* (will match doh or dohno) , do*h (will match doh, dooh, dough).',
 		'cancel_mailing_button' => 'Cancel Mailing',
 		'categories_introduction' => 'To get started with categories, click the \'Add Category\' button.',
@@ -277,4 +279,4 @@
 
 /*
 	Omit PHP closing tag to help avoid accidental output
-*/
\ No newline at end of file
+*/

qa-include/qa-lang-question.php

@@ -45,7 +45,10 @@
 		'answer_must_confirm' => 'Please ^5confirm your email address^6 to answer this question.',
 		'answer_must_login' => 'Please ^1log in^2 or ^3register^4 to answer this question.',
 		'answer_q_popup' => 'Answer this question',
+		'approve_a_popup' => 'Approve this answer',
 		'approve_button' => 'approve',
+		'approve_c_popup' => 'Approve this comment',
+		'approve_q_popup' => 'Approve this question',
 		'ask_button' => 'Ask the Question',
 		'ask_follow_from_a' => 'Your question will be related to this answer:',
 		'ask_follow_title' => 'Ask a related question',
@@ -139,12 +142,18 @@
 		'recat_button' => 'recategorize',
 		'recat_popup' => 'Change this question\'s category',
 		'recat_q_title' => 'Recategorize question',
+		'reject_a_popup' => 'Reject this answer',
 		'reject_button' => 'reject',
+		'reject_c_popup' => 'Reject this comment',
+		'reject_q_popup' => 'Reject this question',
 		'remove_q_favorites' => 'Remove this question from my favorites',
 		'reopen_button' => 'reopen',
 		'reply_button' => 'reply',
 		'reply_c_popup' => 'Reply to this comment',
+		'reshow_a_popup' => 'Reshow this answer',
 		'reshow_button' => 'reshow',
+		'reshow_c_popup' => 'Reshow this comment',
+		'reshow_q_popup' => 'Reshow this question',
 		'retag_button' => 'retag',
 		'retag_cat_popup' => 'Change this question\'s category or tags',
 		'retag_popup' => 'Change this question\'s tags',
@@ -168,4 +177,4 @@
 
 /*
 	Omit PHP closing tag to help avoid accidental output
-*/
\ No newline at end of file
+*/

qa-include/qa-page-admin-approve.php

@@ -114,11 +114,13 @@
 					'approve' => array(
 						'tags' => 'name="admin_'.$user['userid'].'_userapprove" onclick="return qa_admin_click(this);"',
 						'label' => qa_lang_html('question/approve_button'),
+						'popup' => qa_lang_html('admin/approve_user_popup'),
 					),
 
 					'block' => array(
 						'tags' => 'name="admin_'.$user['userid'].'_userblock" onclick="return qa_admin_click(this);"',
 						'label' => qa_lang_html('admin/block_button'),
+						'popup' => qa_lang_html('admin/block_user_popup'),
 					),
 				),
 			);
@@ -139,4 +141,4 @@
 
 /*
 	Omit PHP closing tag to help avoid accidental output
-*/
\ No newline at end of file
+*/

qa-include/qa-page-admin-hidden.php

@@ -132,16 +132,24 @@
 
 			$buttons=array();
 
+			$posttype = qa_strtolower(isset($question['obasetype']) ? $question['obasetype'] : $question['basetype']);
+
 			if (!qa_user_post_permit_error('permit_hide_show', $question))
+				// Possible values for the popup (enumerated to let text searches match in the future):
+				// question/reshow_q_popup, question/reshow_a_popup and question/reshow_c_popup
 				$buttons['reshow']=array(
 					'tags' => 'name="admin_'.qa_html($qhiddenpostid[$key]).'_reshow" onclick="return qa_admin_click(this);"',
 					'label' => qa_lang_html('question/reshow_button'),
+					'popup' => qa_lang_html(sprintf('question/reshow_%s_popup', $posttype)),
 				);
 
 			if ((!qa_user_post_permit_error('permit_delete_hidden', $question)) && !$dependcounts[$qhiddenpostid[$key]])
+				// Possible values for the popup (enumerated to let text searches match in the future):
+				// question/delete_q_popup, question/delete_a_popup and question/delete_c_popup
 				$buttons['delete']=array(
 					'tags' => 'name="admin_'.qa_html($qhiddenpostid[$key]).'_delete" onclick="return qa_admin_click(this);"',
 					'label' => qa_lang_html('question/delete_button'),
+					'popup' => qa_lang_html(sprintf('question/delete_%s_popup', $posttype)),
 				);
 
 			if (count($buttons))

qa-include/qa-page-admin-moderate.php

@@ -111,18 +111,26 @@
 			if (isset($htmlfields['what_url'])) // link directly to relevant content
 				$htmlfields['url']=$htmlfields['what_url'];
 
+			$posttype = qa_strtolower(isset($question['obasetype']) ? $question['obasetype'] : $question['basetype']);
+
 			$htmlfields['form']=array(
 				'style' => 'light',
 
 				'buttons' => array(
+					// Possible values for the popup (enumerated to let text searches match in the future):
+					// question/approve_q_popup, question/approve_a_popup and question/approve_c_popup
 					'approve' => array(
 						'tags' => 'name="admin_'.$postid.'_approve" onclick="return qa_admin_click(this);"',
 						'label' => qa_lang_html('question/approve_button'),
+						'popup' => qa_lang_html(sprintf('question/approve_%s_popup', $posttype)),
 					),
 
+					// Possible values for the popup (enumerated to let text searches match in the future):
+					// question/reject_q_popup, question/reject_a_popup and question/reject_c_popup
 					'reject' => array(
 						'tags' => 'name="admin_'.$postid.'_reject" onclick="return qa_admin_click(this);"',
 						'label' => qa_lang_html('question/reject_button'),
+						'popup' => qa_lang_html(sprintf('question/reject_%s_popup', $posttype)),
 					),
 				),
 			);

qa-include/qa-page-question-view.php

@@ -316,6 +316,7 @@
 				$buttons['reshow']=array(
 					'tags' => 'name="q_doreshow"'.$clicksuffix,
 					'label' => qa_lang_html('question/reshow_button'),
+					'popup' => qa_lang_html('question/reshow_q_popup'),
 				);
 
 			if ($question['deleteable'])
@@ -494,6 +495,7 @@
 				$buttons['reshow']=array(
 					'tags' => 'name="'.$prefix.'doreshow"'.$clicksuffix,
 					'label' => qa_lang_html('question/reshow_button'),
+					'popup' => qa_lang_html('question/reshow_a_popup'),
 				);
 
 			if ($answer['deleteable'])
@@ -615,6 +617,7 @@
 				$buttons['reshow']=array(
 					'tags' => 'name="'.$prefix.'doreshow"'.$clicksuffix,
 					'label' => qa_lang_html('question/reshow_button'),
+					'popup' => qa_lang_html('question/reshow_c_popup'),
 				);
 
 			if ($comment['deleteable'])