From 3fbdb2f345cc5fb132755033ba3b9d2fa061218e Mon Sep 17 00:00:00 2001 From: 3D-I Date: Tue, 13 Aug 2019 04:30:48 +0200 Subject: [ticket/16019] Deny prosilver's uninstallation PHPBB3-16019 --- phpBB/language/en/acp/styles.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/language/en/acp') diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index ab85d9d2f5..bfa8753a74 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -84,7 +84,8 @@ $lang = array_merge($lang, array( 'STYLE_USED_BY' => 'Used by (including robots)', 'STYLE_VERSION' => 'Style version', - 'UNINSTALL_DEFAULT' => 'You cannot uninstall the default style.', + 'UNINSTALL_PROSILVER' => 'You cannot uninstall the style “prosilver”.', + 'UNINSTALL_DEFAULT' => 'You cannot uninstall the default style.', 'BROWSE_STYLES_DATABASE' => 'Browse styles database', )); -- cgit v1.2.1 From 6a79083c434ec679ef3e8061824d0fc0f6e65c8c Mon Sep 17 00:00:00 2001 From: 3D-I Date: Wed, 14 Aug 2019 05:08:13 +0200 Subject: [ticket/16019] Rewamp ACP_STYLES_EXPLAIN PHPBB3-16019 --- phpBB/language/en/acp/styles.php | 70 ++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'phpBB/language/en/acp') diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index bfa8753a74..3d5c0f1251 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -37,55 +37,55 @@ if (empty($lang) || !is_array($lang)) // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine $lang = array_merge($lang, array( - 'ACP_STYLES_EXPLAIN' => 'Here you can manage the available styles on your board. You may alter existing styles, delete, deactivate, reactivate, install new ones. You can also see what a style will look like using the preview function. Also listed is the total user count for each style, note that overriding user styles will not be reflected here.', + 'ACP_STYLES_EXPLAIN' => 'Here you can manage the styles available on your board. You can delete, deactivate, activate or reactivate them or install new ones. Please note that for obvious reasons like provide proper board operation you cannot uninstall the “prosilver” style. You can also see what a style will look like by using the preview function. Also listed is the total user count for each style, note that overwritten user styles will not be reflected here.', 'CANNOT_BE_INSTALLED' => 'Cannot be installed', 'CONFIRM_UNINSTALL_STYLES' => 'Are you sure you wish to uninstall selected styles?', 'COPYRIGHT' => 'Copyright', - 'DEACTIVATE_DEFAULT' => 'You cannot deactivate the default style.', - 'DELETE_FROM_FS' => 'Delete from filesystem', - 'DELETE_STYLE_FILES_FAILED' => 'Error deleting files for style "%s".', + 'DEACTIVATE_DEFAULT' => 'You cannot deactivate the default style.', + 'DELETE_FROM_FS' => 'Delete from filesystem', + 'DELETE_STYLE_FILES_FAILED' => 'Error deleting files for style "%s".', 'DELETE_STYLE_FILES_SUCCESS' => 'Files for style "%s" have been deleted.', - 'DETAILS' => 'Details', + 'DETAILS' => 'Details', - 'INHERITING_FROM' => 'Inherits from', - 'INSTALL_STYLE' => 'Install style', - 'INSTALL_STYLES' => 'Install styles', - 'INSTALL_STYLES_EXPLAIN' => 'Here you can install new styles.
If you cannot find a specific style in list below, check to make sure style is already installed. If it is not installed, check if it was uploaded correctly.', - 'INVALID_STYLE_ID' => 'Invalid style ID.', + 'INHERITING_FROM' => 'Inherits from', + 'INSTALL_STYLE' => 'Install style', + 'INSTALL_STYLES' => 'Install styles', + 'INSTALL_STYLES_EXPLAIN' => 'Here you can install new styles.
If you cannot find a specific style in list below, check to make sure style is already installed. If it is not installed, check if it was uploaded correctly.', + 'INVALID_STYLE_ID' => 'Invalid style ID.', - 'NO_MATCHING_STYLES_FOUND' => 'No styles match your query.', - 'NO_UNINSTALLED_STYLE' => 'No uninstalled styles detected.', + 'NO_MATCHING_STYLES_FOUND' => 'No styles match your query.', + 'NO_UNINSTALLED_STYLE' => 'No uninstalled styles detected.', - 'PURGED_CACHE' => 'Cache was purged.', + 'PURGED_CACHE' => 'Cache was purged.', - 'REQUIRES_STYLE' => 'This style requires the style "%s" to be installed.', + 'REQUIRES_STYLE' => 'This style requires the style "%s" to be installed.', - 'STYLE_ACTIVATE' => 'Activate', - 'STYLE_ACTIVE' => 'Active', - 'STYLE_DEACTIVATE' => 'Deactivate', - 'STYLE_DEFAULT' => 'Make default style', + 'STYLE_ACTIVATE' => 'Activate', + 'STYLE_ACTIVE' => 'Active', + 'STYLE_DEACTIVATE' => 'Deactivate', + 'STYLE_DEFAULT' => 'Make default style', 'STYLE_DEFAULT_CHANGE_INACTIVE' => 'You must activate style before making it default style.', - 'STYLE_ERR_INVALID_PARENT' => 'Invalid parent style.', - 'STYLE_ERR_NAME_EXIST' => 'A style with that name already exists.', - 'STYLE_ERR_STYLE_NAME' => 'You must supply a name for this style.', - 'STYLE_INSTALLED' => 'Style "%s" has been installed.', + 'STYLE_ERR_INVALID_PARENT' => 'Invalid parent style.', + 'STYLE_ERR_NAME_EXIST' => 'A style with that name already exists.', + 'STYLE_ERR_STYLE_NAME' => 'You must supply a name for this style.', + 'STYLE_INSTALLED' => 'Style "%s" has been installed.', 'STYLE_INSTALLED_RETURN_INSTALLED_STYLES' => 'Return to installed styles list', 'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES' => 'Install more styles', - 'STYLE_NAME' => 'Style name', - 'STYLE_NAME_RESERVED' => 'Style "%s" can not be installed, because the name is reserved.', - 'STYLE_NOT_INSTALLED' => 'Style "%s" was not installed.', - 'STYLE_PATH' => 'Style path', - 'STYLE_UNINSTALL' => 'Uninstall', - 'STYLE_UNINSTALL_DEPENDENT' => 'Style "%s" cannot be uninstalled because it has one or more child styles.', - 'STYLE_UNINSTALLED' => 'Style "%s" uninstalled successfully.', - 'STYLE_PHPBB_VERSION' => 'phpBB Version', - 'STYLE_USED_BY' => 'Used by (including robots)', - 'STYLE_VERSION' => 'Style version', + 'STYLE_NAME' => 'Style name', + 'STYLE_NAME_RESERVED' => 'Style "%s" can not be installed, because the name is reserved.', + 'STYLE_NOT_INSTALLED' => 'Style "%s" was not installed.', + 'STYLE_PATH' => 'Style path', + 'STYLE_UNINSTALL' => 'Uninstall', + 'STYLE_UNINSTALL_DEPENDENT' => 'Style "%s" cannot be uninstalled because it has one or more child styles.', + 'STYLE_UNINSTALLED' => 'Style "%s" uninstalled successfully.', + 'STYLE_PHPBB_VERSION' => 'phpBB Version', + 'STYLE_USED_BY' => 'Used by (including robots)', + 'STYLE_VERSION' => 'Style version', - 'UNINSTALL_PROSILVER' => 'You cannot uninstall the style “prosilver”.', - 'UNINSTALL_DEFAULT' => 'You cannot uninstall the default style.', + 'UNINSTALL_PROSILVER' => 'You cannot uninstall the style “prosilver”.', + 'UNINSTALL_DEFAULT' => 'You cannot uninstall the default style.', - 'BROWSE_STYLES_DATABASE' => 'Browse styles database', + 'BROWSE_STYLES_DATABASE' => 'Browse styles database', )); -- cgit v1.2.1 From a8f2b461d41eebfe25c1dda4f9d76468fd4ed9b7 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Wed, 14 Aug 2019 05:28:18 +0200 Subject: [ticket/16019] Short array syntax and tabulation PHPBB3-16019 --- phpBB/language/en/acp/styles.php | 86 ++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'phpBB/language/en/acp') diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 3d5c0f1251..2e55d9ede6 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -21,7 +21,7 @@ if (!defined('IN_PHPBB')) if (empty($lang) || !is_array($lang)) { - $lang = array(); + $lang = []; } // DEVELOPERS PLEASE NOTE @@ -36,56 +36,56 @@ if (empty($lang) || !is_array($lang)) // equally where a string contains only two placeholders which are used to wrap text // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine -$lang = array_merge($lang, array( - 'ACP_STYLES_EXPLAIN' => 'Here you can manage the styles available on your board. You can delete, deactivate, activate or reactivate them or install new ones. Please note that for obvious reasons like provide proper board operation you cannot uninstall the “prosilver” style. You can also see what a style will look like by using the preview function. Also listed is the total user count for each style, note that overwritten user styles will not be reflected here.', +$lang = array_merge($lang, [ + 'ACP_STYLES_EXPLAIN' => 'Here you can manage the styles available on your board. You can delete, deactivate, activate or reactivate them or install new ones. Please note that for obvious reasons like provide proper board operation you cannot uninstall the “prosilver” style. You can also see what a style will look like by using the preview function. Also listed is the total user count for each style, note that overwritten user styles will not be reflected here.', - 'CANNOT_BE_INSTALLED' => 'Cannot be installed', - 'CONFIRM_UNINSTALL_STYLES' => 'Are you sure you wish to uninstall selected styles?', - 'COPYRIGHT' => 'Copyright', + 'CANNOT_BE_INSTALLED' => 'Cannot be installed', + 'CONFIRM_UNINSTALL_STYLES' => 'Are you sure you wish to uninstall selected styles?', + 'COPYRIGHT' => 'Copyright', - 'DEACTIVATE_DEFAULT' => 'You cannot deactivate the default style.', - 'DELETE_FROM_FS' => 'Delete from filesystem', - 'DELETE_STYLE_FILES_FAILED' => 'Error deleting files for style "%s".', - 'DELETE_STYLE_FILES_SUCCESS' => 'Files for style "%s" have been deleted.', - 'DETAILS' => 'Details', + 'DEACTIVATE_DEFAULT' => 'You cannot deactivate the default style.', + 'DELETE_FROM_FS' => 'Delete from filesystem', + 'DELETE_STYLE_FILES_FAILED' => 'Error deleting files for style "%s".', + 'DELETE_STYLE_FILES_SUCCESS' => 'Files for style "%s" have been deleted.', + 'DETAILS' => 'Details', - 'INHERITING_FROM' => 'Inherits from', - 'INSTALL_STYLE' => 'Install style', - 'INSTALL_STYLES' => 'Install styles', - 'INSTALL_STYLES_EXPLAIN' => 'Here you can install new styles.
If you cannot find a specific style in list below, check to make sure style is already installed. If it is not installed, check if it was uploaded correctly.', - 'INVALID_STYLE_ID' => 'Invalid style ID.', + 'INHERITING_FROM' => 'Inherits from', + 'INSTALL_STYLE' => 'Install style', + 'INSTALL_STYLES' => 'Install styles', + 'INSTALL_STYLES_EXPLAIN' => 'Here you can install new styles.
If you cannot find a specific style in list below, check to make sure style is already installed. If it is not installed, check if it was uploaded correctly.', + 'INVALID_STYLE_ID' => 'Invalid style ID.', - 'NO_MATCHING_STYLES_FOUND' => 'No styles match your query.', - 'NO_UNINSTALLED_STYLE' => 'No uninstalled styles detected.', + 'NO_MATCHING_STYLES_FOUND' => 'No styles match your query.', + 'NO_UNINSTALLED_STYLE' => 'No uninstalled styles detected.', - 'PURGED_CACHE' => 'Cache was purged.', + 'PURGED_CACHE' => 'Cache was purged.', - 'REQUIRES_STYLE' => 'This style requires the style "%s" to be installed.', + 'REQUIRES_STYLE' => 'This style requires the style "%s" to be installed.', - 'STYLE_ACTIVATE' => 'Activate', - 'STYLE_ACTIVE' => 'Active', - 'STYLE_DEACTIVATE' => 'Deactivate', - 'STYLE_DEFAULT' => 'Make default style', - 'STYLE_DEFAULT_CHANGE_INACTIVE' => 'You must activate style before making it default style.', - 'STYLE_ERR_INVALID_PARENT' => 'Invalid parent style.', - 'STYLE_ERR_NAME_EXIST' => 'A style with that name already exists.', - 'STYLE_ERR_STYLE_NAME' => 'You must supply a name for this style.', - 'STYLE_INSTALLED' => 'Style "%s" has been installed.', + 'STYLE_ACTIVATE' => 'Activate', + 'STYLE_ACTIVE' => 'Active', + 'STYLE_DEACTIVATE' => 'Deactivate', + 'STYLE_DEFAULT' => 'Make default style', + 'STYLE_DEFAULT_CHANGE_INACTIVE' => 'You must activate style before making it default style.', + 'STYLE_ERR_INVALID_PARENT' => 'Invalid parent style.', + 'STYLE_ERR_NAME_EXIST' => 'A style with that name already exists.', + 'STYLE_ERR_STYLE_NAME' => 'You must supply a name for this style.', + 'STYLE_INSTALLED' => 'Style "%s" has been installed.', 'STYLE_INSTALLED_RETURN_INSTALLED_STYLES' => 'Return to installed styles list', 'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES' => 'Install more styles', - 'STYLE_NAME' => 'Style name', - 'STYLE_NAME_RESERVED' => 'Style "%s" can not be installed, because the name is reserved.', - 'STYLE_NOT_INSTALLED' => 'Style "%s" was not installed.', - 'STYLE_PATH' => 'Style path', - 'STYLE_UNINSTALL' => 'Uninstall', - 'STYLE_UNINSTALL_DEPENDENT' => 'Style "%s" cannot be uninstalled because it has one or more child styles.', - 'STYLE_UNINSTALLED' => 'Style "%s" uninstalled successfully.', - 'STYLE_PHPBB_VERSION' => 'phpBB Version', - 'STYLE_USED_BY' => 'Used by (including robots)', - 'STYLE_VERSION' => 'Style version', + 'STYLE_NAME' => 'Style name', + 'STYLE_NAME_RESERVED' => 'Style "%s" can not be installed, because the name is reserved.', + 'STYLE_NOT_INSTALLED' => 'Style "%s" was not installed.', + 'STYLE_PATH' => 'Style path', + 'STYLE_UNINSTALL' => 'Uninstall', + 'STYLE_UNINSTALL_DEPENDENT' => 'Style "%s" cannot be uninstalled because it has one or more child styles.', + 'STYLE_UNINSTALLED' => 'Style "%s" uninstalled successfully.', + 'STYLE_PHPBB_VERSION' => 'phpBB Version', + 'STYLE_USED_BY' => 'Used by (including robots)', + 'STYLE_VERSION' => 'Style version', - 'UNINSTALL_PROSILVER' => 'You cannot uninstall the style “prosilver”.', - 'UNINSTALL_DEFAULT' => 'You cannot uninstall the default style.', + 'UNINSTALL_PROSILVER' => 'You cannot uninstall the style “prosilver”.', + 'UNINSTALL_DEFAULT' => 'You cannot uninstall the default style.', - 'BROWSE_STYLES_DATABASE' => 'Browse styles database', -)); + 'BROWSE_STYLES_DATABASE' => 'Browse styles database', +]); -- cgit v1.2.1 From 397598348198bb0d63556bdce7d943e73ddd558f Mon Sep 17 00:00:00 2001 From: 3D-I Date: Wed, 14 Aug 2019 18:46:17 +0200 Subject: [ticket/16019] Short explanation PHPBB3-16019 --- phpBB/language/en/acp/styles.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en/acp') diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 2e55d9ede6..fd5793d699 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -37,7 +37,7 @@ if (empty($lang) || !is_array($lang)) // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine $lang = array_merge($lang, [ - 'ACP_STYLES_EXPLAIN' => 'Here you can manage the styles available on your board. You can delete, deactivate, activate or reactivate them or install new ones. Please note that for obvious reasons like provide proper board operation you cannot uninstall the “prosilver” style. You can also see what a style will look like by using the preview function. Also listed is the total user count for each style, note that overwritten user styles will not be reflected here.', + 'ACP_STYLES_EXPLAIN' => 'Here you can manage the styles available on your board.
Overwritten user styles will not be reflected here. Please note you cannot uninstall the “prosilver” style as it is phpBB’s default and primary parent style.', 'CANNOT_BE_INSTALLED' => 'Cannot be installed', 'CONFIRM_UNINSTALL_STYLES' => 'Are you sure you wish to uninstall selected styles?', -- cgit v1.2.1 From 6de0c7bc666ec934cc801cdf7cf94290a3d013f9 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Wed, 14 Aug 2019 20:08:18 +0200 Subject: [ticket/16019] Amend explanation PHPBB3-16019 --- phpBB/language/en/acp/styles.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en/acp') diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index fd5793d699..44be3c11cd 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -37,7 +37,7 @@ if (empty($lang) || !is_array($lang)) // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine $lang = array_merge($lang, [ - 'ACP_STYLES_EXPLAIN' => 'Here you can manage the styles available on your board.
Overwritten user styles will not be reflected here. Please note you cannot uninstall the “prosilver” style as it is phpBB’s default and primary parent style.', + 'ACP_STYLES_EXPLAIN' => 'Here you can manage the styles available on your board.
Please note you cannot uninstall the “prosilver” style as it is phpBB’s default and primary parent style.', 'CANNOT_BE_INSTALLED' => 'Cannot be installed', 'CONFIRM_UNINSTALL_STYLES' => 'Are you sure you wish to uninstall selected styles?', -- cgit v1.2.1