From 173e1ceeba784b8171102324a8625317225597f2 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 10 Jun 2024 20:46:58 -0700 Subject: [PATCH] [ticket/17335] Move HTML from lang to template PHPBB-17335 Signed-off-by: Matt Friedman --- phpBB/adm/style/acp_ext_list.html | 25 ++++++++++++++++--- phpBB/language/en/acp/extensions.php | 36 ++++++++++++++-------------- 2 files changed, 40 insertions(+), 21 deletions(-) diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index dd006bc2cc..b8b3d2c68a 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -104,19 +104,38 @@ {L_EXTENSION_INSTALLING_HEADLINE} - {L_EXTENSION_INSTALLING_EXPLAIN} + +
    +
  1. {{ lang(['EXTENSION_INSTALLING_EXPLAIN', 'step_1']) }}
    2. +
  2. {{ lang(['EXTENSION_INSTALLING_EXPLAIN', 'step_2']) }}
    3. +
  3. {{ lang(['EXTENSION_INSTALLING_EXPLAIN', 'step_3']) }}
    4. +
+ {L_EXTENSION_UPDATING_HEADLINE} - {L_EXTENSION_UPDATING_EXPLAIN} + +
    +
  1. {{ lang(['EXTENSION_UPDATING_EXPLAIN', 'step_1']) }}
    2. +
  2. {{ lang(['EXTENSION_UPDATING_EXPLAIN', 'step_2']) }}
    3. +
  3. {{ lang(['EXTENSION_UPDATING_EXPLAIN', 'step_3']) }}
    4. +
  4. {{ lang(['EXTENSION_UPDATING_EXPLAIN', 'step_4']) }}
    5. +
+ {L_EXTENSION_REMOVING_HEADLINE} - {L_EXTENSION_REMOVING_EXPLAIN} + +
    +
  1. {{ lang(['EXTENSION_REMOVING_EXPLAIN', 'step_1']) }}
    2. +
  2. {{ lang(['EXTENSION_REMOVING_EXPLAIN', 'step_2']) }}
    3. +
  3. {{ lang(['EXTENSION_REMOVING_EXPLAIN', 'step_3']) }}
    4. +
+ diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 3a8322ae0b..311cfa74f3 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -89,25 +89,25 @@ $lang = array_merge($lang, array( 'EXTENSION_NAME' => 'Extension Name', 'EXTENSION_ACTIONS' => 'Actions', 'EXTENSION_OPTIONS' => 'Options', - 'EXTENSION_INSTALLING_HEADLINE'=> 'Installing an extension', - 'EXTENSION_INSTALLING_EXPLAIN' => '
    -
  1. Download an extension from phpBB’s extensions database
    2. -
  2. Unzip the extension and upload it to the ext/ directory of your phpBB board
    3. -
  3. Enable the extension, here in the Extensions manager
    4. -
', - 'EXTENSION_REMOVING_EXPLAIN' => '
    -
  1. Disable the extension
    2. -
  2. Delete the extension’s data
    3. -
  3. Delete the extension’s files from the filesystem
    4. -
', - 'EXTENSION_UPDATING_HEADLINE' => 'Updating an extension', - 'EXTENSION_UPDATING_EXPLAIN' => '
    -
  1. Disable the extension
    2. -
  2. Delete the extension’s files from the filesystem
    3. -
  3. Upload the new files
    4. -
  4. Enable the extension
    5. -
', + 'EXTENSION_INSTALLING_HEADLINE' => 'Installing an extension', + 'EXTENSION_INSTALLING_EXPLAIN' => [ + 'step_1' => 'Download an extension from phpBB’s extensions database', + 'step_2' => 'Unzip the extension and upload it to the ext/ directory of your phpBB board', + 'step_3' => 'Enable the extension, here in the Extensions manager', + ], 'EXTENSION_REMOVING_HEADLINE' => 'Deleting an extension from your board', + 'EXTENSION_REMOVING_EXPLAIN' => [ + 'step_1' => 'Disable the extension', + 'step_2' => 'Delete the extension’s data', + 'step_3' => 'Delete the extension‘s files from the filesystem', + ], + 'EXTENSION_UPDATING_HEADLINE' => 'Updating an extension', + 'EXTENSION_UPDATING_EXPLAIN' => [ + 'step_1' => 'Disable the extension', + 'step_2' => 'Delete the extension’s files from the filesystem', + 'step_3' => 'Upload the new files', + 'step_4' => 'Enable the extension', + ], 'EXTENSION_DELETE_DATA_CONFIRM' => 'Are you sure that you wish to delete the data associated with “%s”?

This removes all of its data and settings and cannot be undone!', 'EXTENSION_DISABLE_CONFIRM' => 'Are you sure that you wish to disable the “%s” extension?',