From 14cd6f5dd650af3a1eedfd56e728397689debcf2 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Mon, 19 Nov 2001 20:30:52 +0000 Subject: [PATCH] Yet another missed option ... blimey, we've made this too configurable ... only kidding git-svn-id: file:///svn/phpbb/trunk@1376 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/admin_board.php | 2 + phpBB/language/lang_english/lang_admin.php | 4 ++ .../subSilver/admin/board_config_body.tpl | 42 ++++++++++--------- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index bd423be05d..3d5c471f27 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -151,6 +151,7 @@ $template->assign_vars(array( "L_ENABLED" => $lang['Enabled'], "L_DISABLED" => $lang['Disabled'], "L_ABILITIES_SETTINGS" => $lang['Abilities_settings'], + "L_MAX_POLL_OPTIONS" => $lang['Max_poll_options'], "L_FLOOD_INTERVAL" => $lang['Flood_Interval'], "L_FLOOD_INTERVAL_EXPLAIN" => $lang['Flood_Interval_explain'], "L_BOARD_EMAIL_FORM" => $lang['Board_email_form'], @@ -216,6 +217,7 @@ $template->assign_vars(array( "ACTIVATION_ADMIN_CHECKED" => $activation_admin, "BOARD_EMAIL_FORM_ENABLE" => $board_email_form_yes, "BOARD_EMAIL_FORM_DISABLE" => $board_email_form_no, + "MAX_POLL_OPTIONS" => $new['max_poll_options'], "FLOOD_INTERVAL" => $new['flood_interval'], "TOPICS_PER_PAGE" => $new['topics_per_page'], "POSTS_PER_PAGE" => $new['posts_per_page'], diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php index 1915b56c68..89d0930d62 100644 --- a/phpBB/language/lang_english/lang_admin.php +++ b/phpBB/language/lang_english/lang_admin.php @@ -32,6 +32,9 @@ $lang['Database_size'] = "Database size"; $lang['Gzip_compression'] ="Gzip compression"; $lang['Not_available'] = "Not available"; +$lang['ON'] = "ON"; // This is for GZip compression +$lang['OFF'] = "OFF"; + // // DB Utils @@ -185,6 +188,7 @@ $lang['Board_disable_explain'] = "This will make the board unavailable to users. $lang['Acct_activation'] = "Enable account activation"; $lang['Abilities_settings'] = "User and Forum Basic Settings"; +$lang['Max_poll_options'] = "Max number of poll options"; $lang['Flood_Interval'] = "Flood Interval"; $lang['Flood_Interval_explain'] = "Number of seconds a user must wait between posts"; $lang['Board_email_form'] = "User email via board"; diff --git a/phpBB/templates/subSilver/admin/board_config_body.tpl b/phpBB/templates/subSilver/admin/board_config_body.tpl index 85f2ae3456..e76877cad2 100644 --- a/phpBB/templates/subSilver/admin/board_config_body.tpl +++ b/phpBB/templates/subSilver/admin/board_config_body.tpl @@ -9,11 +9,11 @@ {L_SITE_NAME} - + {L_SITE_DESCRIPTION} - + {L_DISABLE_BOARD}
{L_DISABLE_BOARD_EXPLAIN} @@ -29,19 +29,19 @@ {L_FLOOD_INTERVAL}
{L_FLOOD_INTERVAL_EXPLAIN} - + {L_TOPICS_PER_PAGE} - + {L_POSTS_PER_PAGE} - + {L_HOT_THRESHOLD} - + {L_DEFAULT_STYLE} @@ -57,7 +57,7 @@ {L_DATE_FORMAT}
{L_DATE_FORMAT_EXPLAIN} - + {L_SYSTEM_TIMEZONE} @@ -79,19 +79,19 @@ {L_COOKIE_NAME} - + {L_COOKIE_DOMAIN} - + {L_COOKIE_PATH} - + {L_SESSION_LENGTH} - + {L_COOKIE_SECURE} @@ -106,26 +106,30 @@ {L_INBOX_LIMIT} - + {L_SENTBOX_LIMIT} - + {L_SAVEBOX_LIMIT} - + {L_ABILITIES_SETTINGS} + + {L_MAX_POLL_OPTIONS} + + {L_ALLOW_HTML} {L_YES}   {L_NO} {L_ALLOWED_TAGS}
{L_ALLOWED_TAGS_EXPLAIN} - + {L_ALLOW_BBCODE} @@ -137,7 +141,7 @@ {L_SMILIES_PATH}
{L_SMILIES_PATH_EXPLAIN} - + {L_ALLOW_SIG} @@ -145,7 +149,7 @@ {L_MAX_SIG_LENGTH}
{L_MAX_SIG_LENGTH_EXPLAIN} - + {L_ALLOW_NAME_CHANGE} @@ -168,13 +172,13 @@ {L_MAX_FILESIZE}
{L_MAX_FILESIZE_EXPLAIN} - Bytes + Bytes {L_MAX_AVATAR_SIZE}
{L_MAX_AVATAR_SIZE_EXPLAIN} - x + x {L_AVATAR_STORAGE_PATH}
{L_AVATAR_STORAGE_PATH_EXPLAIN}