From aeeeb8ac0b063af3062ae56fda25a1316661e64b Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Fri, 29 Apr 2016 17:12:25 +0200 Subject: [PATCH] Fixed error reporting in database setup --- wcfsetup/setup/lang/setup_de.xml | 2 +- wcfsetup/setup/lang/setup_en.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml index 264cb2f27f..69d8d2bbd2 100644 --- a/wcfsetup/setup/lang/setup_de.xml +++ b/wcfsetup/setup/lang/setup_de.xml @@ -50,7 +50,7 @@ 1 wählen.]]> {$exception->getMessage()}{if $exception|get_class == 'DatabaseException'}
{$exception->getErrorDesc()}{/if}]]> +
{$exception->getMessage()}{if $exception->getPrevious()}
{$exception->getPrevious()->getMessage()}{/if}]]> 1}n{/if} existier{if $conflictedTables|count > 1}en{else}t{/if} schon in der Datenbank „{$dbName}“:
{implode from=$conflictedTables item="table"}{$table}{/implode}.

Um dieses Problem zu beheben, können Sie:
1. diese Tabelle{if $conflictedTables|count > 1}n{/if} manuell löschen und die „Weiter“ Schaltfläche betätigen, oder
2. Sie geben die Daten einer anderen Datenbank ein und betätigen die „Weiter“ Schaltfläche, oder
3. Sie geben eine von „{$dbNumber}“ unterschiedliche Installationsnummer an und betätigen die „Weiter“ Schaltfläche.]]> diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml index 344d87abaa..6c4c82a4d3 100644 --- a/wcfsetup/setup/lang/setup_en.xml +++ b/wcfsetup/setup/lang/setup_en.xml @@ -50,7 +50,7 @@ 1.]]> {$exception->getMessage()}{if $exception|get_class == 'DatabaseException'}
{$exception->getErrorDesc()}{/if}]]> +
{$exception->getMessage()}{if $exception->getPrevious()}
{$exception->getPrevious()->getMessage()}{/if}]]> 1}s{/if} already exist{if $conflictedTables|count == 1}s{/if} within your “{$dbName}” Database:
{implode from=$conflictedTables item="table"}{$table}{/implode}.

To solve this problem, please do one of the following:
1. Remove the table{if $conflictedTables|count > 1}s{/if} manually and continue the installation with the “Next” button or
2. You re-enter the database access information, but to a different database and continue the installation with the “Next” button or
3. Enter a new installation number, not forgetting to continue the installation with the “Next” Button.]]> -- 2.20.1