aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-02-01 00:01:26 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-12-03 14:20:28 +0100
commit9fb2a5d5f8ed4c23689843178a4a06a151d146e6 (patch)
tree684e87cc6ccdc385175d4a5926aabec8ce21368a
parentc1035c98e455548fe14fbf5443bb98137d4e3d5d (diff)
downloadforums-9fb2a5d5f8ed4c23689843178a4a06a151d146e6.tar
forums-9fb2a5d5f8ed4c23689843178a4a06a151d146e6.tar.gz
forums-9fb2a5d5f8ed4c23689843178a4a06a151d146e6.tar.bz2
forums-9fb2a5d5f8ed4c23689843178a4a06a151d146e6.tar.xz
forums-9fb2a5d5f8ed4c23689843178a4a06a151d146e6.zip
[ticket/14492] Update language variables and trigger details text
PHPBB3-14492
-rw-r--r--phpBB/adm/style/acp_help_phpbb.html6
-rw-r--r--phpBB/includes/acp/acp_help_phpbb.php2
-rw-r--r--phpBB/includes/acp/info/acp_help_phpbb.php4
-rw-r--r--phpBB/language/en/acp/common.php8
4 files changed, 11 insertions, 9 deletions
diff --git a/phpBB/adm/style/acp_help_phpbb.html b/phpBB/adm/style/acp_help_phpbb.html
index a984b25b25..347d39af86 100644
--- a/phpBB/adm/style/acp_help_phpbb.html
+++ b/phpBB/adm/style/acp_help_phpbb.html
@@ -2,7 +2,7 @@
<a id="maincontent"></a>
-<h1>{L_SEND_STATISTICS}</h1>
+<h1>{L_ACP_HELP_PHPBB}</h1>
<div class="send-stats-row">
<div class="send-stats-tile">
@@ -10,7 +10,7 @@
<p>{L_EXPLAIN_SEND_STATISTICS}</p>
<div class="send-stats-row">
<div class="send-stats-data-row send-stats-data-only-row">
- <a id="trigger-configlist"><span>{L_SHOW_STATISTICS}</span><i class="icon fa-angle-down"></i></a>
+ <a id="trigger-configlist" data-ajax="toggle_link" data-toggle-text="{L_HIDE_STATISTICS}"><span>{L_SHOW_STATISTICS}</span><i class="icon fa-angle-down"></i></a>
</div>
<div class="send-stats-data-row send-stats-data-hidden">
<div class="configlist" id="configlist">
@@ -33,7 +33,7 @@
<input id="enable-stats" type="checkbox" checked="checked" />
<label for="enable-stats"></label>
</dt>
- <dd>{L_SEND_STATISTICS}</dd>
+ <dd>{L_SEND_STATISTICS_LONG}</dd>
</dl>
</div>
<div class="send-stats-tile">
diff --git a/phpBB/includes/acp/acp_help_phpbb.php b/phpBB/includes/acp/acp_help_phpbb.php
index cfe9619898..2ac90eee48 100644
--- a/phpBB/includes/acp/acp_help_phpbb.php
+++ b/phpBB/includes/acp/acp_help_phpbb.php
@@ -35,7 +35,7 @@ class acp_help_phpbb
$collect_url = "https://www.phpbb.com/stats/receive_stats.php";
$this->tpl_name = 'acp_help_phpbb';
- $this->page_title = 'ACP_SEND_STATISTICS';
+ $this->page_title = 'ACP_HELP_PHPBB';
// generate a unique id if necessary
if (!isset($config['questionnaire_unique_id']))
diff --git a/phpBB/includes/acp/info/acp_help_phpbb.php b/phpBB/includes/acp/info/acp_help_phpbb.php
index 17a07ec4f6..dee8ef41d7 100644
--- a/phpBB/includes/acp/info/acp_help_phpbb.php
+++ b/phpBB/includes/acp/info/acp_help_phpbb.php
@@ -17,9 +17,9 @@ class acp_help_phpbb_info
{
return array(
'filename' => 'acp_help_phpbb',
- 'title' => 'ACP_SEND_STATISTICS',
+ 'title' => 'ACP_HELP_PHPBB',
'modes' => array(
- 'help_phpbb' => array('title' => 'ACP_SEND_STATISTICS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')),
+ 'help_phpbb' => array('title' => 'ACP_HELP_PHPBB', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')),
),
);
}
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 0acc18e373..a233547c7e 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -108,6 +108,8 @@ $lang = array_merge($lang, array(
'ACP_GROUPS_PERMISSIONS' => 'Group permissions',
'ACP_GROUPS_POSITION' => 'Manage group positions',
+ 'ACP_HELP_PHPBB' => 'Help support phpBB',
+
'ACP_ICONS' => 'Topic icons',
'ACP_ICONS_SMILIES' => 'Topic icons/smilies',
'ACP_INACTIVE_USERS' => 'Inactive users',
@@ -167,7 +169,6 @@ $lang = array_merge($lang, array(
'ACP_SEARCH_SETTINGS' => 'Search settings',
'ACP_SECURITY_SETTINGS' => 'Security settings',
- 'ACP_SEND_STATISTICS' => 'Send statistical information',
'ACP_SERVER_CONFIGURATION' => 'Server configuration',
'ACP_SERVER_SETTINGS' => 'Server settings',
'ACP_SIGNATURE_SETTINGS' => 'Signature settings',
@@ -474,14 +475,15 @@ $lang = array_merge($lang, array(
'USER_IS_INACTIVE' => 'User is inactive',
));
-// Send statistics page
+// Help support phpBB page
$lang = array_merge($lang, array(
'EXPLAIN_SEND_STATISTICS' => 'Please send information about your server and board configurations to phpBB for statistical analysis. All information that could identify you or your website has been removed - the data is entirely <strong>anonymous</strong>. We base decisions about future phpBB versions on this information. The statistics are made available publically. We also share this data with the PHP project, the programming language phpBB is made with.',
'EXPLAIN_SHOW_STATISTICS' => 'Using the button below you can preview all variables that will be transmitted.',
'DONT_SEND_STATISTICS' => 'Return to the ACP if you do not wish to send statistical information to phpBB.',
'GO_ACP_MAIN' => 'Go to the ACP start page',
'HIDE_STATISTICS' => 'Hide details',
- 'SEND_STATISTICS' => 'Send statistical information',
+ 'SEND_STATISTICS' => 'Send statistics',
+ 'SEND_STATISTICS_LONG' => 'Send statistical information',
'SHOW_STATISTICS' => 'Show details',
'THANKS_SEND_STATISTICS' => 'Thank you for submitting your information.',
'EXPLAIN_ENABLE_VIGLINK' => 'Viglink is a non-invasive third-party service that will monetize existing links posted by users of your forum. When visitors click on those existing links and perform certain actions, such as shopping, the merchants pay VigLink a commission, of which a share is donated to the phpBB project. By agreeing to enable VigLink and donating proceeds to the phpBB project, you are supporting our open source organization and ensuring our continued financial security.<br /><br />You can change these settings at any time in VigLink settings panel.',