Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #341 from marc1706/ticket/337

Browse Source 
[ticket/337] Move log and permission lang variables back to info_acp_portal
This commit is contained in:
Marc Alexander
2014-08-23 21:21:20 +02:00
parent d81fc02ddb 7556ddfc3d
commit dac1b2bcaa
5 changed files with 48 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
language/de/info_acp_portal.php
View File

@@ -38,4 +38,17 @@ $lang = array_merge($lang, array(
'ACP_PORTAL' => 'Portal',
'ACP_PORTAL_GENERAL_INFO' => 'Allgemeine Einstellungen',
'ACP_PORTAL_UPLOAD' => 'Modul hochladen',
// Logs
'LOG_PORTAL_LINK_ADDED' => '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Link hinzugefügt: %s ',
'LOG_PORTAL_LINK_UPDATED' => '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Link geändert: %s ',
'LOG_PORTAL_LINK_REMOVED' => '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Link gelöscht: %s ',
'LOG_PORTAL_EVENT_ADDED' => '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Termin eingetragen: %s ',
'LOG_PORTAL_EVENT_UPDATED' => '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Termin geändert: %s ',
'LOG_PORTAL_EVENT_REMOVED' => '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Termin gelöscht: %s ',
'LOG_PORTAL_CONFIG' => '<strong>Portal-Einstellungen geändert</strong><br />&raquo; %s',
// Adding the permissions
'ACL_A_MANAGE_PORTAL' => 'Kann Portal-Einstellungen ändern',
'ACL_U_VIEW_PORTAL' => 'Kann das Portal sehen',
));

14
language/de/portal_acp.php
View File

