diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-04-19 23:20:36 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-04-19 23:20:36 +0200 |
| commit | 41b23542d3d70694e9c75b4904e0ee22c771ac06 (patch) | |
| tree | 85bcac10cce14ac6471d9eef62809a07b2096783 /phpBB/language/en | |
| parent | a650da79cb9acbaa9f01565c4cf1001ab7cf7551 (diff) | |
| parent | 00172afa532c99329f4683ecaefb0ba851e46b94 (diff) | |
| download | forums-41b23542d3d70694e9c75b4904e0ee22c771ac06.tar forums-41b23542d3d70694e9c75b4904e0ee22c771ac06.tar.gz forums-41b23542d3d70694e9c75b4904e0ee22c771ac06.tar.bz2 forums-41b23542d3d70694e9c75b4904e0ee22c771ac06.tar.xz forums-41b23542d3d70694e9c75b4904e0ee22c771ac06.zip | |
Merge remote-tracking branch 'github-p/ticket/10813' into develop
* github-p/ticket/10813:
[ticket/10813] Installer now checks json extension
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/install.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index ca6045a921..29664ae5f0 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -292,6 +292,8 @@ $lang = array_merge($lang, array( 'PCRE_UTF_SUPPORT_EXPLAIN' => 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.', 'PHP_GETIMAGESIZE_SUPPORT' => 'PHP function getimagesize() is available', 'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN' => '<strong>Required</strong> - In order for phpBB to function correctly, the getimagesize function needs to be available.', + 'PHP_JSON_SUPPORT' => 'PHP JSON support', + 'PHP_JSON_SUPPORT_EXPLAIN' => '<strong>Required</strong> - In order for phpBB to function correctly, the PHP JSON extension needs to be available.', 'PHP_OPTIONAL_MODULE' => 'Optional modules', 'PHP_OPTIONAL_MODULE_EXPLAIN' => '<strong>Optional</strong> - These modules or applications are optional. However, if they are available they will enable extra features.', 'PHP_SUPPORTED_DB' => 'Supported databases', |