makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11150] CS and wording

Browse source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau 2015-12-09 19:39:05 +01:00 • committed by Tristan Darricau
parent 8ea2ecf835
commit ea4a4acee0
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
phpBB/adm/style/detailled_message_body.html → phpBB/adm/style/detailed_message_body.html
View file

16
phpBB/includes/acp/acp_extensions.php
View file

@ -62,10 +62,10 @@ class acp_extensions
{ {
case 'catalog': case 'catalog':
$this->catalog_mode($id, $mode); $this->catalog_mode($id, $mode);
break; break;
default: default:
$this->main_mode($id, $mode); $this->main_mode($id, $mode);
break; break;
} }
} }
@ -155,7 +155,7 @@ class acp_extensions
$this->config->set('extension_force_unstable', false); $this->config->set('extension_force_unstable', false);
trigger_error($this->user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action)); trigger_error($this->user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
} }
break; break;
case 'list': case 'list':
default: default:
@ -464,7 +464,7 @@ class acp_extensions
) )
); );
break; break;
case 'remove': case 'remove':
$this->page_title = 'ACP_EXTENSIONS_REMOVE'; $this->page_title = 'ACP_EXTENSIONS_REMOVE';
@ -503,7 +503,7 @@ class acp_extensions
) )
); );
break; break;
case 'update': case 'update':
$this->page_title = 'ACP_EXTENSIONS_UPDATE'; $this->page_title = 'ACP_EXTENSIONS_UPDATE';
@ -542,7 +542,7 @@ class acp_extensions
) )
); );
break; break;
case 'manage': case 'manage':
$this->page_title = 'ACP_EXTENSIONS_MANAGE'; $this->page_title = 'ACP_EXTENSIONS_MANAGE';
@ -581,7 +581,7 @@ class acp_extensions
) )
); );
break; break;
case 'list': case 'list':
default: default:
if (!$this->config['exts_composer_packagist'] && $this->request->is_set('enable_packagist') && confirm_box(true)) if (!$this->config['exts_composer_packagist'] && $this->request->is_set('enable_packagist') && confirm_box(true))
@ -676,7 +676,7 @@ class acp_extensions
add_form_key('catalog_settings'); add_form_key('catalog_settings');
break; break;
} }
} }

2
phpBB/language/en/acp/common.php
View file

@ -250,7 +250,7 @@ $lang = array_merge($lang, array(
'COMPOSER_UPDATING_DEPENDENCIES' => 'Updating packages', 'COMPOSER_UPDATING_DEPENDENCIES' => 'Updating packages',
'COMPOSER_LOADING_REPOSITORIES' => 'Loading remote repositories with package information', 'COMPOSER_LOADING_REPOSITORIES' => 'Loading remote repositories with package information',
'COMPOSER_ERROR_CONFLICT' => 'Your requirements could not be resolved to an installable set of packages.', 'COMPOSER_ERROR_CONFLICT' => 'Your requirements could not be resolved to an installable set of packages.',
'COMPOSER_REPOSITORY_UNAVAILABLE' => 'An error occurred when fetching the repository %s.', 'COMPOSER_REPOSITORY_UNAVAILABLE' => 'An error occurred while fetching the repository %s.',
'COMPOSER_INSTALLING_PACKAGE' => ' - Installing %1$s (%2$s)', 'COMPOSER_INSTALLING_PACKAGE' => ' - Installing %1$s (%2$s)',
'COMPOSER_DELETING' => ' - Deleting %s', 'COMPOSER_DELETING' => ' - Deleting %s',
'COMPOSER_UPDATE_NOTHING' => 'Nothing to update', 'COMPOSER_UPDATE_NOTHING' => 'Nothing to update',

6
phpBB/language/en/acp/extensions.php
View file

@ -41,15 +41,15 @@ $lang = array_merge($lang, array(
'EXTENSION_ALREADY_MANAGED' => 'The “%s” extension is already managed.', 'EXTENSION_ALREADY_MANAGED' => 'The “%s” extension is already managed.',
'EXTENSION_CANNOT_MANAGE_FILESYSTEM_ERROR' => 'The “%s” extension cannot be managed because the existing files could not be removed from the filesystem.', 'EXTENSION_CANNOT_MANAGE_FILESYSTEM_ERROR' => 'The “%s” extension cannot be managed because the existing files could not be removed from the filesystem.',
'EXTENSION_CANNOT_MANAGE_INSTALL_ERROR' => 'The “%s” extension could not be installed. The prior installation of this extension has been restored.', 'EXTENSION_CANNOT_MANAGE_INSTALL_ERROR' => 'The “%s” extension could not be installed. The prior installation of this extension has been restored.',
'EXTENSION_MANAGED_WITH_CLEAN_ERROR' => 'The “%1$s” extension has been installed but an error occurred and the old files have not been removed. You might want to delete the “%2$s” files manually.', 'EXTENSION_MANAGED_WITH_CLEAN_ERROR' => 'The “%1$s” extension has been installed but an error occurred and the old files could not be removed. You might want to delete the “%2$s” files manually.',
'EXTENSION_MANAGED_WITH_ENABLE_ERROR' => 'The “%s” extension has been installed but an error occurred when enabling it.', 'EXTENSION_MANAGED_WITH_ENABLE_ERROR' => 'The “%s” extension has been installed but an error occurred while enabling it.',
'EXTENSION_NOT_INSTALLED' => 'The “%s” extension is not installed.', 'EXTENSION_NOT_INSTALLED' => 'The “%s” extension is not installed.',
'ENABLING_EXTENSIONS' => 'Enabling extensions', 'ENABLING_EXTENSIONS' => 'Enabling extensions',
'DISABLING_EXTENSIONS' => 'Disabling extensions', 'DISABLING_EXTENSIONS' => 'Disabling extensions',
'EXTENSIONS_CATALOG' => 'Extensions Catalog', 'EXTENSIONS_CATALOG' => 'Extensions Catalog',
'EXTENSIONS_CATALOG_EXPLAIN' => 'Here you can browse all of the extensions available for your phpBB board. Extensions can easily be installed or removed with just a click. Adjust the Settings to allow instant enabling and purging of extensions.', 'EXTENSIONS_CATALOG_EXPLAIN' => 'Here you can browse all of the extensions available for your phpBB board. Extensions can easily be installed or removed with just a click. Adjust the settings to allow instant enabling and purging of extensions.',
'EXTENSION' => 'Extension', 'EXTENSION' => 'Extension',
'EXTENSIONS' => 'Extensions', 'EXTENSIONS' => 'Extensions',

6
phpBB/phpbb/composer/installer.php
View file

@ -76,14 +76,14 @@ class installer
private $ext_json_file_backup; private $ext_json_file_backup;
/** /**
* @param \phpbb\config\config $config Config object * @param string $root_path phpBB root path
* @param string $root_path phpBB root path * @param config $config Config object
*/ */
public function __construct($root_path, config $config = null) public function __construct($root_path, config $config = null)
{ {
if ($config) if ($config)
{ {
$repositories = json_decode($config['exts_composer_repositories'], true); $repositories = json_decode($config['exts_composer_repositories'], true);
if (is_array($repositories) && !empty($repositories)) if (is_array($repositories) && !empty($repositories))
{ {