From 2867831232e8c4cb2e556b7fd157a9e0111fa696 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 16 Oct 2013 09:43:45 -0700 Subject: [PATCH] [ticket/11921] Move any HTML for Notifications to the templates PHPBB3-11921 --- phpBB/includes/functions.php | 2 +- phpBB/includes/ucp/ucp_notifications.php | 2 +- phpBB/language/en/common.php | 1 - phpBB/styles/prosilver/template/overall_header.html | 4 ++-- phpBB/styles/prosilver/template/ucp_notifications.html | 4 ++-- phpBB/styles/subsilver2/template/overall_header.html | 4 ++-- phpBB/styles/subsilver2/template/ucp_notifications.html | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 310045ed82..a06be1960c 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5352,7 +5352,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'HIDDEN_FIELDS_FOR_JUMPBOX' => $hidden_fields_for_jumpbox, 'UNREAD_NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', - 'NOTIFICATIONS_COUNT' => ($notifications !== false) ? $user->lang('NOTIFICATIONS_COUNT', $notifications['unread_count']) : '', + 'NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', 'U_VIEW_ALL_NOTIFICATIONS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_notifications'), 'U_NOTIFICATION_SETTINGS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_notifications&mode=notification_options'), 'S_NOTIFICATIONS_DISPLAY' => $config['load_notifications'], diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php index 2f22f6cf9c..145963837c 100644 --- a/phpBB/includes/ucp/ucp_notifications.php +++ b/phpBB/includes/ucp/ucp_notifications.php @@ -140,7 +140,7 @@ class ucp_notifications $template->assign_vars(array( 'PAGE_NUMBER' => phpbb_on_page($template, $user, $base_url, $notifications['total_count'], $config['topics_per_page'], $start), - 'TOTAL_COUNT' => $user->lang('NOTIFICATIONS_COUNT', $notifications['total_count']), + 'TOTAL_COUNT' => $notifications['total_count'], 'U_MARK_ALL' => $base_url . '&mark=all&token=' . generate_link_hash('mark_all_notifications_read'), )); diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 3afbc426aa..bb1c4698ec 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -413,7 +413,6 @@ $lang = array_merge($lang, array( 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', 'NOTIFICATIONS' => 'Notifications', - 'NOTIFICATIONS_COUNT' => 'Notifications (%d)', 'NOTIFICATION_BOOKMARK' => '%1$s replied to the topic "%2$s" you have bookmarked.', 'NOTIFICATION_GROUP_REQUEST' => '%1$s is requesting to join the group %2$s.', 'NOTIFICATION_GROUP_REQUEST_APPROVED' => 'Your request to join the group %1$s has been approved.', diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 6f787f023c..f2f47332d7 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -98,7 +98,7 @@