diff options
author | Unknown Bliss <m@michaelcullum.com> | 2012-08-17 14:06:23 +0100 |
---|---|---|
committer | Unknown Bliss <m@michaelcullum.com> | 2012-09-01 15:05:57 +0100 |
commit | 323bbf9b523984a592dc17bf35d2bb91a435be1b (patch) | |
tree | e50886c7742745b87b4343a5936eb16bf8fff5d5 /phpBB | |
parent | 7b643fe8a5fd3b92bb4db9eacb27645417004709 (diff) | |
download | forums-323bbf9b523984a592dc17bf35d2bb91a435be1b.tar forums-323bbf9b523984a592dc17bf35d2bb91a435be1b.tar.gz forums-323bbf9b523984a592dc17bf35d2bb91a435be1b.tar.bz2 forums-323bbf9b523984a592dc17bf35d2bb91a435be1b.tar.xz forums-323bbf9b523984a592dc17bf35d2bb91a435be1b.zip |
[ticket/10631] Adjust prefixes to be easier to understand
PHPBB3-10631
Diffstat (limited to 'phpBB')
-rw-r--r-- | phpBB/adm/style/acp_ext_details.html | 74 | ||||
-rw-r--r-- | phpBB/adm/style/acp_ext_list.html | 4 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_extensions.php | 12 | ||||
-rw-r--r-- | phpBB/includes/extension/metadata_manager.php | 26 |
4 files changed, 58 insertions, 58 deletions
diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html index f477b452b7..e7532691ad 100644 --- a/phpBB/adm/style/acp_ext_details.html +++ b/phpBB/adm/style/acp_ext_details.html @@ -8,57 +8,57 @@ <fieldset> <legend>{L_EXT_DETAILS}</legend> - <!-- IF MD_DISPLAY_NAME --> + <!-- IF META_DISPLAY_NAME --> <dl> - <dt><label for="md_display_name">{L_DISPLAY_NAME}:</label></dt> - <dd><strong id="md_display_name">{MD_DISPLAY_NAME}</strong></dd> + <dt><label for="meta_display_name">{L_DISPLAY_NAME}:</label></dt> + <dd><strong id="meta_display_name">{META_DISPLAY_NAME}</strong></dd> </dl> <!-- ENDIF --> <dl> - <dt><label for="md_name">{L_CLEAN_NAME}:</label></dt> - <dd><strong id="md_name">{MD_NAME}</strong></dd> + <dt><label for="meta_name">{L_CLEAN_NAME}:</label></dt> + <dd><strong id="meta_name">{META_NAME}</strong></dd> </dl> - <!-- IF MD_DESCRIPTION --> + <!-- IF META_DESCRIPTION --> <dl> - <dt><label for="md_description">{L_DESCRIPTION}:</label></dt> - <dd><p id="md_description">{MD_DESCRIPTION}</p></dd> + <dt><label for="meta_description">{L_DESCRIPTION}:</label></dt> + <dd><p id="meta_description">{META_DESCRIPTION}</p></dd> </dl> <!-- ENDIF --> <dl> - <dt><label for="md_version">{L_VERSION}:</label></dt> - <dd><p id="md_version">{MD_VERSION}</p></dd> + <dt><label for="meta_version">{L_VERSION}:</label></dt> + <dd><p id="meta_version">{META_VERSION}</p></dd> </dl> - <!-- IF MD_HOMEPAGE --> + <!-- IF META_HOMEPAGE --> <dl> - <dt><label for="md_homepage">{L_HOMEPAGE}:</label></dt> - <dd><p id="md_homepage">{MD_HOMEPAGE}</p></dd> + <dt><label for="meta_homepage">{L_HOMEPAGE}:</label></dt> + <dd><p id="meta_homepage">{META_HOMEPAGE}</p></dd> </dl> <!-- ENDIF --> - <!-- IF MD_TIME --> + <!-- IF META_TIME --> <dl> - <dt><label for="md_time">{L_TIME}:</label></dt> - <dd><p id="md_time">{MD_TIME}</p></dd> + <dt><label for="meta_time">{L_TIME}:</label></dt> + <dd><p id="meta_time">{META_TIME}</p></dd> </dl> <!-- ENDIF --> <dl> - <dt><label for="md_license">{L_LICENCE}:</label></dt> - <dd><p id="md_license">{MD_LICENCE}</p></dd> + <dt><label for="meta_license">{L_LICENCE}:</label></dt> + <dd><p id="meta_license">{META_LICENCE}</p></dd> </dl> </fieldset> - <!-- IF MD_REQUIRE_PHPBB || MD_REQUIRE_PHP --> + <!-- IF META_REQUIRE_PHPBB || META_REQUIRE_PHP --> <fieldset> <legend>{L_REQUIREMENTS}</legend> - <!-- IF MD_REQUIRE_PHPBB --> - <dl<!-- IF MD_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->> + <!-- IF META_REQUIRE_PHPBB --> + <dl<!-- IF META_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->> <dt><label for="require_phpbb">{L_PHPBB_VERSION}:</label></dt> - <dd><p id="require_phpbb">{MD_REQUIRE_PHPBB}</p></dd> + <dd><p id="require_phpbb">{META_REQUIRE_PHPBB}</p></dd> </dl> <!-- ENDIF --> - <!-- IF MD_REQUIRE_PHP --> - <dl<!-- IF MD_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->> + <!-- IF META_REQUIRE_PHP --> + <dl<!-- IF META_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->> <dt><label for="require_php">{L_PHP_VERSION}:</label></dt> - <dd><p id="require_php">{MD_REQUIRE_PHP}</p></dd> + <dd><p id="require_php">{META_REQUIRE_PHP}</p></dd> </dl> <!-- ENDIF --> </fieldset> @@ -66,32 +66,32 @@ <fieldset> <legend>{L_AUTHOR_INFORMATION}</legend> - <!-- BEGIN md_authors --> + <!-- BEGIN meta_authors --> <fieldset> <dl> - <dt><label for="md_author_name">{L_AUTHOR_NAME}:</label></dt> - <dd><strong id="md_author_name">{md_authors.AUTHOR_NAME}</strong></dd> + <dt><label for="meta_author_name">{L_AUTHOR_NAME}:</label></dt> + <dd><strong id="meta_author_name">{meta_authors.AUTHOR_NAME}</strong></dd> </dl> - <!-- IF md_authors.AUTHOR_EMAIL --> + <!-- IF meta_authors.AUTHOR_EMAIL --> <dl> - <dt><label for="md_author_email">{L_AUTHOR_EMAIL}:</label></dt> - <dd><strong id="md_author_email"><a href="mailto:{md_authors.AUTHOR_EMAIL}">{md_authors.AUTHOR_EMAIL}</a></strong></dd> + <dt><label for="meta_author_email">{L_AUTHOR_EMAIL}:</label></dt> + <dd><strong id="meta_author_email"><a href="mailto:{meta_authors.AUTHOR_EMAIL}">{meta_authors.AUTHOR_EMAIL}</a></strong></dd> </dl> <!-- ENDIF --> - <!-- IF md_authors.AUTHOR_HOMEPAGE --> + <!-- IF meta_authors.AUTHOR_HOMEPAGE --> <dl> - <dt><label for="md_author_url">{L_AUTHOR_HOMEPAGE}:</label></dt> - <dd><strong id="md_author_url"><a href="{md_authors.AUTHOR_HOMEPAGE}">{md_authors.AUTHOR_HOMEPAGE}</a></strong></dd> + <dt><label for="meta_author_url">{L_AUTHOR_HOMEPAGE}:</label></dt> + <dd><strong id="meta_author_url"><a href="{meta_authors.AUTHOR_HOMEPAGE}">{meta_authors.AUTHOR_HOMEPAGE}</a></strong></dd> </dl> <!-- ENDIF --> - <!-- IF md_authors.AUTHOR_ROLE --> + <!-- IF meta_authors.AUTHOR_ROLE --> <dl> <dt><label for="author_role">{L_AUTHOR_ROLE}:</label></dt> - <dd><strong id="md_author_role">{md_authors.AUTHOR_ROLE}</strong></dd> + <dd><strong id="meta_author_role">{meta_authors.AUTHOR_ROLE}</strong></dd> </dl> <!-- ENDIF --> </fieldset> - <!-- END md_authors --> + <!-- END meta_authors --> </fieldset> <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index b654a80caa..53de0b4d12 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -24,7 +24,7 @@ </tr> <!-- BEGIN enabled --> <tr class="ext_enabled"> - <td><strong>{enabled.EXT_NAME}</strong></a></td> + <td><strong>{enabled.META_DISPLAY_NAME}</strong></a></td> <td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td> <td style="text-align: center;"> <!-- BEGIN actions --> @@ -42,7 +42,7 @@ </tr> <!-- BEGIN disabled --> <tr class="ext_disabled"> - <td><strong>{disabled.EXT_NAME}</strong></a></td> + <td><strong>{disabled.META_DISPLAY_NAME}</strong></a></td> <td style="text-align: center;"> <!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF --> </td> diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index 8dde6bc36c..5a537aaa42 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -196,7 +196,7 @@ class acp_extensions try { $this->template->assign_block_vars('enabled', array( - 'EXT_NAME' => $md_manager->get_metadata('display-name'), + 'META_DISPLAY_NAME' => $md_manager->get_metadata('display-name'), 'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . urlencode($name), )); @@ -209,7 +209,7 @@ class acp_extensions catch(phpbb_extension_exception $e) { $this->template->assign_block_vars('disabled', array( - 'EXT_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), + 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), )); } } @@ -230,7 +230,7 @@ class acp_extensions try { $this->template->assign_block_vars('disabled', array( - 'EXT_NAME' => $md_manager->get_metadata('display-name'), + 'META_DISPLAY_NAME' => $md_manager->get_metadata('display-name'), 'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . urlencode($name), )); @@ -243,7 +243,7 @@ class acp_extensions catch(phpbb_extension_exception $e) { $this->template->assign_block_vars('disabled', array( - 'EXT_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), + 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), )); } } @@ -266,7 +266,7 @@ class acp_extensions try { $this->template->assign_block_vars('disabled', array( - 'EXT_NAME' => $md_manager->get_metadata('display-name'), + 'META_DISPLAY_NAME' => $md_manager->get_metadata('display-name'), 'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . urlencode($name), )); @@ -278,7 +278,7 @@ class acp_extensions catch(phpbb_extension_exception $e) { $this->template->assign_block_vars('disabled', array( - 'EXT_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), + 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), )); } } diff --git a/phpBB/includes/extension/metadata_manager.php b/phpBB/includes/extension/metadata_manager.php index 8a68e464a7..1e3bbe48c9 100644 --- a/phpBB/includes/extension/metadata_manager.php +++ b/phpBB/includes/extension/metadata_manager.php @@ -313,26 +313,26 @@ class phpbb_extension_metadata_manager public function output_template_data() { $this->template->assign_vars(array( - 'MD_NAME' => htmlspecialchars($this->metadata['name']), - 'MD_TYPE' => htmlspecialchars($this->metadata['type']), - 'MD_DESCRIPTION' => (isset($this->metadata['description'])) ? htmlspecialchars($this->metadata['description']) : '', - 'MD_HOMEPAGE' => (isset($this->metadata['homepage'])) ? $this->metadata['homepage'] : '', - 'MD_VERSION' => (isset($this->metadata['version'])) ? htmlspecialchars($this->metadata['version']) : '', - 'MD_TIME' => (isset($this->metadata['time'])) ? htmlspecialchars($this->metadata['time']) : '', - 'MD_LICENCE' => htmlspecialchars($this->metadata['licence']), + 'META_NAME' => htmlspecialchars($this->metadata['name']), + 'META_TYPE' => htmlspecialchars($this->metadata['type']), + 'META_DESCRIPTION' => (isset($this->metadata['description'])) ? htmlspecialchars($this->metadata['description']) : '', + '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']), - 'MD_REQUIRE_PHP' => (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '', - 'MD_REQUIRE_PHP_FAIL' => !$this->validate_require_php(), + 'META_REQUIRE_PHP' => (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '', + 'META_REQUIRE_PHP_FAIL' => !$this->validate_require_php(), - 'MD_REQUIRE_PHPBB' => (isset($this->metadata['require']['phpbb'])) ? htmlspecialchars($this->metadata['require']['phpbb']) : '', - 'MD_REQUIRE_PHPBB_FAIL' => !$this->validate_require_phpbb(), + 'META_REQUIRE_PHPBB' => (isset($this->metadata['require']['phpbb'])) ? htmlspecialchars($this->metadata['require']['phpbb']) : '', + 'META_REQUIRE_PHPBB_FAIL' => !$this->validate_require_phpbb(), - 'MD_DISPLAY_NAME' => (isset($this->metadata['extra']['display-name'])) ? htmlspecialchars($this->metadata['extra']['display-name']) : '', + 'META_DISPLAY_NAME' => (isset($this->metadata['extra']['display-name'])) ? htmlspecialchars($this->metadata['extra']['display-name']) : '', )); foreach ($this->metadata['authors'] as $author) { - $this->template->assign_block_vars('md_authors', array( + $this->template->assign_block_vars('meta_authors', array( 'AUTHOR_NAME' => htmlspecialchars($author['name']), 'AUTHOR_EMAIL' => (isset($author['email'])) ? $author['email'] : '', 'AUTHOR_HOMEPAGE' => (isset($author['homepage'])) ? $author['homepage'] : '', |