1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 10:16:36 +02:00

Merge remote-tracking branch 'EXreaction/feature/migrations-data' into develop

# By Nathan Guse (14) and Nathaniel Guse (4)
# Via Nathaniel Guse
* EXreaction/feature/migrations-data:
  [feature/migrations] Inject migrator rather than the container.
  [feature/migrations] Use the user class for language handling
  [feature/migrations] Fully revert the removal of the user_msnm field
  [feature/migrations] Revert unrelated change to schema_data.sql
  [feature/migrations] Remove user_msnm migration
  [feature/migrations] Correct depends_on
  [feature/migrations] Subdirectories for migration data
  [feature/migrations] Reports table schema changes in recent develop
  [feature/migrations] Automatically populate migrations table on install
  [feature/migrations] effectively installed check for migration data
  [feature/migrations] Comments for the return in the custom functions
  [feature/migrations] Order the migrations schema in schema_data.sql
  [feature/migrations] Fix migrations installer, schema for schema_data.sql
  [feature/migrations] Make depends_on static to call it without dependencies
  [feature/migrations] Remove hardcoded language, use lang instead.
  [feature/migrations] Revert schema for migration data
  [feature/migrations] Replace database_update.php with migrations updater
  [feature/migrations] Rebuilding migrations data on develop
This commit is contained in:
David King
2013-02-26 14:20:12 -05:00
46 changed files with 3350 additions and 2831 deletions

View File

@@ -397,7 +397,10 @@ $lang = array_merge($lang, array(
'CURRENT_VERSION' => 'Current version',
'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_NOT_COMPLETED' => 'The database update has not yet completed.',
'DELETE_USER_REMOVE' => 'Delete user and remove posts',
'DELETE_USER_RETAIN' => 'Delete user but keep posts',
'DESTINATION' => 'Destination file',