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

SEPARATOR, not SEPERATOR... also "neutralised" variable naming as it's used elsewhere outside of pagination. :)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6940 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Jonathan Stanley 2007-01-27 17:21:20 +00:00
parent 538ffb5bfb
commit 6a4c01cdc3
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions.php
View file

@ -1288,7 +1288,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
// Make sure $per_page is a valid value // Make sure $per_page is a valid value
$per_page = ($per_page <= 0) ? 1 : $per_page; $per_page = ($per_page <= 0) ? 1 : $per_page;
$seperator = '<span class="page-sep">' . $user->lang['PAGINATION_SEPERATOR'] . '</span>'; $seperator = '<span class="page-sep">' . $user->lang['COMMA_SEPARATOR'] . '</span>';
$total_pages = ceil($num_items / $per_page); $total_pages = ceil($num_items / $per_page);
if ($total_pages == 1 || !$num_items) if ($total_pages == 1 || !$num_items)

2
phpBB/includes/functions_display.php
View file

@ -524,7 +524,7 @@ function topic_generate_pagination($replies, $url)
} }
else if ($times < $total_pages) else if ($times < $total_pages)
{ {
$pagination .= '<span class="page-sep">' . $user->lang['PAGINATION_SEPERATOR'] . '</span>'; $pagination .= '<span class="page-sep">' . $user->lang['COMMA_SEPARATOR'] . '</span>';
} }
$times++; $times++;
} }

4
phpBB/language/en/common.php
View file

@ -33,7 +33,7 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array( $lang = array_merge($lang, array(
'TRANSLATION_INFO' => '', 'TRANSLATION_INFO' => '',
'DIRECTION' => 'ltr', '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', 'USER_LANG' => 'en-gb',
'1_DAY' => '1 day', '1_DAY' => '1 day',
@ -106,6 +106,7 @@ $lang = array_merge($lang, array(
'CLICK_VIEW_PRIVMSG' => '%sGo to your inbox%s', 'CLICK_VIEW_PRIVMSG' => '%sGo to your inbox%s',
'CLOSE_WINDOW' => 'Close window', 'CLOSE_WINDOW' => 'Close window',
'COLOUR_SWATCH' => 'Colour swatch', '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' => 'Confirm',
'CONFIRM_CODE' => 'Confirmation code', '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.', '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', 'OPTIONS' => 'Options',
'PAGE_OF' => 'Page <strong>%1$d</strong> of <strong>%2$d</strong>', 'PAGE_OF' => 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
'PAGINATION_SEPERATOR' => ', ',
'PASSWORD' => 'Password', 'PASSWORD' => 'Password',
'PLAY_QUICKTIME_FILE' => 'Play Quicktime file', 'PLAY_QUICKTIME_FILE' => 'Play Quicktime file',
'PM' => 'PM', 'PM' => 'PM',