mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-04 14:47:52 +02:00
Code Issues Releases Wiki Activity

- added acp_language (language pack management)

Browse Source 
- minor adjustments to cope with PHP5.x


git-svn-id: file:///svn/phpbb/trunk@5315 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2005-11-30 17:48:06 +00:00
parent ba6f40ce25
commit 1bf18e23ed
18 changed files with 1334 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/includes/acp/acp_bots.php
View File

@ -92,7 +92,8 @@ class acp_bots
WHERE bot_id $sql_id";
$db->sql_query($sql);
foreach (array(USERS_TABLE, USER_GROUP_TABLE) as $table)
$_tables = array(USERS_TABLE, USER_GROUP_TABLE);
foreach ($_tables as $table)
{
$sql = "DELETE FROM $table
WHERE user_id IN (" . implode(', ', $user_id_ary) . ')';
@ -250,7 +251,8 @@ class acp_bots
}
$s_active_options = '';
foreach (array('0' => 'NO', '1' => 'YES') as $value => $lang)
$_options = array('0' => 'NO', '1' => 'YES');
foreach ($_options as $value => $lang)
{
$selected = ($bot_row['bot_active'] == $value) ? ' selected="selected"' : '';
$s_active_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$lang] . '</option>';
@ -285,7 +287,8 @@ class acp_bots
}
$s_options = '';
foreach (array('activate' => 'BOT_ACTIVATE', 'deactivate' => 'BOT_DEACTIVATE', 'delete' => 'DELETE') as $value => $lang)
$_options = array('activate' => 'BOT_ACTIVATE', 'deactivate' => 'BOT_DEACTIVATE', 'delete' => 'DELETE');
foreach ($_options as $value => $lang)
{
$s_options .= '<option value="' . $value . '">' . $user->lang[$lang] . '</option>';
}

1097
phpBB/includes/acp/acp_language.php Normal file
View File

File diff suppressed because it is too large Load Diff

5
phpBB/includes/acp/acp_logs.php
View File

@ -60,7 +60,7 @@ class acp_logs
$where_sql";
$db->sql_query($sql);
add_log('admin', 'LOG_' . strtoupper($mode) . '_CLEAR');
add_log('admin', 'LOG_CLEAR_' . strtoupper($mode));
}
}
@ -117,7 +117,8 @@ class acp_logs
{
$data = array();
foreach (array('viewtopic', 'viewlogs', 'viewforum') as $check)
$checks = array('viewtopic', 'viewlogs', 'viewforum');
foreach ($checks as $check)
{
if (isset($row[$check]) && $row[$check])
{

18
phpBB/includes/bbcode.php
View File

@ -323,7 +323,7 @@ class bbcode
}
else
{
$this->bbcode_cache[$bbcode_id] = FALSE;
$this->bbcode_cache[$bbcode_id] = false;
}
}
}
@ -349,7 +349,7 @@ class bbcode
if ($bbcode_id != -1 && !($this->template_bitfield & (1 << $bbcode_id)))
{
return (isset($bbcode_hardtpl[$tpl_name])) ? $bbcode_hardtpl[$tpl_name] : FALSE;
return (isset($bbcode_hardtpl[$tpl_name])) ? $bbcode_hardtpl[$tpl_name] : false;
}
if (empty($this->bbcode_template))
@ -375,7 +375,7 @@ class bbcode
eval($tpl);
}
return (isset($this->bbcode_template[$tpl_name])) ? $this->bbcode_template[$tpl_name] : ((isset($bbcode_hardtpl[$tpl_name])) ? $bbcode_hardtpl[$tpl_name] : FALSE);
return (isset($this->bbcode_template[$tpl_name])) ? $this->bbcode_template[$tpl_name] : ((isset($bbcode_hardtpl[$tpl_name])) ? $bbcode_hardtpl[$tpl_name] : false);
}
function bbcode_tpl_replace($tpl_name, $tpl)
@ -410,37 +410,37 @@ class bbcode
$type = 'default';
$start = 0;
}
elseif ($type == 'i')
else if ($type == 'i')
{
$tpl = 'olist_open';
$type = 'lower-roman';
$start = 1;
}
elseif ($type == 'I')
else if ($type == 'I')
{
$tpl = 'olist_open';
$type = 'upper-roman';
$start = 1;
}
elseif (preg_match('#^(disc|circle|square)$#i', $type))
else if (preg_match('#^(disc|circle|square)$#i', $type))
{
$tpl = 'ulist_open';
$type = strtolower($type);
$start = 1;
}
elseif (preg_match('#^[a-z]$#', $type))
else if (preg_match('#^[a-z]$#', $type))
{
$tpl = 'olist_open';
$type = 'lower-alpha';
$start = ord($type) - 96;
}
elseif (preg_match('#[A-Z]#', $type))
else if (preg_match('#[A-Z]#', $type))
{
$tpl = 'olist_open';
$type = 'upper-alpha';
$start = ord($type) - 64;
}
elseif (is_numeric($type))
else if (is_numeric($type))
{
$tpl = 'olist_open';
$type = 'arabic-numbers';

28
phpBB/includes/functions.php
View File

@ -354,7 +354,7 @@ function tz_select($default = '')
global $sys_timezone, $user;
$tz_select = '';
foreach ($user->lang['tz']['zones'] as $offset => $zone)
foreach ($user->lang['tz_zones'] as $offset => $zone)
{
if (is_numeric($offset))
{
@ -380,7 +380,7 @@ function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $mat
// Is user watching this thread?
if ($user_id != ANONYMOUS)
{
$can_watch = TRUE;
$can_watch = true;
if ($notify_status == 'unset')
{
@ -415,7 +415,7 @@ function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $mat
}
else
{
$is_watching = TRUE;
$is_watching = true;
if ($notify_status)
{
@ -433,7 +433,7 @@ function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $mat
{
if ($_GET['watch'] == $mode)
{
$is_watching = TRUE;
$is_watching = true;
$sql = 'INSERT INTO ' . $table_sql . " (user_id, $where_sql, notify_status)
VALUES ($user_id, $match_id, 0)";
@ -977,7 +977,9 @@ function on_page($num_items, $per_page, $start)
$on_page = floor($start / $per_page) + 1;
$template->assign_var('ON_PAGE', $on_page);
$template->assign_vars(array(
'ON_PAGE' => $on_page)
);
return sprintf($user->lang['PAGE_OF'], $on_page, max(ceil($num_items / $per_page), 1));
}
@ -1121,10 +1123,10 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo
return false;
}
// re-add $SID
$use_page = ($u_action) ? $phpbb_root_path . $u_action : $phpbb_root_path . $user->page;
$u_action = (strpos($use_page, ".{$phpEx}?") !== false) ? str_replace(".{$phpEx}?", ".$phpEx$SID&", $use_page) . '&' : $use_page . '?';
$u_action .= 'confirm_key=' . $confirm_key;
// re-add $SID / transform & to &amp; for user->page (user->page is always using &
$use_page = ($u_action) ? $phpbb_root_path . $u_action : $phpbb_root_path . str_replace('&', '&amp;', $user->page);
$u_action = (strpos($use_page, ".{$phpEx}?") !== false) ? str_replace(".{$phpEx}?", ".$phpEx$SID&amp;", $use_page) : $use_page . '?';
$u_action .= '&amp;confirm_key=' . $confirm_key;
$template->assign_vars(array(
'MESSAGE_TITLE' => (!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title],
@ -1162,7 +1164,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
{
$username = request_var('username', '');
$password = request_var('password', '');
$autologin = (!empty($_POST['autologin'])) ? TRUE : FALSE;
$autologin = (!empty($_POST['autologin'])) ? true : false;
$viewonline = (!empty($_POST['viewonline'])) ? 0 : 1;
$admin = ($admin) ? 1 : 0;
@ -1568,7 +1570,7 @@ function page_header($page_title = '')
{
global $db, $config, $template, $SID, $user, $auth, $phpEx, $phpbb_root_path;
define('HEADER_INC', TRUE);
define('HEADER_INC', true);
// gzip_compression
if ($config['gzip_compress'])
@ -1695,8 +1697,8 @@ function page_header($page_title = '')
if ($total_online_users > $config['record_online_users'])
{
set_config('record_online_users', $total_online_users, TRUE);
set_config('record_online_date', time(), TRUE);
set_config('record_online_users', $total_online_users, true);
set_config('record_online_date', time(), true);
}
// Build online listing

5
phpBB/includes/functions_admin.php
View File

@ -300,6 +300,11 @@ function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png')
// Add closing / if present
$dir = ($dir && substr($dir, -1) != '/') ? $dir . '/' : $dir;
if (!is_dir($rootdir . $dir))
{
return false;
}
$dh = opendir($rootdir . $dir);
while (($fname = readdir($dh)) !== false)
{

32
phpBB/includes/functions_compress.php
View File

@ -15,14 +15,14 @@
class compress
{
var $fp = 0;
function add_file($src, $src_rm_prefix = '', $src_add_prefix = '', $skip_files = '')
{
global $phpbb_root_path;
$skip_files = explode(',', $skip_files);
// Remove rm prefix from src path
// Remove rm prefix from src path
$src_path = ($src_rm_prefix) ? preg_replace('#^(' . preg_quote($src_rm_prefix) . ')#', '', $src) : $src;
// Add src prefix
$src_path = ($src_add_prefix) ? ($src_add_prefix . ((substr($src_add_prefix, -1) != '/') ? '/' : '') . $src_path) : $src_path;
@ -82,6 +82,12 @@ class compress
return true;
}
function add_custom_file($src, $filename)
{
$this->data($filename, implode('', file($src)));
return true;
}
function add_data($src, $name)
{
$this->data($name, $src);
@ -91,12 +97,13 @@ class compress
function methods()
{
$methods = array('tar');
$available_methods = array('tar.gz' => 'zlib', 'tar.bz2' => 'bz2', 'zip' => 'zlib');
foreach (array('tar.gz' => 'zlib', 'tar.bz2' => 'bz2', 'zip' => 'zlib') as $type => $module)
foreach ($available_methods as $type => $module)
{
if (!@extension_loaded($module))
{
break;
continue;
}
$methods[] = $type;
}
@ -312,7 +319,7 @@ class compress_zip extends compress
unset($data);
// If we didn't compress set method to store, else deflate
$c_method = ($c_len == $unc_len) ? "\x00\x00" : "\x08\x00";
$c_method = ($c_len == $unc_len) ? "\x00\x00" : "\x08\x00";
// Are we a file or a directory? Set archive for file
$attrib = ($is_dir) ? 16 : 32;
@ -348,7 +355,7 @@ class compress_zip extends compress
$cdrec .= "\x00\x00"; // version made by
$cdrec .= "$var_ext\x00"; // version needed to extract
$cdrec .= "\x00\x00"; // gen purpose bit flag
$cdrec .= $c_method; // compression method
$cdrec .= $c_method; // compression method
$cdrec .= $hexdtime; // last mod time & date
$cdrec .= pack('V', $crc); // crc32
$cdrec .= pack('V', $c_len); // compressed filesize
@ -372,7 +379,7 @@ class compress_zip extends compress
{
$ctrldir = implode('', $this->ctrl_dir);
return $ctrldir . $this->eof_cdh .
return $ctrldir . $this->eof_cdh .
pack('v', sizeof($this->ctrl_dir)) . // total # of entries "on this disk"
pack('v', sizeof($this->ctrl_dir)) . // total # of entries overall
pack('V', strlen($ctrldir)) . // size of central dir
@ -548,7 +555,7 @@ class compress_tar extends compress
$header .= pack("a8", sprintf("%07o", 0));
$header .= pack("a8", sprintf("%07o", 0));
$header .= pack("a12", sprintf("%011o", $filesize));
$header .= pack("a12", sprintf("%011o", $mtime));
$header .= pack("A12", sprintf("%011o", $mtime)); // From a12 to A12
$header .= ' ';
$header .= pack("a", $typeflag);
$header .= pack("a100", '');
@ -581,7 +588,12 @@ class compress_tar extends compress
function open()
{
$fzopen = ($this->isbz && function_exists('bzopen')) ? 'bzopen' : (($this->isgz && extension_loaded('zlib')) ? 'gzopen' : 'fopen');
return $this->fp = @$fzopen($this->file, $this->mode . 'b');
$this->fp = @$fzopen($this->file, $this->mode . 'b' . (($fzopen == 'gzopen') ? '9' : ''));
if (!$this->fp)
{
trigger_error('Unable to open file ' . $this->file . ' [' . $fzopen . ' - ' . $this->mode . 'b]');
}
}
function download($filename)
@ -601,7 +613,7 @@ class compress_tar extends compress
case 'tar.bz2':
$mimetype = 'application/x-bzip2';
break;
default:
$mimetype = 'application/octet-stream';
break;

22
phpBB/includes/functions_jabber.php
View File

@ -163,7 +163,7 @@ class jabber
//EVENT: Disconnected
}
$this->returned_keep_alive = FALSE;
$this->returned_keep_alive = false;
$this->keep_alive_id = 'keep_alive_' . time();
$this->send_packet("<iq id='{$this->keep_alive_id}'/>", 'cruise_control');
$this->last_ping_time = date('H:i');
@ -190,12 +190,12 @@ class jabber
// auth_0k
return $this->_sendauth_ok($packet['iq']['#']['query'][0]['#']['token'][0]['#'], $packet['iq']['#']['query'][0]['#']['sequence'][0]['#']);
}
elseif (@function_exists('mhash') && isset($packet['iq']['#']['query'][0]['#']['digest']))
else if (@function_exists('mhash') && isset($packet['iq']['#']['query'][0]['#']['digest']))
{
// digest
return $this->_sendauth_digest();
}
elseif ($packet['iq']['#']['query'][0]['#']['password'])
else if ($packet['iq']['#']['query'][0]['#']['password'])
{
// plain text
return $this->_sendauth_plaintext();
@ -231,7 +231,7 @@ class jabber
$return_code = (isset($packet['iq']['#']['query'][0]['#']['registered'][0]['#'])) ? 1 : 2;
$this->jid = ($this->resource) ? "{$this->username}@{$this->server}/{$this->resource}" : "{$this->username}@{$this->server}";
}
elseif ($this->get_info_from_iq_type($packet) == 'error' && isset($packet['iq']['#']['error'][0]['#']))
else if ($this->get_info_from_iq_type($packet) == 'error' && isset($packet['iq']['#']['error'][0]['#']))
{
// "conflict" error, i.e. already registered
if ($packet['iq']['#']['error'][0]['@']['code'] == '409')
@ -271,7 +271,7 @@ class jabber
{
$return_code = (isset($packet['iq']['#']['query'][0]['#']['registered'][0]['#'])) ? 1 : 2;
}
elseif ($this->get_info_from_iq_type($packet) == 'error' && isset($packet['iq']['#']['error'][0]['#']))
else if ($this->get_info_from_iq_type($packet) == 'error' && isset($packet['iq']['#']['error'][0]['#']))
{
// "conflict" error, i.e. already registered
if ($packet['iq']['#']['error'][0]['@']['code'] == '409')
@ -357,7 +357,7 @@ class jabber
$return_code = 2;
}
}
elseif ($this->get_info_from_iq_type($packet) == 'error')
else if ($this->get_info_from_iq_type($packet) == 'error')
{
if (isset($packet['iq']['#']['error'][0]['#']))
{
@ -508,13 +508,13 @@ class jabber
$type = ($type != '') ? $type : 'normal';
$funcmeth = "handler_message_$type";
}
elseif ($packet_type == 'iq')
else if ($packet_type == 'iq')
{
$namespace = $packet['iq']['#']['query'][0]['@']['xmlns'];
$namespace = str_replace(':', '_', $namespace);
$funcmeth = "handler_iq_$namespace";
}
elseif ($packet_type == 'presence')
else if ($packet_type == 'presence')
{
$type = $packet['presence']['@']['type'];
$type = ($type != '') ? $type : 'available';
@ -527,7 +527,7 @@ class jabber
{
call_user_func($funcmeth, $packet);
}
elseif (method_exists($this, $funcmeth))
else if (method_exists($this, $funcmeth))
{
call_user_func(array(&$this, $funcmeth), $packet);
}
@ -995,11 +995,11 @@ class make_xml extends jabber
$text .= ">\n";
}
elseif ($key == '#')
else if ($key == '#')
{
$text .= htmlspecialchars($value);
}
elseif (is_array($value))
else if (is_array($value))
{
for ($a = 0, $size = sizeof($value); $a < $size; $a++)
{

6
phpBB/includes/functions_messenger.php
View File

@ -640,13 +640,13 @@ class queue
{
$lines[] = "'$k'=>" . $this->format_array($v);
}
elseif (is_int($v))
else if (is_int($v))
{
$lines[] = "'$k'=>$v";
}
elseif (is_bool($v))
else if (is_bool($v))
{
$lines[] = "'$k'=>" . (($v) ? 'TRUE' : 'FALSE');
$lines[] = "'$k'=>" . (($v) ? 'true' : 'false');
}
else
{

12
phpBB/includes/functions_privmsgs.php
View File

@ -126,7 +126,9 @@ function get_folder($user_id, &$folder, $folder_id = false)
$db->sql_freeresult($result);
// Make sure the default boxes are defined
foreach (array(PRIVMSGS_INBOX, PRIVMSGS_OUTBOX, PRIVMSGS_SENTBOX) as $default_folder)
$available_folder = array(PRIVMSGS_INBOX, PRIVMSGS_OUTBOX, PRIVMSGS_SENTBOX);
foreach ($available_folder as $default_folder)
{
if (!isset($num_messages[$default_folder]))
{
@ -904,8 +906,9 @@ function rebuild_header($check_ary)
{
${$type}[] = (int) $match[2][$id];
}
foreach (array('u', 'g') as $type)
$_types = array('u', 'g');
foreach ($_types as $type)
{
if (sizeof($$type))
{
@ -1098,7 +1101,8 @@ function submit_pm($mode, $subject, &$data, $update_message, $put_in_outbox = tr
{
// Build Recipient List
// u|g => array($user_id => 'to'|'bcc')
foreach (array('u', 'g') as $ug_type)
$_types = array('u', 'g');
foreach ($_types as $ug_type)
{
if (isset($data['address_list'][$ug_type]) && sizeof($data['address_list'][$ug_type]))
{

2
phpBB/includes/functions_user.php
View File

@ -202,7 +202,7 @@ function user_delete($mode, $user_id)
$db->freeresult($result);
}
set_config('num_users', $config['num_users'] - 1, TRUE);
set_config('num_users', $config['num_users'] - 1, true);
$db->sql_transaction('commit');

3
phpBB/includes/search/fulltext_phpbb.php
View File

@ -139,7 +139,8 @@ class fulltext_phpbb
$sql_find_in = (sizeof($pid_ary)) ? 'AND ' . (($type == 'topics') ? 't.topic_id' : 'm.post_id') . ' IN (' . implode(', ', $pid_ary) . ')' : '';
$result_ary = array();
foreach (array('AND', 'OR', 'NOT') as $bool)
$_bool = array('AND', 'OR', 'NOT');
foreach ($_bool as $bool)
{
if (isset($sql_words[$bool]) && is_array($sql_words[$bool]))
{

3
phpBB/includes/ucp/ucp_pm_compose.php
View File

@ -666,7 +666,8 @@ function compose_pm($id, $mode, $action)
}
$u = $g = array();
foreach (array('u', 'g') as $type)
$_types = array('u', 'g');
foreach ($_types as $type)
{
if (isset($result[$type]) && $result[$type])
{

6
phpBB/includes/ucp/ucp_pm_viewfolder.php
View File

@ -74,7 +74,8 @@ function view_folder($id, $mode, $folder_id, $folder, $type)
foreach ($folder_info['rowset'] as $message_id => $row)
{
$address[$message_id] = rebuild_header(array('to' => $row['to_address'], 'bcc' => $row['bcc_address']));
foreach (array('u', 'g') as $save)
$_save = array('u', 'g');
foreach ($_save as $save)
{
if (isset($address[$message_id][$save]) && sizeof($address[$message_id][$save]))
{
@ -86,7 +87,8 @@ function view_folder($id, $mode, $folder_id, $folder, $type)
}
}
foreach (array('u', 'g') as $ug_type)
$_types = array('u', 'g');
foreach ($_types as $ug_type)
{
if (isset($recipient_list[$ug_type]) && sizeof($recipient_list[$ug_type]))
{

3
phpBB/includes/ucp/ucp_prefs.php
View File

@ -279,7 +279,8 @@ class ucp_prefs
$sort_by_post_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']);
$sort_by_post_sql = array('a' => 'u.username', 't' => 'p.post_id', 's' => 'p.post_subject');
foreach (array('topic', 'post') as $sort_option)
$_options = array('topic', 'post');
foreach ($_options as $sort_option)
{
${'s_limit_' . $sort_option . '_days'} = '<select name="' . $sort_option . '_st">';
foreach (${'limit_' . $sort_option . '_days'} as $day => $text)

39
phpBB/language/en/acp/common.php
View File

@ -52,10 +52,13 @@ $lang += array(
'ACP_EXTENSION_GROUPS' => 'Manage Extension Groups',
'ACP_FORUM_LOGS' => 'Forum Logs',
'ACP_GENERAL_CONFIGURATION' => 'General Configuration',
'ACP_GENERAL_TASKS' => 'General Tasks',
'ACP_ICONS' => 'Topic Icons',
'ACP_ICONS_SMILIES' => 'Topic Icons/Smilies',
'ACP_INDEX' => 'Admin index',
'ACP_JABBER_SETTINGS' => 'Jabber Settings',
'ACP_LANGUAGE' => 'Language Management',
'ACP_LANGUAGE_PACKS' => 'Language Packs',
'ACP_LOAD_SETTINGS' => 'Load Settings',
'ACP_LOGGING' => 'Logging',
'ACP_MAIN' => 'Admin index',
@ -86,6 +89,8 @@ $lang += array(
'DIMENSIONS' => 'Dimensions',
'DISABLE' => 'Disable',
'DISPLAY' => 'Display',
'DOWNLOAD' => 'Download',
'DOWNLOAD_AS' => 'Download as',
'EDIT' => 'Edit',
'ENABLE' => 'Enable',
@ -95,6 +100,7 @@ $lang += array(
'GENERAL_OPTIONS' => 'General Options',
'GENERAL_SETTINGS' => 'General Settings',
'INSTALL' => 'Install',
'IP' => 'User IP',
'IP_HOSTNAME' => 'IP addresses or hostnames',
@ -205,6 +211,21 @@ $lang += array(
'LOG_BOT_DELETE' => '<b>Deleted bot</b><br />&#187; %s',
'LOG_BOT_UPDATED' => '<b>Existing bot updated</b><br />&#187; %s',
'LOG_CLEAR_ADMIN' => '<b>Cleared admin log</b>',
'LOG_CLEAR_MODE' => '<b>Cleared moderator log</b>',
'LOG_CLEAR_CRITICAL' => '<b>Cleared error log</b>',
'LOG_CONFIG_ATTACH' => '<b>Altered attachment settings</b>',
'LOG_CONFIG_AUTH' => '<b>Altered authentication settings</b>',
'LOG_CONFIG_AVATAR' => '<b>Altered avatar settings</b>',
'LOG_CONFIG_COOKIE' => '<b>Altered cookie settings</b>',
'LOG_CONFIG_DEFAULT' => '<b>Altered board defaults</b>',
'LOG_CONFIG_EMAIL' => '<b>Altered email settings</b>',
'LOG_CONFIG_LOAD' => '<b>Altered load settings</b>',
'LOG_CONFIG_MESSAGE' => '<b>Altered private message settings</b>',
'LOG_CONFIG_SERVER' => '<b>Altered server settings</b>',
'LOG_CONFIG_SETTINGS' => '<b>Altered board settings</b>',
'LOG_DOWNLOAD_EXCLUDE_IP' => '<b>Exluded ip/hostname from download list</b><br />&#187; %s',
'LOG_DOWNLOAD_IP' => '<b>Added ip/hostname to download list</b><br />&#187; %s',
'LOG_DOWNLOAD_REMOVE_IP' => '<b>Removed ip/hostname from download list</b><br />&#187; %s',
@ -217,6 +238,10 @@ $lang += array(
'LOG_JAB_PASSCHG' => '<b>Jabber password changed</b>',
'LOG_JAB_REGISTER' => '<b>Jabber account registered</b>',
'LOG_LANGUAGE_PACK_DELETED' => '<b>Deleted language pack</b><br />&#187; %s',
'LOG_LANGUAGE_PACK_INSTALLED' => '<b>Installed language pack</b><br />&#187; %s',
'LOG_LANGUAGE_PACK_UPDATED' => '<b>Updated language pack details</b><br />&#187; %s',
'LOG_MODULE_DISABLE' => '<b>Module disabled</b>',
'LOG_MODULE_ENABLE' => '<b>Module enabled</b>',
'LOG_MODULE_MOVE_DOWN' => '<b>Module moved down</b><br />&#187; %s',
@ -230,24 +255,10 @@ $lang += array(
'LOG_RESYNC_POSTCOUNTS' => '<b>User postcounts synced</b>',
'LOG_RESYNC_STATS' => '<b>Post, topic and user stats reset</b>',
'LOG_CONFIG_ATTACH' => '<b>Altered attachment settings</b>',
'LOG_CONFIG_AUTH' => '<b>Altered authentication settings</b>',
'LOG_CONFIG_AVATAR' => '<b>Altered avatar settings</b>',
'LOG_CONFIG_COOKIE' => '<b>Altered cookie settings</b>',
'LOG_CONFIG_DEFAULT' => '<b>Altered board defaults</b>',
'LOG_CONFIG_EMAIL' => '<b>Altered email settings</b>',
'LOG_CONFIG_LOAD' => '<b>Altered load settings</b>',
'LOG_CONFIG_MESSAGE' => '<b>Altered private message settings</b>',
'LOG_CONFIG_SERVER' => '<b>Altered server settings</b>',
'LOG_CONFIG_SETTINGS' => '<b>Altered board settings</b>',
'LOG_WORD_ADD' => '<b>Added word censor</b><br />&#187; %s',
'LOG_WORD_DELETE' => '<b>Deleted word censor</b><br />&#187; %s',
'LOG_WORD_EDIT' => '<b>Edited word censor</b><br />&#187; %s',
'LOG_ADMIN_CLEAR' => '<b>Cleared admin log</b>',
'LOG_MOD_CLEAR' => '<b>Cleared moderator log</b>',
'LOG_CRITICAL_CLEAR' => '<b>Cleared error log</b>',
);
?>

86
phpBB/language/en/acp/language.php Normal file
View File

@ -0,0 +1,86 @@
<?php
/**
*
* acp_language [English]
*
* @package language
* @version $Id$
* @copyright (c) 2005 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
* DO NOT CHANGE
*/
if (empty($lang) || !is_array($lang))
{
$lang = array();
}
// DEVELOPERS PLEASE NOTE
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
// translators to re-order the output of data while ensuring it remains correct
//
// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
// equally where a string contains only two placeholders which are used to wrap text
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
$lang += array(
'ACP_FILES' => 'Admin Language Files',
'ACP_LANGUAGE_PACKS_EXPLAIN' => 'Here you are able to install/remove language packs',
'EMAIL_FILES' => 'Email Templates',
'FILE_CONTENTS' => 'File Contents',
'FILE_FROM_STORAGE' => 'File from storage folder',
'HELP_FILES' => 'Help Files',
'INSTALLED_LANGUAGE_PACKS' => 'Installed language packs',
'INVALID_LANGUAGE_PACK' => 'The selected language pack seems to be not valid. Please verify the language pack and upload it again if necessary.',
'LANGUAGE_DETAILS_UPDATED' => 'Language details successfully updated',
'LANGUAGE_ENTRIES' => 'Language Entries',
'LANGUAGE_ENTRIES_EXPLAIN' => 'Here you are able to change existing language pack entries or not already translated ones.<br /><b>Note:</b> Once you changed a language file, the changes will be stored within a seperate folder for you to download. The changes will not be seen by your users until you replace the original language files at your webspace (by uploading them).',
'LANGUAGE_FILES' => 'Language Files',
'LANGUAGE_KEY' => 'Language Key',
'LANGUAGE_PACK_ALREADY_INSTALLED' => 'This language pack is already installed.',
'LANGUAGE_PACK_DELETED' => 'The language pack <b>%s</b> has been removed successfully. All users using this language have been resetted to the boards default language.',
'LANGUAGE_PACK_DETAILS' => 'Language Pack Details',
'LANGUAGE_PACK_INSTALLED' => 'The language pack <b>%s</b> has been successfully installed.',
'LANGUAGE_PACK_ISO' => 'ISO',
'LANGUAGE_PACK_LOCALNAME' => 'Local name',
'LANGUAGE_PACK_NAME' => 'Name',
'LANGUAGE_PACK_NOT_EXIST' => 'The selected language pack does not exist.',
'LANGUAGE_PACK_USED_BY' => 'Used by',
'LANGUAGE_VARIABLE' => 'Language Variable',
'LANG_AUTHOR' => 'Language Pack Author',
'LANG_ENGLISH_NAME' => 'English name',
'LANG_ISO_CODE' => 'ISO Code',
'LANG_LOCAL_NAME' => 'Local name',
'MISSING_LANGUAGE_FILE' => 'Missing Language File: <span style="color:red">%s</span>',
'MISSING_LANG_VARIABLES' => 'Missing Language Variables',
'MODS_FILES' => 'Mods Language Files',
'NO_LANG_ID' => 'You haven\'t specified a language pack',
'NO_REMOVE_DEFAULT_LANG' => 'You are not able to remove the default language pack.<br />If you want to remove this language pack, change your boards default language first.',
'NO_UNINSTALLED_LANGUAGE_PACKS' => 'No uninstalled language packs',
'REMOVE_FROM_STORAGE_FOLDER' => 'Remove from storage folder',
'SELECT_DOWNLOAD_FORMAT' => 'Select download format',
'SUBMIT_AND_DOWNLOAD' => 'Submit and Download File',
'THOSE_MISSING_LANG_FILES' => 'The following language files are missing from the %s language folder',
'THOSE_MISSING_LANG_VARIABLES' => 'The following language variables are missing from the <b>%s</b> language pack',
'UNINSTALLED_LANGUAGE_PACKS' => 'Uninstalled language packs',
'WRONG_LANGUAGE_FILE' => 'Selected language file is invalid',
);
?>

66
phpBB/language/en/common.php
View File

@ -532,40 +532,40 @@ $lang += array(
'11' => 'GMT + 11 Hours',
'12' => 'GMT + 12 Hours',
'dst' => '[ DST ]',
),
'zones' => array(
'-12' => '[GMT-12] Eniwetok, Kwaialein',
'-11' => '[GMT-11] Midway Island, Samoa',
'-10' => '[GMT-10] Hawaii, Honolulu',
'-9' => '[GMT-9] Alaska',
'-8' => '[GMT-8] Anchorage, Los Angeles, San Francisco, Seattle',
'-7' => '[GMT-7] Denver, Edmonton, Phoenix, Salt Lake City, Santa Fe',
'-6' => '[GMT-6] Chicago, Guatamala, Mexico City, Saskatchewan East',
'-5' => '[GMT-5] Bogota, Kingston, Lima, New York',
'-4' => '[GMT-4] Caracas, Labrador, La Paz, Maritimes, Santiago',
'-3.5' => '[GMT-3.5] Standard Time [Canada], Newfoundland',
'-3' => '[GMT-3] Brazilia, Buenos Aires, Georgetown, Rio de Janero',
'-2' => '[GMT-2] Mid-Atlantic',
'-1' => '[GMT-1] Azores, Cape Verde Is.',
'0' => '[GMT] Dublin, Edinburgh, Iceland, Lisbon, London, Casablanca',
'1' => '[GMT+1] Amsterdam, Berlin, Bern, Brussells, Madrid, Paris, Rome, Oslo, Vienna',
'2' => '[GMT+2] Athens, Bucharest, Harare, Helsinki, Israel, Istanbul',
'3' => '[GMT+3] Ankara, Baghdad, Bahrain, Beruit, Kuwait, Moscow, Nairobi, Riyadh',
'3.5' => '[GMT+3.5] Iran',
'4' => '[GMT+4] Abu Dhabi, Kabul, Muscat, Tbilisi, Volgograd',
'4.5' => '[GMT+4.5] Afghanistan',
'5' => '[GMT+5] Calcutta, Madras, New Dehli',
'5.5' => '[GMT+5.5] India',
'6' => '[GMT+6] Almaty, Dhakar, Kathmandu',
'6.5' => '[GMT+6.5] Rangoon',
'7' => '[GMT+7] Bangkok, Hanoi, Jakarta, Phnom Penh',
'8' => '[GMT+8] Beijing, Hong Kong, Kuala Lumpar, Manila, Perth, Singapore, Taipei',
'9' => '[GMT+9] Osaka, Sapporo, Seoul, Tokyo, Yakutsk',
'9.5' => '[GMT+9.5] Adelaide, Darwin',
'10' => '[GMT+10] Brisbane, Canberra, Guam, Hobart, Melbourne, Port Moresby, Sydney',
'11' => '[GMT+11] Magadan, New Caledonia, Solomon Is.',
'12' => '[GMT+12] Auckland, Fiji, Kamchatka, Marshall Is., Suva, Wellington'
),
'tz_zones' => array(
'-12' => '[GMT-12] Eniwetok, Kwaialein',
'-11' => '[GMT-11] Midway Island, Samoa',
'-10' => '[GMT-10] Hawaii, Honolulu',
'-9' => '[GMT-9] Alaska',
'-8' => '[GMT-8] Anchorage, Los Angeles, San Francisco, Seattle',
'-7' => '[GMT-7] Denver, Edmonton, Phoenix, Salt Lake City, Santa Fe',
'-6' => '[GMT-6] Chicago, Guatamala, Mexico City, Saskatchewan East',
'-5' => '[GMT-5] Bogota, Kingston, Lima, New York',
'-4' => '[GMT-4] Caracas, Labrador, La Paz, Maritimes, Santiago',
'-3.5' => '[GMT-3.5] Standard Time [Canada], Newfoundland',
'-3' => '[GMT-3] Brazilia, Buenos Aires, Georgetown, Rio de Janero',
'-2' => '[GMT-2] Mid-Atlantic',
'-1' => '[GMT-1] Azores, Cape Verde Is.',
'0' => '[GMT] Dublin, Edinburgh, Iceland, Lisbon, London, Casablanca',
'1' => '[GMT+1] Amsterdam, Berlin, Bern, Brussells, Madrid, Paris, Rome, Oslo, Vienna',
'2' => '[GMT+2] Athens, Bucharest, Harare, Helsinki, Israel, Istanbul',
'3' => '[GMT+3] Ankara, Baghdad, Bahrain, Beruit, Kuwait, Moscow, Nairobi, Riyadh',
'3.5' => '[GMT+3.5] Iran',
'4' => '[GMT+4] Abu Dhabi, Kabul, Muscat, Tbilisi, Volgograd',
'4.5' => '[GMT+4.5] Afghanistan',
'5' => '[GMT+5] Calcutta, Madras, New Dehli',
'5.5' => '[GMT+5.5] India',
'6' => '[GMT+6] Almaty, Dhakar, Kathmandu',
'6.5' => '[GMT+6.5] Rangoon',
'7' => '[GMT+7] Bangkok, Hanoi, Jakarta, Phnom Penh',
'8' => '[GMT+8] Beijing, Hong Kong, Kuala Lumpar, Manila, Perth, Singapore, Taipei',
'9' => '[GMT+9] Osaka, Sapporo, Seoul, Tokyo, Yakutsk',
'9.5' => '[GMT+9.5] Adelaide, Darwin',
'10' => '[GMT+10] Brisbane, Canberra, Guam, Hobart, Melbourne, Port Moresby, Sydney',
'11' => '[GMT+11] Magadan, New Caledonia, Solomon Is.',
'12' => '[GMT+12] Auckland, Fiji, Kamchatka, Marshall Is., Suva, Wellington'
),
// The value is only an example and will get replaced by the current time on view