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

[feature/migrations] Remove hardcoded language, use lang instead.

Browse source 
PHPBB3-9737
This commit is contained in:
Nathan Guse 2013-01-10 17:25:53 -06:00
parent ca55f6c481
commit babdb92aa9
2 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
phpBB/install/database_update.php
View file

@ -21,26 +21,6 @@ define('IN_INSTALL', true);
$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
$phpEx = substr(strrchr(__FILE__, '.'), 1); $phpEx = substr(strrchr(__FILE__, '.'), 1);
if (!function_exists('phpbb_require_updated'))
{
function phpbb_require_updated($path, $optional = false)
{
global $phpbb_root_path;
$new_path = $phpbb_root_path . 'install/update/new/' . $path;
$old_path = $phpbb_root_path . $path;
if (file_exists($new_path))
{
require($new_path);
}
else if (!$optional || file_exists($old_path))
{
require($old_path);
}
}
}
phpbb_require_updated('includes/startup.' . $phpEx); phpbb_require_updated('includes/startup.' . $phpEx);
include($phpbb_root_path . 'config.' . $phpEx); include($phpbb_root_path . 'config.' . $phpEx);
@ -200,7 +180,7 @@ while (!$migrator->finished())
{ {
echo $e; echo $e;
end_update($cache); phpbb_end_update($cache);
} }
echo $migrator->last_run_migration['name'] . '<br />'; echo $migrator->last_run_migration['name'] . '<br />';
@ -209,10 +189,10 @@ 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 'Update not yet completed.<br />'; echo $lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br />';
echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">Continue</a>'; echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">' . $lang['DATABASE_UPDATE_CONTINUE'] . '</a>';
end_update($cache); phpbb_end_update($cache);
} }
} }
@ -221,11 +201,31 @@ 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 'Finished'; echo $lang['DATABASE_UPDATE_COMPLETE'];
end_update($cache); phpbb_end_update($cache);
function end_update($cache) if (!function_exists('phpbb_require_updated'))
{
function phpbb_require_updated($path, $optional = false)
{
global $phpbb_root_path;
$new_path = $phpbb_root_path . 'install/update/new/' . $path;
$old_path = $phpbb_root_path . $path;
if (file_exists($new_path))
{
require($new_path);
}
else if (!$optional || file_exists($old_path))
{
require($old_path);
}
}
}
function phpbb_end_update($cache)
{ {
$cache->purge(); $cache->purge();

3
phpBB/language/en/install.php
View file

@ -397,7 +397,10 @@ $lang = array_merge($lang, array(
'CURRENT_VERSION' => 'Current version', 'CURRENT_VERSION' => 'Current version',
'DATABASE_TYPE' => 'Database type', 'DATABASE_TYPE' => 'Database type',
'DATABASE_UPDATE_COMPLETE' => 'Database updater has completed!',
'DATABASE_UPDATE_CONTINUE' => 'Continue database update.',
'DATABASE_UPDATE_INFO_OLD' => 'The database update file within the install directory is outdated. Please make sure you uploaded the correct version of the file.', 'DATABASE_UPDATE_INFO_OLD' => 'The database update file within the install directory is outdated. Please make sure you uploaded the correct version of the file.',
'DATABASE_UPDATE_NOT_COMPLETED' => 'The database update has not yet completed.',
'DELETE_USER_REMOVE' => 'Delete user and remove posts', 'DELETE_USER_REMOVE' => 'Delete user and remove posts',
'DELETE_USER_RETAIN' => 'Delete user but keep posts', 'DELETE_USER_RETAIN' => 'Delete user but keep posts',
'DESTINATION' => 'Destination file', 'DESTINATION' => 'Destination file',