mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 23:55:26 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/12527] Fix "board’s language" vs "boards language"
  [ticket/12527] Use a proper language string on confirm screen
  [ticket/12527] Remove unnecessary language strings
  [ticket/12527] Check whether the language exists
  [ticket/12527] Restore missing files and variables check
  [ticket/12527] Remove editor from template
  [ticket/12527] Remove language file editor form ACP
This commit is contained in:
Andreas Fischer 2014-05-27 17:34:50 +02:00
commit e74628ee8d
3 changed files with 92 additions and 1236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

187
phpBB/adm/style/acp_language.html
View File

@ -2,29 +2,7 @@
<a id="maincontent"></a> <a id="maincontent"></a>
<!-- IF S_SELECT_METHOD --> <!-- IF S_DETAILS -->
<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
<h1>{L_SELECT_DOWNLOAD_FORMAT}</h1>
<form id="selectmethod" method="post" action="{U_ACTION}">
<fieldset>
<legend>{L_DOWNLOAD_AS}</legend>
<dl>
<dt><label for="use_method">{L_DOWNLOAD_AS}{L_COLON}</label></dt>
<dd>{RADIO_BUTTONS}</dd>
</dl>
<p class="quick">
<input type="submit" class="button2" value="{L_DOWNLOAD}" name="download" />
</p>
</fieldset>
</form>
<!-- ELSEIF S_DETAILS -->
<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a> <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
@ -58,153 +36,32 @@
</fieldset> </fieldset>
</form> </form>
<br /><br /> <!-- IF .missing_files -->
<h3 class="error">{L_MISSING_FILES}</h3>
<!-- IF S_MISSING_FILES --> <fieldset>
<div class="errorbox"> <legend>{L_MISSING_LANG_FILES}</legend>
<h3>{L_MISSING_FILES}</h3> <!-- BEGIN missing_files -->
<p>{MISSING_FILES}</p> &raquo; {missing_files.FILE_NAME}<br />
</div> <!-- END missing_files -->
<br /><br />
<!-- ENDIF -->
<!-- IF S_MISSING_VARS -->
<h1>{L_MISSING_LANG_VARIABLES}</h1>
<p>{L_MISSING_VARS_EXPLAIN}</p>
<form id="missing" method="post" action="{U_MISSING_ACTION}">
<table class="table1">
<thead>
<tr>
<th>{L_LANGUAGE_KEY}</th>
<th>{L_LANGUAGE_VARIABLE}</th>
</tr>
</thead>
<tbody>
<!-- BEGIN missing -->
<tr class="row4">
<td><strong>{missing.FILE}</strong></td>
<td style="text-align: right;"><input type="submit" name="missing_file[{missing.KEY}]" value="{L_SELECT}" class="button2" /></td>
</tr>
{missing.TPL}
<!-- END missing -->
</tbody>
</table>
<div>{S_FORM_TOKEN}</div>
</form>
<br /><br />
<!-- ENDIF -->
<a id="entries"></a>
<h1>{L_LANGUAGE_ENTRIES}</h1>
<p>{L_LANGUAGE_ENTRIES_EXPLAIN}</p>
<form id="lang_entries" method="post" action="{U_ENTRY_ACTION}">
<!-- IF S_FROM_STORE -->
<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
<input type="submit" name="remove_store" value="{L_REMOVE_FROM_STORAGE_FOLDER}" class="button2" />
</fieldset> </fieldset>
<!-- ENDIF --> <!-- ENDIF -->
<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};"> <!-- IF .missing_varfile -->
<select name="language_file">{S_LANG_OPTIONS}</select>&nbsp;<input type="submit" class="button2" name="change" value="{L_SELECT}" /> <h3 class="error">{L_MISSING_VARS_EXPLAIN}</h3>
</fieldset>
<p>&nbsp;<br />&nbsp;</p> <fieldset>
<legend>{L_MISSING_LANG_VARIABLES}</legend>
<!-- BEGIN missing_varfile -->
<!--[if lt IE 8]> <dl>
<style type="text/css"> <dt><label>{missing_varfile.FILE_NAME}</label></dt>
/* <![CDATA[ */ <!-- BEGIN variable -->
input.langvalue, textarea.langvalue { <dd>{missing_varfile.variable.VAR_NAME}</dd>
width: 450px; <!-- END variable -->
} </dl>
/* ]]> */ <!-- END missing_varfile -->
</style> </fieldset>
<![endif]-->
<table class="table1">
<thead>
<!-- IF S_EMAIL_FILE -->
<tr>
<th colspan="2">{L_FILE_CONTENTS}</th>
</tr>
<!-- ELSE -->
<tr>
<th>{L_LANGUAGE_KEY}</th>
<th>{L_LANGUAGE_VARIABLE}</th>
</tr>
<!-- ENDIF --> <!-- ENDIF -->
<tr>
<td rowspan="2" class="row3"><strong>{PRINT_MESSAGE}<!-- IF S_FROM_STORE --><br /><span style="color: red;">{L_FILE_FROM_STORAGE}</span><!-- ENDIF --></strong></td>
<td class="row3" style="text-align: right;"><input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
</tr>
<tr>
<td class="row3" style="text-align: right;">
<!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}{L_COLON}&nbsp;<!-- BEGIN buttons --><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method" />&nbsp;{buttons.VALUE}&nbsp;<!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td>
</tr>
</thead>
<tbody>
<!-- IF S_EMAIL_FILE -->
<tr>
<td class="row2" colspan="2" style="text-align: center;"><textarea name="entry" id="entry" cols="80" rows="20">{LANG}</textarea></td>
</tr>
<!-- ELSE -->
{TPL}
<!-- ENDIF -->
<tr>
<td class="row3" colspan="3" style="text-align: right;">{S_FORM_TOKEN}<input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
</tr>
</tbody>
</table>
</form>
<!-- ELSEIF S_UPLOAD -->
<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
<h1>{L_UPLOAD_SETTINGS}</h1>
<form id="upload" method="post" action="{U_ACTION}">
<!-- IF S_CONNECTION_SUCCESS -->
<div class="successbox">
<p>{L_CONNECTION_SUCCESS}</p>
</div>
<!-- ELSEIF S_CONNECTION_FAILED -->
<div class="errorbox">
<p>{L_CONNECTION_FAILED}</p>
</div>
<!-- ENDIF -->
<fieldset>
<legend>{L_UPLOAD_SETTINGS}</legend>
<dl>
<dt><label>{L_UPLOAD_METHOD}{L_COLON}</label></dt>
<dd><strong>{NAME}</strong></dd>
</dl>
<!-- BEGIN data -->
<dl>
<dt><label for="{data.DATA}">{data.NAME}{L_COLON}</label><br /><span>{data.EXPLAIN}</span></dt>
<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
</dl>
<!-- END data -->
</fieldset>
<fieldset class="quick">
{HIDDEN}
{S_FORM_TOKEN}
<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
</fieldset>
</form>
<!-- ELSE --> <!-- ELSE -->
<h1>{L_ACP_LANGUAGE_PACKS}</h1> <h1>{L_ACP_LANGUAGE_PACKS}</h1>
@ -231,7 +88,7 @@
<td>{lang.LOCAL_NAME}</td> <td>{lang.LOCAL_NAME}</td>
<td style="text-align: center;"><strong>{lang.ISO}</strong></td> <td style="text-align: center;"><strong>{lang.ISO}</strong></td>
<td style="text-align: center;">{lang.USED_BY}</td> <td style="text-align: center;">{lang.USED_BY}</td>
<td style="text-align: center;">&nbsp;<a href="{lang.U_DOWNLOAD}">{L_DOWNLOAD}</a>&nbsp;|&nbsp;<a href="{lang.U_DELETE}">{L_DELETE}</a></td> <td style="text-align: center;"><a href="{lang.U_DELETE}">{L_DELETE}</a></td>
</tr> </tr>
<!-- END lang --> <!-- END lang -->
<!-- IF .notinst --> <!-- IF .notinst -->

