[ticket/10631] Adjust prefixes to be easier to understand

PHPBB3-10631
This commit is contained in:
Unknown Bliss 2012-08-17 14:06:23 +01:00
parent 7b643fe8a5
commit 323bbf9b52
4 changed files with 58 additions and 58 deletions

View file

@ -8,57 +8,57 @@
<fieldset> <fieldset>
<legend>{L_EXT_DETAILS}</legend> <legend>{L_EXT_DETAILS}</legend>
<!-- IF MD_DISPLAY_NAME --> <!-- IF META_DISPLAY_NAME -->
<dl> <dl>
<dt><label for="md_display_name">{L_DISPLAY_NAME}:</label></dt> <dt><label for="meta_display_name">{L_DISPLAY_NAME}:</label></dt>
<dd><strong id="md_display_name">{MD_DISPLAY_NAME}</strong></dd> <dd><strong id="meta_display_name">{META_DISPLAY_NAME}</strong></dd>
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<dl> <dl>
<dt><label for="md_name">{L_CLEAN_NAME}:</label></dt> <dt><label for="meta_name">{L_CLEAN_NAME}:</label></dt>
<dd><strong id="md_name">{MD_NAME}</strong></dd> <dd><strong id="meta_name">{META_NAME}</strong></dd>
</dl> </dl>
<!-- IF MD_DESCRIPTION --> <!-- IF META_DESCRIPTION -->
<dl> <dl>
<dt><label for="md_description">{L_DESCRIPTION}:</label></dt> <dt><label for="meta_description">{L_DESCRIPTION}:</label></dt>
<dd><p id="md_description">{MD_DESCRIPTION}</p></dd> <dd><p id="meta_description">{META_DESCRIPTION}</p></dd>
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<dl> <dl>
<dt><label for="md_version">{L_VERSION}:</label></dt> <dt><label for="meta_version">{L_VERSION}:</label></dt>
<dd><p id="md_version">{MD_VERSION}</p></dd> <dd><p id="meta_version">{META_VERSION}</p></dd>
</dl> </dl>
<!-- IF MD_HOMEPAGE --> <!-- IF META_HOMEPAGE -->
<dl> <dl>
<dt><label for="md_homepage">{L_HOMEPAGE}:</label></dt> <dt><label for="meta_homepage">{L_HOMEPAGE}:</label></dt>
<dd><p id="md_homepage">{MD_HOMEPAGE}</p></dd> <dd><p id="meta_homepage">{META_HOMEPAGE}</p></dd>
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF MD_TIME --> <!-- IF META_TIME -->
<dl> <dl>
<dt><label for="md_time">{L_TIME}:</label></dt> <dt><label for="meta_time">{L_TIME}:</label></dt>
<dd><p id="md_time">{MD_TIME}</p></dd> <dd><p id="meta_time">{META_TIME}</p></dd>
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<dl> <dl>
<dt><label for="md_license">{L_LICENCE}:</label></dt> <dt><label for="meta_license">{L_LICENCE}:</label></dt>
<dd><p id="md_license">{MD_LICENCE}</p></dd> <dd><p id="meta_license">{META_LICENCE}</p></dd>
</dl> </dl>
</fieldset> </fieldset>
<!-- IF MD_REQUIRE_PHPBB || MD_REQUIRE_PHP --> <!-- IF META_REQUIRE_PHPBB || META_REQUIRE_PHP -->
<fieldset> <fieldset>
<legend>{L_REQUIREMENTS}</legend> <legend>{L_REQUIREMENTS}</legend>
<!-- IF MD_REQUIRE_PHPBB --> <!-- IF META_REQUIRE_PHPBB -->
<dl<!-- IF MD_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->> <dl<!-- IF META_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
<dt><label for="require_phpbb">{L_PHPBB_VERSION}:</label></dt> <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> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF MD_REQUIRE_PHP --> <!-- IF META_REQUIRE_PHP -->
<dl<!-- IF MD_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->> <dl<!-- IF META_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
<dt><label for="require_php">{L_PHP_VERSION}:</label></dt> <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> </dl>
<!-- ENDIF --> <!-- ENDIF -->
</fieldset> </fieldset>
@ -66,32 +66,32 @@
<fieldset> <fieldset>
<legend>{L_AUTHOR_INFORMATION}</legend> <legend>{L_AUTHOR_INFORMATION}</legend>
<!-- BEGIN md_authors --> <!-- BEGIN meta_authors -->
<fieldset> <fieldset>
<dl> <dl>
<dt><label for="md_author_name">{L_AUTHOR_NAME}:</label></dt> <dt><label for="meta_author_name">{L_AUTHOR_NAME}:</label></dt>
<dd><strong id="md_author_name">{md_authors.AUTHOR_NAME}</strong></dd> <dd><strong id="meta_author_name">{meta_authors.AUTHOR_NAME}</strong></dd>
</dl> </dl>
<!-- IF md_authors.AUTHOR_EMAIL --> <!-- IF meta_authors.AUTHOR_EMAIL -->
<dl> <dl>
<dt><label for="md_author_email">{L_AUTHOR_EMAIL}:</label></dt> <dt><label for="meta_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> <dd><strong id="meta_author_email"><a href="mailto:{meta_authors.AUTHOR_EMAIL}">{meta_authors.AUTHOR_EMAIL}</a></strong></dd>
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF md_authors.AUTHOR_HOMEPAGE --> <!-- IF meta_authors.AUTHOR_HOMEPAGE -->
<dl> <dl>
<dt><label for="md_author_url">{L_AUTHOR_HOMEPAGE}:</label></dt> <dt><label for="meta_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> <dd><strong id="meta_author_url"><a href="{meta_authors.AUTHOR_HOMEPAGE}">{meta_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF md_authors.AUTHOR_ROLE --> <!-- IF meta_authors.AUTHOR_ROLE -->
<dl> <dl>
<dt><label for="author_role">{L_AUTHOR_ROLE}:</label></dt> <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> </dl>
<!-- ENDIF --> <!-- ENDIF -->
</fieldset> </fieldset>
<!-- END md_authors --> <!-- END meta_authors -->
</fieldset> </fieldset>
<!-- INCLUDE overall_footer.html --> <!-- INCLUDE overall_footer.html -->

