Commit dbbb042a by Scott

Add link to approval error messages

parent d225ef24
......@@ -58,7 +58,10 @@ function qa_wall_error_html($fromuserid, $touserid, $touserflags)
break;
case 'approve':
return qa_lang_html('profile/post_wall_must_be_approved');
return strtr(qa_lang_html('profile/post_wall_must_be_approved'), array(
'^1' => '<a href="' . qa_path_html('account') . '">',
'^2' => '</a>',
));
break;
case false:
......
......@@ -181,7 +181,7 @@ return array(
'unupvoteda_qs_in_x' => 'Questions without an upvoted answer in ^',
'unupvoteda_qs_title' => 'Recent questions without an upvoted answer',
'upload_limit' => 'Too many uploads - please try again in an hour',
'view_q_must_be_approved' => 'Your account must be approved to view question pages.',
'view_q_must_be_approved' => 'Your account must be approved to view question pages. Please wait or ^1add more information^2.',
'view_q_must_confirm' => 'Please ^5confirm your email address^6 to view question pages.',
'view_q_must_login' => 'Please ^1log in^2 or ^3register^4 to view question pages.',
'viewed_qs_in_x' => 'Most viewed questions in ^',
......
......@@ -66,7 +66,7 @@ return array(
'post_wall_button' => 'Add wall post',
'post_wall_empty' => 'Please enter something to post on this wall',
'post_wall_limit' => 'You cannot write more wall posts this hour',
'post_wall_must_be_approved' => 'Your account must be approved to post on this wall.',
'post_wall_must_be_approved' => 'Your account must be approved to post on this wall. Please wait or ^1add more information^2.',
'post_wall_must_confirm' => 'Please ^5confirm your email address^6 to post on this wall.',
'post_wall_must_login' => 'Please ^1log in^2 or ^3register^4 to post on this wall.',
'questions' => 'Questions:',
......
......@@ -36,7 +36,7 @@ return array(
'anon_name_label' => 'Your name to display (optional):',
'answer_button' => 'answer',
'answer_limit' => 'Too many answers received - please try again in an hour',
'answer_must_be_approved' => 'Your account must be approved before you answer a question.',
'answer_must_be_approved' => 'Your account must be approved before you answer a question. Please wait or ^1add more information^2.',
'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',
......@@ -48,7 +48,7 @@ return array(
'ask_follow_from_a' => 'Your question will be related to this answer:',
'ask_follow_title' => 'Ask a related question',
'ask_limit' => 'Too many questions received - please try again in an hour',
'ask_must_be_approved' => 'Your account must be approved before you ask a question.',
'ask_must_be_approved' => 'Your account must be approved before you ask a question. Please wait or ^1add more information^2.',
'ask_must_confirm' => 'Please ^5confirm your email address^6 to ask a question.',
'ask_must_login' => 'Please ^1log in^2 or ^3register^4 to ask a question.',
'ask_same_q' => 'Before proceeding, please check your question was not asked already:',
......@@ -81,7 +81,7 @@ return array(
'comment_a_popup' => 'Add a comment on this answer',
'comment_button' => 'comment',
'comment_limit' => 'Too many comments received - please try again in an hour',
'comment_must_be_approved' => 'Your account must be approved before you add a comment.',
'comment_must_be_approved' => 'Your account must be approved before you add a comment. Please wait or ^1add more information^2.',
'comment_must_confirm' => 'Please ^5confirm your email address^6 to add a comment.',
'comment_must_login' => 'Please ^1log in^2 or ^3register^4 to add a comment.',
'comment_on_a' => 'On answer: ',
......
......@@ -78,7 +78,10 @@ if ($permiterror) {
break;
case 'approve':
$qa_content['error'] = qa_lang_html('question/ask_must_be_approved');
$qa_content['error'] = strtr(qa_lang_html('question/ask_must_be_approved'), array(
'^1' => '<a href="' . qa_path_html('account') . '">',
'^2' => '</a>',
));
break;
default:
......
......@@ -57,7 +57,10 @@ if ($question['answerbutton']) {
break;
case 'approve':
$pageerror = qa_lang_html('question/answer_must_be_approved');
$pageerror = strtr(qa_lang_html('question/answer_must_be_approved'), array(
'^1' => '<a href="' . qa_path_html('account') . '">',
'^2' => '</a>',
));
break;
case 'limit':
......@@ -850,7 +853,10 @@ function qa_page_q_do_comment($question, $parent, $commentsfollows, $pagestart,
break;
case 'approve':
$error = qa_lang_html('question/comment_must_be_approved');
$error = strtr(qa_lang_html('question/comment_must_be_approved'), array(
'^1' => '<a href="' . qa_path_html('account') . '">',
'^2' => '</a>',
));
break;
case 'limit':
......
......@@ -894,7 +894,10 @@ function qa_page_q_add_a_form(&$qa_content, $formid, $captchareason, $question,
case 'approve':
$form = array(
'title' => qa_lang_html('question/answer_must_be_approved'),
'title' => strtr(qa_lang_html('question/answer_must_be_approved'), array(
'^1' => '<a href="' . qa_path_html('account') . '">',
'^2' => '</a>',
)),
);
break;
......@@ -1040,7 +1043,10 @@ function qa_page_q_add_c_form(&$qa_content, $question, $parent, $formid, $captch
case 'approve':
$form = array(
'title' => qa_lang_html('question/comment_must_be_approved'),
'title' => strtr(qa_lang_html('question/comment_must_be_approved'), array(
'^1' => '<a href="' . qa_path_html('account') . '">',
'^2' => '</a>',
)),
);
break;
......
......@@ -140,7 +140,10 @@ if ($permiterror && (qa_is_human_probably() || !qa_opt('allow_view_q_bots'))) {
break;
case 'approve':
$qa_content['error'] = qa_lang_html('main/view_q_must_be_approved');
$qa_content['error'] = strtr(qa_lang_html('main/view_q_must_be_approved'), array(
'^1' => '<a href="' . qa_path_html('account') . '">',
'^2' => '</a>',
));
break;
default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment