mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 19:24:13 +02:00
Code Issues Releases Wiki Activity

[feature/migrations] Use the user class for language handling

Browse Source 
Also localise error messages from the migrator

PHBB3-9737
This commit is contained in:
Nathaniel Guse 2013-02-23 16:12:24 -06:00
parent 4bf64b5e38
commit f6a894f077
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
phpBB/install/database_update.php
View File

@ -133,9 +133,7 @@ set_config(null, null, null, $config);
set_config_count(null, null, null, $config); set_config_count(null, null, null, $config);
$orig_version = $config['version']; $orig_version = $config['version'];
include($phpbb_root_path . 'language/' . $config['default_lang'] . '/common.' . $phpEx); $user->add_lang(array('common', 'acp/common', 'install', 'migrator'));
include($phpbb_root_path . 'language/' . $config['default_lang'] . '/acp/common.' . $phpEx);
include($phpbb_root_path . 'language/' . $config['default_lang'] . '/install.' . $phpEx);
// Add own hook handler, if present. :o // Add own hook handler, if present. :o
if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx)) if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx))
@ -157,11 +155,11 @@ else
header('Content-type: text/html; charset=UTF-8'); header('Content-type: text/html; charset=UTF-8');
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>"> <html dir="<?php echo $user->lang['DIRECTION']; ?>" lang="<?php echo $user->lang['USER_LANG']; ?>">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title> <title><?php echo $user->lang['UPDATING_TO_LATEST_STABLE']; ?></title>
<link href="<?php echo htmlspecialchars($phpbb_admin_path); ?>style/admin.css" rel="stylesheet" type="text/css" media="screen" /> <link href="<?php echo htmlspecialchars($phpbb_admin_path); ?>style/admin.css" rel="stylesheet" type="text/css" media="screen" />
@ -178,12 +176,12 @@ header('Content-type: text/html; charset=UTF-8');
<div id="content"> <div id="content">
<div id="main" class="install-body"> <div id="main" class="install-body">
<h1><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></h1> <h1><?php echo $user->lang['UPDATING_TO_LATEST_STABLE']; ?></h1>
<br /> <br />
<p><?php echo $lang['DATABASE_TYPE']; ?> :: <strong><?php echo $db->sql_layer; ?></strong><br /> <p><?php echo $user->lang['DATABASE_TYPE']; ?> :: <strong><?php echo $db->sql_layer; ?></strong><br />
<?php echo $lang['PREVIOUS_VERSION']; ?> :: <strong><?php echo $config['version']; ?></strong><br /> <?php echo $user->lang['PREVIOUS_VERSION']; ?> :: <strong><?php echo $config['version']; ?></strong><br />
<?php <?php
@ -225,7 +223,7 @@ while (!$migrator->finished())
} }
catch (phpbb_db_migration_exception $e) catch (phpbb_db_migration_exception $e)
{ {
echo $e; echo $e->getLocalisedMessage($user);
phpbb_end_update($cache); phpbb_end_update($cache);
} }
@ -236,8 +234,8 @@ while (!$migrator->finished())
if ((time() - $update_start_time) >= $safe_time_limit) if ((time() - $update_start_time) >= $safe_time_limit)
{ {
//echo '<meta http-equiv="refresh" content="0;url=' . str_replace('&', '&amp;', append_sid($phpbb_root_path . 'test.' . $phpEx)) . '" />'; //echo '<meta http-equiv="refresh" content="0;url=' . str_replace('&', '&amp;', append_sid($phpbb_root_path . 'test.' . $phpEx)) . '" />';
echo $lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br />'; echo $user->lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br />';
echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">' . $lang['DATABASE_UPDATE_CONTINUE'] . '</a>'; echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>';
phpbb_end_update($cache); phpbb_end_update($cache);
} }
@ -248,6 +246,6 @@ if ($orig_version != $config['version'])
add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $config['version']); add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $config['version']);
} }
echo $lang['DATABASE_UPDATE_COMPLETE']; echo $user->lang['DATABASE_UPDATE_COMPLETE'];
phpbb_end_update($cache); phpbb_end_update($cache);