View file

@ -24,7 +24,7 @@
</tr> </tr>
<!-- BEGIN enabled --> <!-- BEGIN enabled -->
<tr class="ext_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;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
<td style="text-align: center;"> <td style="text-align: center;">
<!-- BEGIN actions --> <!-- BEGIN actions -->
@ -42,7 +42,7 @@
</tr> </tr>
<!-- BEGIN disabled --> <!-- BEGIN disabled -->
<tr class="ext_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;"> <td style="text-align: center;">
<!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF --> <!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF -->
</td> </td>

View file

@ -196,7 +196,7 @@ class acp_extensions
try try
{ {
$this->template->assign_block_vars('enabled', array( $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 . '&amp;action=details&amp;ext_name=' . urlencode($name), 'U_DETAILS' => $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name),
)); ));
@ -209,7 +209,7 @@ class acp_extensions
catch(phpbb_extension_exception $e) catch(phpbb_extension_exception $e)
{ {
$this->template->assign_block_vars('disabled', array( $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 try
{ {
$this->template->assign_block_vars('disabled', array( $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 . '&amp;action=details&amp;ext_name=' . urlencode($name), 'U_DETAILS' => $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name),
)); ));
@ -243,7 +243,7 @@ class acp_extensions
catch(phpbb_extension_exception $e) catch(phpbb_extension_exception $e)
{ {
$this->template->assign_block_vars('disabled', array( $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 try
{ {
$this->template->assign_block_vars('disabled', array( $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 . '&amp;action=details&amp;ext_name=' . urlencode($name), 'U_DETAILS' => $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name),
)); ));
@ -278,7 +278,7 @@ class acp_extensions
catch(phpbb_extension_exception $e) catch(phpbb_extension_exception $e)
{ {
$this->template->assign_block_vars('disabled', array( $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),
)); ));
} }
} }

View file

@ -313,26 +313,26 @@ class phpbb_extension_metadata_manager
public function output_template_data() public function output_template_data()
{ {
$this->template->assign_vars(array( $this->template->assign_vars(array(
'MD_NAME' => htmlspecialchars($this->metadata['name']), 'META_NAME' => htmlspecialchars($this->metadata['name']),
'MD_TYPE' => htmlspecialchars($this->metadata['type']), 'META_TYPE' => htmlspecialchars($this->metadata['type']),
'MD_DESCRIPTION' => (isset($this->metadata['description'])) ? htmlspecialchars($this->metadata['description']) : '', 'META_DESCRIPTION' => (isset($this->metadata['description'])) ? htmlspecialchars($this->metadata['description']) : '',
'MD_HOMEPAGE' => (isset($this->metadata['homepage'])) ? $this->metadata['homepage'] : '', 'META_HOMEPAGE' => (isset($this->metadata['homepage'])) ? $this->metadata['homepage'] : '',
'MD_VERSION' => (isset($this->metadata['version'])) ? htmlspecialchars($this->metadata['version']) : '', 'META_VERSION' => (isset($this->metadata['version'])) ? htmlspecialchars($this->metadata['version']) : '',
'MD_TIME' => (isset($this->metadata['time'])) ? htmlspecialchars($this->metadata['time']) : '', 'META_TIME' => (isset($this->metadata['time'])) ? htmlspecialchars($this->metadata['time']) : '',
'MD_LICENCE' => htmlspecialchars($this->metadata['licence']), 'META_LICENCE' => htmlspecialchars($this->metadata['licence']),
'MD_REQUIRE_PHP' => (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '', 'META_REQUIRE_PHP' => (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '',
'MD_REQUIRE_PHP_FAIL' => !$this->validate_require_php(), 'META_REQUIRE_PHP_FAIL' => !$this->validate_require_php(),
'MD_REQUIRE_PHPBB' => (isset($this->metadata['require']['phpbb'])) ? htmlspecialchars($this->metadata['require']['phpbb']) : '', 'META_REQUIRE_PHPBB' => (isset($this->metadata['require']['phpbb'])) ? htmlspecialchars($this->metadata['require']['phpbb']) : '',
'MD_REQUIRE_PHPBB_FAIL' => !$this->validate_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) 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_NAME' => htmlspecialchars($author['name']),
'AUTHOR_EMAIL' => (isset($author['email'])) ? $author['email'] : '', 'AUTHOR_EMAIL' => (isset($author['email'])) ? $author['email'] : '',
'AUTHOR_HOMEPAGE' => (isset($author['homepage'])) ? $author['homepage'] : '', 'AUTHOR_HOMEPAGE' => (isset($author['homepage'])) ? $author['homepage'] : '',