diff --git a/install/steps/5-database.php b/install/steps/5-database.php index 0c94e62c..945a6cd5 100644 --- a/install/steps/5-database.php +++ b/install/steps/5-database.php @@ -48,9 +48,11 @@ if(!$error) { require BASE . 'install/includes/config.php'; if(!$error) { - success($locale['step_database_importing']); require BASE . 'install/includes/database.php'; + $locale['step_database_importing'] = str_replace('$DATABASE_NAME$', config('database_name'), $locale['step_database_importing']); + success($locale['step_database_importing']); + if(isset($database_error)) { // we failed connect to the database error($database_error); } diff --git a/system/locale/de/install.php b/system/locale/de/install.php index 5c4cc685..de18dc72 100644 --- a/system/locale/de/install.php +++ b/system/locale/de/install.php @@ -62,7 +62,7 @@ $locale['step_config_usage_desc'] = 'MyAAC erlauben, anonyme Nutzungsstatistiken // database $locale['step_database'] = 'Schema importieren'; $locale['step_database_title'] = 'MySQL schema importieren'; -$locale['step_database_importing'] = 'Ihre Datenbank ist MySQL. Schema wird jetzt importiert...'; +$locale['step_database_importing'] = 'Ihre Datenbank ist MySQL. Datenbankname ist: "$DATABASE_NAME$". Schema wird jetzt importiert...'; $locale['step_database_error_path'] = 'Bitte geben Sie den Serverpfad an.'; $locale['step_database_error_config'] = 'Datei config.lua kann nicht gefunden werden. Ist der Serverpfad korrekt? Gehen Sie zurück und überprüfen Sie noch einmal.'; $locale['step_database_error_database_empty'] = 'Der Datenbanktyp kann nicht aus config.lua ermittelt werden. Ihr OTS wird von diesem AAC nicht unterstützt.'; diff --git a/system/locale/en/install.php b/system/locale/en/install.php index ac08b243..f3d55e88 100644 --- a/system/locale/en/install.php +++ b/system/locale/en/install.php @@ -62,7 +62,7 @@ $locale['step_config_usage_desc'] = 'Allow MyAAC to report anonymous usage stati // database $locale['step_database'] = 'Import schema'; $locale['step_database_title'] = 'Import MySQL schema'; -$locale['step_database_importing'] = 'Your database is MySQL. Importing schema now...'; +$locale['step_database_importing'] = 'Your database is MySQL. Database name is: "$DATABASE_NAME$". Importing schema now...'; $locale['step_database_error_path'] = 'Please specify server path.'; $locale['step_database_error_config'] = 'Cannot find config.lua file. Is your server path correct? Go back and check again.'; $locale['step_database_error_database_empty'] = 'Cannot determine database type from config.lua. Your OTS is unsupported by this AAC.'; diff --git a/system/locale/pl/install.php b/system/locale/pl/install.php index 87b90d30..10a27734 100644 --- a/system/locale/pl/install.php +++ b/system/locale/pl/install.php @@ -58,7 +58,7 @@ $locale['step_config_usage_desc'] = 'Zezwalaj MyAAC na raportowanie anonimowych // database $locale['step_database'] = 'Baza Danych'; $locale['step_database_title'] = 'Baza MySQL'; -$locale['step_database_importing'] = 'Twoja baza to MySQL. Importowanie schematu...'; +$locale['step_database_importing'] = 'Twoja baza to MySQL. Nazwa bazy danych to: "$DATABASE_NAME$". Importowanie schematu...'; $locale['step_database_error_path'] = 'Proszę podać ścieżkę do serwera.'; $locale['step_database_error_config'] = 'Nie można znaleźć pliku config.lua. Czy ścieżka do katalogu serwera jest poprawna? Wróć się i sprawdź ponownie.'; $locale['step_database_error_database_empty'] = 'Nie można wykryć typu bazy danych z pliku config.lua. Prawdopodobnie Twój OTS nie jest wspierany przez ten AAC.'; diff --git a/system/locale/pt_br/install.php b/system/locale/pt_br/install.php index 001dfed7..0c239e7e 100644 --- a/system/locale/pt_br/install.php +++ b/system/locale/pt_br/install.php @@ -62,7 +62,7 @@ $locale['step_config_usage_desc'] = 'Permitir que o MyAAC informe estatísticas // database $locale['step_database'] = 'Importar schema'; $locale['step_database_title'] = 'Importar MySQL schema'; -$locale['step_database_importing'] = 'Seu banco de dados é o MySQL. Importando schema agora...'; +$locale['step_database_importing'] = 'Seu banco de dados é o MySQL. O nome do banco de dados é: "$DATABASE_NAME$". Importando schema agora...'; $locale['step_database_error_path'] = 'Por favor, especifique o caminho da pasta do servidor.'; $locale['step_database_error_config'] = 'Não é possível encontrar o arquivo config.lua. O caminho da pasta do seu servidor está correto? Volte e verifique novamente.'; $locale['step_database_error_database_empty'] = 'Não é possível determinar o tipo de banco de dados a partir do config.lua. Seu OTS não é suportado por este AAC.'; diff --git a/system/locale/sv/install.php b/system/locale/sv/install.php index 77fdc5a5..81c4f608 100644 --- a/system/locale/sv/install.php +++ b/system/locale/sv/install.php @@ -56,7 +56,7 @@ $locale['step_config_client_desc'] = 'Används för nerladdningssidan och teman. // database $locale['step_database'] = 'Importera schema'; $locale['step_database_title'] = 'Importera MySQL schema'; -$locale['step_database_importing'] = 'Din databas är MySQL. Importerar schema nu...'; +$locale['step_database_importing'] = 'Din databas är MySQL. Databasnamnet är: "$DATABASE_NAME$". Importerar schema nu...'; $locale['step_database_error_path'] = 'Ange server mapp.'; $locale['step_database_error_config'] = 'Kan inte hitta konfigurations fil. Är din server mapp korrekt? Gå tillbaka och kolla igen.'; $locale['step_database_error_database_empty'] = 'Kan inte bestämma databas typ från config.lua. Din OTS stöds inte av MyAAC.';