Skip to content

Commit 859443f

Browse files
committed
fix(install): move command out of localizable string
1 parent 60f4bf7 commit 859443f

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

install/install.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,10 @@ public function upgrade(Migration $migration, $args = []): bool {
126126
}
127127
if ($hasMyisamTables) {
128128
// Need to convert myisam tables into innodb first
129-
$message = __('Upgrade tables to innoDB; run php bin/console glpi:migration:myisam_to_innodb', 'formcreator');
129+
$message = sprintf(
130+
__('Upgrade tables to innoDB; run %s', 'formcreator'),
131+
'php bin/console glpi:migration:myisam_to_innodb'
132+
);
130133
if (isCommandLine()) {
131134
echo $message . PHP_EOL;
132135
} else {
@@ -153,15 +156,12 @@ public function upgrade(Migration $migration, $args = []): bool {
153156
}
154157

155158
if (version_compare($fromSchemaVersion, '2.5') < 0) {
159+
$message = __('Upgrade from version older than 2.5.0 is no longer supported. Please upgrade to GLPI 9.5.7, upgrade Formcreator to version 2.12.5, then upgrade again to GLPI 10 or later and Formcreator 2.13 or later.', 'formcreator');
156160
if (isCommandLine()) {
157-
echo 'Upgrade from version < 2.5.0 is no longer supported.' . PHP_EOL;
158-
echo 'Please upgrade to GLPI 9.5, upgrade Formcreator to version 2.12,' . PHP_EOL;
159-
echo 'then upgrade again to GLPI 10 or later and Formcreator 2.13 or later.' . PHP_EOL;
161+
echo $message;
160162
} else {
161163
Session::addMessageAfterRedirect(
162-
'Upgrade from version < 2.5.0 is no longer supported.<br>' .
163-
'Please upgrade to GLPI 9.5, upgrade Formcreator to version 2.12,<br>' .
164-
'then upgrade again to GLPI 10 or later and Formcreator 2.13 or later.',
164+
$message,
165165
true,
166166
ERROR
167167
);

0 commit comments

Comments
 (0)