1099
phpBB/includes/acp/acp_language.php
View File

File diff suppressed because it is too large Load Diff

42
phpBB/language/en/acp/language.php
View File

@ -38,26 +38,15 @@ $lang = array_merge($lang, array(
'ACP_FILES' => 'Admin language files', 'ACP_FILES' => 'Admin language files',
'ACP_LANGUAGE_PACKS_EXPLAIN' => 'Here you are able to install/remove language packs. The default language pack is marked with an asterisk (*).', 'ACP_LANGUAGE_PACKS_EXPLAIN' => 'Here you are able to install/remove language packs. The default language pack is marked with an asterisk (*).',
'EMAIL_FILES' => 'Email templates', 'DELETE_LANGUAGE_CONFIRM' => 'Are you sure you wish to delete “%s”?',
'FILE_CONTENTS' => 'File contents', 'INSTALLED_LANGUAGE_PACKS' => 'Installed language packs',
'FILE_FROM_STORAGE' => 'File from storage folder',
'HELP_FILES' => 'Help files',
'INSTALLED_LANGUAGE_PACKS' => 'Installed language packs',
'INVALID_LANGUAGE_PACK' => 'The selected language pack seems to be not valid. Please verify the language pack and upload it again if necessary.',
'INVALID_UPLOAD_METHOD' => 'The selected upload method is not valid, please choose a different method.',
'LANGUAGE_DETAILS_UPDATED' => 'Language details successfully updated.', 'LANGUAGE_DETAILS_UPDATED' => 'Language details successfully updated.',
'LANGUAGE_ENTRIES' => 'Language entries',
'LANGUAGE_ENTRIES_EXPLAIN' => 'Here you are able to change existing language pack entries or not already translated ones.<br /><strong>Note:</strong> Once you changed a language file, the changes will be stored within a separate folder for you to download. The changes will not be seen by your users until you replace the original language files at your webspace (by uploading them).',
'LANGUAGE_FILES' => 'Language files',
'LANGUAGE_KEY' => 'Language key',
'LANGUAGE_PACK_ALREADY_INSTALLED' => 'This language pack is already installed.', 'LANGUAGE_PACK_ALREADY_INSTALLED' => 'This language pack is already installed.',
'LANGUAGE_PACK_DELETED' => 'The language pack <strong>%s</strong> has been removed successfully. All users using this language have been reset to the boards default language.', 'LANGUAGE_PACK_DELETED' => 'The language pack “%s” has been removed successfully. All users using this language have been reset to the board’s default language.',
'LANGUAGE_PACK_DETAILS' => 'Language pack details', 'LANGUAGE_PACK_DETAILS' => 'Language pack details',
'LANGUAGE_PACK_INSTALLED' => 'The language pack <strong>%s</strong> has been successfully installed.', 'LANGUAGE_PACK_INSTALLED' => 'The language pack “%s” has been successfully installed.',
'LANGUAGE_PACK_CPF_UPDATE' => 'The custom profile fields’ language strings were copied from the default language. Please change them if necessary.', 'LANGUAGE_PACK_CPF_UPDATE' => 'The custom profile fields’ language strings were copied from the default language. Please change them if necessary.',
'LANGUAGE_PACK_ISO' => 'ISO', 'LANGUAGE_PACK_ISO' => 'ISO',
'LANGUAGE_PACK_LOCALNAME' => 'Local name', 'LANGUAGE_PACK_LOCALNAME' => 'Local name',
@ -70,31 +59,16 @@ $lang = array_merge($lang, array(
'LANG_ISO_CODE' => 'ISO code', 'LANG_ISO_CODE' => 'ISO code',
'LANG_LOCAL_NAME' => 'Local name', 'LANG_LOCAL_NAME' => 'Local name',
'MISSING_LANGUAGE_FILE' => 'Missing language file: <strong style="color:red">%s</strong>', 'MISSING_LANG_FILES' => 'Missing language files',
'MISSING_LANG_VARIABLES' => 'Missing language variables', 'MISSING_LANG_VARIABLES' => 'Missing language variables',
'MODS_FILES' => 'MODs language files',
'NO_FILE_SELECTED' => 'You haven’t specified a language file.', 'NO_FILE_SELECTED' => 'You haven’t specified a language file.',
'NO_LANG_ID' => 'You haven’t specified a language pack.', 'NO_LANG_ID' => 'You haven’t specified a language pack.',
'NO_REMOVE_DEFAULT_LANG' => 'You are not able to remove the default language pack.<br />If you want to remove this language pack, change your boards default language first.', 'NO_REMOVE_DEFAULT_LANG' => 'You are not able to remove the default language pack.<br />If you want to remove this language pack, change your board’s default language first.',
'NO_UNINSTALLED_LANGUAGE_PACKS' => 'No uninstalled language packs', 'NO_UNINSTALLED_LANGUAGE_PACKS' => 'No uninstalled language packs',
'REMOVE_FROM_STORAGE_FOLDER' => 'Remove from storage folder', 'THOSE_MISSING_LANG_FILES' => 'The following language files are missing from the “%s” language folder',
'THOSE_MISSING_LANG_VARIABLES' => 'The following language variables are missing from the “%s” language pack',
'SELECT_DOWNLOAD_FORMAT' => 'Select download format',
'SUBMIT_AND_DOWNLOAD' => 'Submit and download file',
'SUBMIT_AND_UPLOAD' => 'Submit and upload file',
'THOSE_MISSING_LANG_FILES' => 'The following language files are missing from the %s language folder',
'THOSE_MISSING_LANG_VARIABLES' => 'The following language variables are missing from the <strong>%s</strong> language pack',
'UNINSTALLED_LANGUAGE_PACKS' => 'Uninstalled language packs', 'UNINSTALLED_LANGUAGE_PACKS' => 'Uninstalled language packs',
'UNABLE_TO_WRITE_FILE' => 'The file could not be written to %s.',
'UPLOAD_COMPLETED' => 'The upload was completed successfully.',
'UPLOAD_FAILED' => 'The upload failed for unknown reasons. You may need to replace the relevant file manually.',
'UPLOAD_METHOD' => 'Upload method',
'UPLOAD_SETTINGS' => 'Upload settings',
'WRONG_LANGUAGE_FILE' => 'Selected language file is invalid.',
)); ));