diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-28 17:29:56 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-28 17:29:56 +0100 |
| commit | ce6e3966cfb1f310ce52d85a6c3db98d71890b28 (patch) | |
| tree | 85c11ceffbc617abf28459a8fd6f293d3e5da831 /phpBB | |
| parent | 968da05e51b25d49c1cf383dfb0823acba661b3b (diff) | |
| parent | 368dd23d4babf17e593ea9b16047319296881c46 (diff) | |
| download | forums-ce6e3966cfb1f310ce52d85a6c3db98d71890b28.tar forums-ce6e3966cfb1f310ce52d85a6c3db98d71890b28.tar.gz forums-ce6e3966cfb1f310ce52d85a6c3db98d71890b28.tar.bz2 forums-ce6e3966cfb1f310ce52d85a6c3db98d71890b28.tar.xz forums-ce6e3966cfb1f310ce52d85a6c3db98d71890b28.zip | |
Merge remote-tracking branch 'vsephpbb/ticket/12311' into develop-ascraeus
* vsephpbb/ticket/12311:
[ticket/12311] Use British-English spelling of licence in lang file
[ticket/12311] Use valid composer schema - license - for extensions
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_ext_details.html | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/extensions.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/extension/metadata_manager.php | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html index 5141acd9fc..6aff4b29cc 100644 --- a/phpBB/adm/style/acp_ext_details.html +++ b/phpBB/adm/style/acp_ext_details.html @@ -41,8 +41,8 @@ </dl> <!-- ENDIF --> <dl> - <dt><label>{L_LICENCE}{L_COLON}</label></dt> - <dd><span id="meta_license">{META_LICENCE}</span></dd> + <dt><label>{L_LICENSE}{L_COLON}</label></dt> + <dd><span id="meta_license">{META_LICENSE}</span></dd> </dl> </fieldset> diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 409b800ba6..baa7d01763 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -96,7 +96,7 @@ $lang = array_merge($lang, array( 'HOMEPAGE' => 'Homepage', 'PATH' => 'File Path', 'TIME' => 'Release Time', - 'LICENCE' => 'Licence', + 'LICENSE' => 'Licence', 'REQUIREMENTS' => 'Requirements', 'PHPBB_VERSION' => 'phpBB Version', diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php index 66cdb86513..c90445ee09 100644 --- a/phpBB/phpbb/extension/metadata_manager.php +++ b/phpBB/phpbb/extension/metadata_manager.php @@ -196,7 +196,7 @@ class metadata_manager $fields = array( 'name' => '#^[a-zA-Z0-9_\x7f-\xff]{2,}/[a-zA-Z0-9_\x7f-\xff]{2,}$#', 'type' => '#^phpbb-extension$#', - 'licence' => '#.+#', + 'license' => '#.+#', 'version' => '#.+#', ); @@ -351,7 +351,7 @@ class metadata_manager 'META_HOMEPAGE' => (isset($this->metadata['homepage'])) ? $this->metadata['homepage'] : '', 'META_VERSION' => (isset($this->metadata['version'])) ? htmlspecialchars($this->metadata['version']) : '', 'META_TIME' => (isset($this->metadata['time'])) ? htmlspecialchars($this->metadata['time']) : '', - 'META_LICENCE' => htmlspecialchars($this->metadata['licence']), + 'META_LICENSE' => htmlspecialchars($this->metadata['license']), 'META_REQUIRE_PHP' => (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '', 'META_REQUIRE_PHP_FAIL' => !$this->validate_require_php(), |