From 6a4c01cdc319c3bfdebbb54a80127f597345ed8a Mon Sep 17 00:00:00 2001 From: Jonathan Stanley Date: Sat, 27 Jan 2007 17:21:20 +0000 Subject: [PATCH] SEPARATOR, not SEPERATOR... also "neutralised" variable naming as it's used elsewhere outside of pagination. :) git-svn-id: file:///svn/phpbb/trunk@6940 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 2 +- phpBB/includes/functions_display.php | 2 +- phpBB/language/en/common.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 5aadb5017e..ff514e7ec5 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1288,7 +1288,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add // Make sure $per_page is a valid value $per_page = ($per_page <= 0) ? 1 : $per_page; - $seperator = '' . $user->lang['PAGINATION_SEPERATOR'] . ''; + $seperator = '' . $user->lang['COMMA_SEPARATOR'] . ''; $total_pages = ceil($num_items / $per_page); if ($total_pages == 1 || !$num_items) diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 76f261bab1..e62bf674e6 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -524,7 +524,7 @@ function topic_generate_pagination($replies, $url) } else if ($times < $total_pages) { - $pagination .= '' . $user->lang['PAGINATION_SEPERATOR'] . ''; + $pagination .= '' . $user->lang['COMMA_SEPARATOR'] . ''; } $times++; } diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 6d2220ded9..953a5c9644 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -33,7 +33,7 @@ if (empty($lang) || !is_array($lang)) $lang = array_merge($lang, array( 'TRANSLATION_INFO' => '', 'DIRECTION' => 'ltr', - 'DATE_FORMAT' => '|d M Y|', // 01 Jan 2007 (with Relative days enabled) + 'DATE_FORMAT' => '|d M Y|', // 01 Jan 2007 (with Relative days enabled) 'USER_LANG' => 'en-gb', '1_DAY' => '1 day', @@ -106,6 +106,7 @@ $lang = array_merge($lang, array( 'CLICK_VIEW_PRIVMSG' => '%sGo to your inbox%s', 'CLOSE_WINDOW' => 'Close window', 'COLOUR_SWATCH' => 'Colour swatch', + 'COMMA_SEPARATOR' => ', ', // Used in pagination and secret yet-to-be-release style, use localised comma if appropiate, eg: Ideographic or Arabic 'CONFIRM' => 'Confirm', 'CONFIRM_CODE' => 'Confirmation code', 'CONFIRM_CODE_EXPLAIN' => 'Enter the code exactly as you see it in the image, it is case insensitive. Please note that a zero does not exist.', @@ -365,7 +366,6 @@ $lang = array_merge($lang, array( 'OPTIONS' => 'Options', 'PAGE_OF' => 'Page %1$d of %2$d', - 'PAGINATION_SEPERATOR' => ', ', 'PASSWORD' => 'Password', 'PLAY_QUICKTIME_FILE' => 'Play Quicktime file', 'PM' => 'PM',