@@ -98,12 +98,6 @@ $lang = array_merge($lang, array(
'LINK_ADDED' => 'Der Link wurde erfolgreich eingetragen',
'LINK_UPDATED' => 'Der Link wurde erfolgreich geändert',
'LOG_PORTAL_LINK_ADDED' => '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Link hinzugefügt: %s ',
'LOG_PORTAL_LINK_UPDATED' => '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Link geändert: %s ',
'LOG_PORTAL_LINK_REMOVED' => '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Link gelöscht: %s ',
'LOG_PORTAL_EVENT_ADDED' => '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Termin eingetragen: %s ',
'LOG_PORTAL_EVENT_UPDATED' => '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Termin geändert: %s ',
'LOG_PORTAL_EVENT_REMOVED' => '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Termin gelöscht: %s ',
// Upload Module
'MODULE_UPLOAD' => 'Lade ein Modul hoch',
@@ -126,9 +120,6 @@ $lang = array_merge($lang, array(
'PORTAL_BASIC_INSTALL' => 'Füge Basismodule hinzu',
'PORTAL_BASIC_UNINSTALL' => 'Entferne Module von Datenbank',
// Logs
'LOG_PORTAL_CONFIG' => '<strong>Portal-Einstellungen geändert</strong><br />&raquo; %s',
/**
* A copy of Handyman` s MOD version check, to view it on the gallery overview
*/
@@ -141,9 +132,4 @@ $lang = array_merge($lang, array(
'RELEASE_ANNOUNCEMENT' => 'Ankündigungsthema',
'UP_TO_DATE' => '%s ist aktuell',
'VERSION_CHECK' => 'MOD Version Check',
// Adding the permissions
'ACL_A_MANAGE_PORTAL' => 'Kann Portal-Einstellungen ändern',
'ACL_U_VIEW_PORTAL' => 'Kann das Portal sehen',
));

13
language/en/info_acp_portal.php
View File

@@ -37,4 +37,17 @@ $lang = array_merge($lang, array(
'ACP_PORTAL' => 'Portal',
'ACP_PORTAL_GENERAL_INFO' => 'General settings',
'ACP_PORTAL_UPLOAD' => 'Upload module',
// Portal logs
'LOG_PORTAL_LINK_ADDED' => '<strong>Altered Portal settings</strong><br />&raquo; Link added: %s ',
'LOG_PORTAL_LINK_UPDATED' => '<strong>Altered Portal settings</strong><br />&raquo; Link updated: %s ',
'LOG_PORTAL_LINK_REMOVED' => '<strong>Altered Portal settings</strong><br />&raquo; Link removed: %s ',
'LOG_PORTAL_EVENT_ADDED' => '<strong>Altered Portal settings</strong><br />&raquo; Event added: %s ',
'LOG_PORTAL_EVENT_UPDATED' => '<strong>Altered Portal settings</strong><br />&raquo; Event updated: %s ',
'LOG_PORTAL_EVENT_REMOVED' => '<strong>Altered Portal settings</strong><br />&raquo; Event removed: %s ',
'LOG_PORTAL_CONFIG' => '<strong>Altered Portal settings</strong><br />&raquo; %s',
// Adding the permissions
'ACL_A_MANAGE_PORTAL' => 'Can alter Portal settings',
'ACL_U_VIEW_PORTAL' => 'Can view the Portal',
));

13
language/en/portal_acp.php
View File

@@ -97,12 +97,6 @@ $lang = array_merge($lang, array(
'LINK_ADDED' => 'The link has been successfully added',
'LINK_UPDATED' => 'The link has been successfully updated',
'LOG_PORTAL_LINK_ADDED' => '<strong>Altered Portal settings</strong><br />&raquo; Link added: %s ',
'LOG_PORTAL_LINK_UPDATED' => '<strong>Altered Portal settings</strong><br />&raquo; Link updated: %s ',
'LOG_PORTAL_LINK_REMOVED' => '<strong>Altered Portal settings</strong><br />&raquo; Link removed: %s ',
'LOG_PORTAL_EVENT_ADDED' => '<strong>Altered Portal settings</strong><br />&raquo; Event added: %s ',
'LOG_PORTAL_EVENT_UPDATED' => '<strong>Altered Portal settings</strong><br />&raquo; Event updated: %s ',
'LOG_PORTAL_EVENT_REMOVED' => '<strong>Altered Portal settings</strong><br />&raquo; Event removed: %s ',
// Upload Module
'MODULE_UPLOAD' => 'Upload a module',
@@ -125,9 +119,6 @@ $lang = array_merge($lang, array(
'PORTAL_BASIC_INSTALL' => 'Adding basic set of modules',
'PORTAL_BASIC_UNINSTALL' => 'Removing modules from database',
// Logs
'LOG_PORTAL_CONFIG' => '<strong>Altered Portal settings</strong><br />&raquo; %s',
/**
* A copy of Handyman` s MOD version check, to view it on the portal overview
*/
@@ -140,8 +131,4 @@ $lang = array_merge($lang, array(
'RELEASE_ANNOUNCEMENT' => 'Annoucement Topic',
'UP_TO_DATE' => '%s is up to date',
'VERSION_CHECK' => 'MOD Version Check',
// Adding the permissions
'ACL_A_MANAGE_PORTAL' => 'Can alter Portal settings',
'ACL_U_VIEW_PORTAL' => 'Can view the Portal',
));

22
tests/functional/portal_acp_test.php
View File

@@ -75,4 +75,26 @@ class phpbb_functional_portal_acp_test extends \board3\portal\tests\testframewor
$form->setValues(array('module_classname' => $module_name));
self::submit($form);
}
public function test_portal_logs()
{
$this->add_lang_ext('board3/portal', 'info_acp_portal');
$crawler = self::request('GET', 'adm/index.php?i=-board3-portal-acp-portal_module&mode=config&sid=' . $this->sid);
$form = $crawler->selectButton('submit')->form();
$crawler = self::submit($form);
$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
// Take a look at the logs
$crawler = self::request('GET', 'adm/index.php?i=acp_logs&mode=admin&sid=' . $this->sid);
$this->assertContains(strip_tags(html_entity_decode($this->lang('LOG_PORTAL_CONFIG', $this->lang('ACP_PORTAL_GENERAL_INFO')), ENT_COMPAT, 'UTF-8')), $crawler->text());
}
public function test_portal_permissions()
{
$this->add_lang_ext('board3/portal', 'info_acp_portal');
$crawler = self::request('GET', 'adm/index.php?i=acp_permissions&mode=setting_group_global&sid=' . $this->sid);
$form = $crawler->selectButton('submit')->form();
$crawler = self::submit($form);
$this->assertContainsLang('ACL_U_VIEW_PORTAL', $crawler->text());
}
}