makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11672] Replace sprintf() usage with $user->lang().

Browse source 
PHPBB3-11672
This commit is contained in:
Cesar G 2013-10-17 20:14:14 -07:00
parent 0faafce4ce
commit c6473da412
4 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/functions_display.php
View file

@ -1168,9 +1168,10 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
{ {
$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start"); $redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start");
$message = $user->lang['ERR_UNWATCHING']; $message = $user->lang['ERR_UNWATCHING'];
if (!$request->is_ajax()) if (!$request->is_ajax())
{ {
$message .= '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>'); $message .= '<br /><br />' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
} }
trigger_error($message); trigger_error($message);
} }
@ -1182,9 +1183,10 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start"); $redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
$message = $user->lang['NOT_WATCHING_' . strtoupper($mode)]; $message = $user->lang['NOT_WATCHING_' . strtoupper($mode)];
if (!$request->is_ajax()) if (!$request->is_ajax())
{ {
$message .= '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>'); $message .= '<br /><br />' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
} }
meta_refresh(3, $redirect_url); meta_refresh(3, $redirect_url);
trigger_error($message); trigger_error($message);
@ -1240,9 +1242,10 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
{ {
$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start"); $redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
$message = $user->lang['ERR_WATCHING']; $message = $user->lang['ERR_WATCHING'];
if (!$request->is_ajax()) if (!$request->is_ajax())
{ {
$message .= '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>'); $message .= '<br /><br />' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
} }
trigger_error($message); trigger_error($message);
} }
@ -1255,9 +1258,10 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start"); $redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
$message = $user->lang['ARE_WATCHING_' . strtoupper($mode)]; $message = $user->lang['ARE_WATCHING_' . strtoupper($mode)];
if (!$request->is_ajax()) if (!$request->is_ajax())
{ {
$message .= '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>'); $message .= '<br /><br />' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
} }
meta_refresh(3, $redirect_url); meta_refresh(3, $redirect_url);
trigger_error($message); trigger_error($message);

2
phpBB/includes/mcp/mcp_queue.php
View file

@ -887,7 +887,7 @@ class mcp_queue
} }
else else
{ {
$message .= '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message; $message .= '<br /><br />' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>') . $add_message;
} }
trigger_error($message); trigger_error($message);

9
phpBB/posting.php
View file

@ -385,12 +385,12 @@ if ($mode == 'bump')
{ {
$meta_url = phpbb_bump_topic($forum_id, $topic_id, $post_data, $current_time); $meta_url = phpbb_bump_topic($forum_id, $topic_id, $post_data, $current_time);
meta_refresh(3, $meta_url); meta_refresh(3, $meta_url);
$message = $user->lang['TOPIC_BUMPED']; $message = $user->lang['TOPIC_BUMPED'];
if (!$request->is_ajax()) if (!$request->is_ajax())
{ {
$message .= '<br /><br />' . $user->lang('VIEW_MESSAGE', '<a href="' . $meta_url . '">', '</a>'); $message .= '<br /><br />' . $user->lang('VIEW_MESSAGE', '<a href="' . $meta_url . '">', '</a>');
$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) . '">', '</a>'); $message .= '<br /><br />' . $user->lang('RETURN_FORUM', '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) . '">', '</a>');
} }
trigger_error($message); trigger_error($message);
@ -1667,16 +1667,17 @@ function handle_post_delete($forum_id, $topic_id, $post_id, &$post_data, $is_sof
$meta_info = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id&amp;p=$next_post_id") . "#p$next_post_id"; $meta_info = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id&amp;p=$next_post_id") . "#p$next_post_id";
$message = $user->lang['POST_DELETED']; $message = $user->lang['POST_DELETED'];
if (!$request->is_ajax()) if (!$request->is_ajax())
{ {
$message .= '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $meta_info . '">', '</a>'); $message .= '<br /><br />' . $user->lang('RETURN_TOPIC', '<a href="' . $meta_info . '">', '</a>');
} }
} }
meta_refresh(3, $meta_info); meta_refresh(3, $meta_info);
if (!$request->is_ajax()) if (!$request->is_ajax())
{ {
$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) . '">', '</a>'); $message .= '<br /><br />' . $user->lang('RETURN_FORUM', '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) . '">', '</a>');
} }
trigger_error($message); trigger_error($message);
} }

5
phpBB/viewtopic.php
View file

@ -501,15 +501,16 @@ if ($config['allow_bookmarks'] && $user->data['is_registered'] && request_var('b
if (!$request->is_ajax()) if (!$request->is_ajax())
{ {
$message .= '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $viewtopic_url . '">', '</a>'); $message .= '<br /><br />' . $user->lang('RETURN_TOPIC', '<a href="' . $viewtopic_url . '">', '</a>');
} }
} }
else else
{ {
$message = $user->lang['BOOKMARK_ERR']; $message = $user->lang['BOOKMARK_ERR'];
if (!$request->is_ajax()) if (!$request->is_ajax())
{ {
$message .= '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $viewtopic_url . '">', '</a>'); $message .= '<br /><br />' . $user->lang('RETURN_TOPIC', '<a href="' . $viewtopic_url . '">', '</a>');
} }
} }
meta_refresh(3, $viewtopic_url); meta_refresh(3, $viewtopic_url);