diff options
| author | Simon Rettberg | 2016-08-10 11:18:12 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-08-10 11:18:12 +0200 |
| commit | 5135886f2584631a414eb08e57d4ebdd2c48d611 (patch) | |
| tree | 60a23166e7bdd4071d0d77d3687a3049815a28b2 /modules-available | |
| parent | Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into mo... (diff) | |
| download | slx-admin-5135886f2584631a414eb08e57d4ebdd2c48d611.tar.gz slx-admin-5135886f2584631a414eb08e57d4ebdd2c48d611.tar.xz slx-admin-5135886f2584631a414eb08e57d4ebdd2c48d611.zip | |
Add fallback feature to Dictionary functions
Diffstat (limited to 'modules-available')
| -rw-r--r-- | modules-available/baseconfig/page.inc.php | 2 | ||||
| -rw-r--r-- | modules-available/dozmod/page.inc.php | 8 | ||||
| -rw-r--r-- | modules-available/statistics/inc/filterset.inc.php | 2 | ||||
| -rw-r--r-- | modules-available/translation/page.inc.php | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/modules-available/baseconfig/page.inc.php b/modules-available/baseconfig/page.inc.php index 0995a369..9ff8c086 100644 --- a/modules-available/baseconfig/page.inc.php +++ b/modules-available/baseconfig/page.inc.php @@ -103,7 +103,7 @@ class Page_BaseConfig extends Page foreach ($this->categories as $catid => $val) { Dashboard::addSubmenu( '#category_' . $catid, - Dictionary::translateFileModule($this->categories[$catid]['module'], 'config-variable-categories', $catid) + Dictionary::translateFileModule($this->categories[$catid]['module'], 'config-variable-categories', $catid, true) ); } } diff --git a/modules-available/dozmod/page.inc.php b/modules-available/dozmod/page.inc.php index c1c19b15..31d4cce2 100644 --- a/modules-available/dozmod/page.inc.php +++ b/modules-available/dozmod/page.inc.php @@ -15,10 +15,10 @@ class Page_DozMod extends Page } /* add sub-menus */ - Dashboard::addSubmenu('?do=dozmod§ion=mailconfig', Dictionary::translate('submenu_mailconfig')); - Dashboard::addSubmenu('?do=dozmod§ion=templates', Dictionary::translate('submenu_templates')); - Dashboard::addSubmenu('?do=dozmod§ion=runtimeconfig', Dictionary::translate('submenu_runtime')); - Dashboard::addSubmenu('?do=dozmod§ion=users', Dictionary::translate('submenu_users')); + Dashboard::addSubmenu('?do=dozmod§ion=mailconfig', Dictionary::translate('submenu_mailconfig', true)); + Dashboard::addSubmenu('?do=dozmod§ion=templates', Dictionary::translate('submenu_templates', true)); + Dashboard::addSubmenu('?do=dozmod§ion=runtimeconfig', Dictionary::translate('submenu_runtime', true)); + Dashboard::addSubmenu('?do=dozmod§ion=users', Dictionary::translate('submenu_users', true)); /* instantiate sub pages */ $this->mail_templates = new Page_mail_templates(); diff --git a/modules-available/statistics/inc/filterset.inc.php b/modules-available/statistics/inc/filterset.inc.php index 7cc075c3..ea25d9b1 100644 --- a/modules-available/statistics/inc/filterset.inc.php +++ b/modules-available/statistics/inc/filterset.inc.php @@ -15,7 +15,7 @@ class FilterSet { $this->sortDirection = $direction === 'DESC' ? 'DESC' : 'ASC'; - if (array_key_exists($col, Page_Statistics::$columns)) { + if (is_string($col) && array_key_exists($col, Page_Statistics::$columns)) { $isMapped = array_key_exists('map_sort', Page_Statistics::$columns[$col]); $this->sortColumn = $isMapped ? Page_Statistics::$columns[$col]['map_sort'] : $col; } else { diff --git a/modules-available/translation/page.inc.php b/modules-available/translation/page.inc.php index 563ffae0..93616cd1 100644 --- a/modules-available/translation/page.inc.php +++ b/modules-available/translation/page.inc.php @@ -474,7 +474,7 @@ class Page_Translation extends Page if ($module === false) { $module = $this->module; } - $tags = $this->loadTagsFromPhp('/Dictionary\s*::\s*translate\s*\(\s*[\'"](?<tag>[^\'"\.]*)[\'"]\s*\)/i', + $tags = $this->loadTagsFromPhp('/Dictionary\s*::\s*translate\s*\(\s*[\'"](?<tag>[^\'"\.]*)[\'"]\s*[\),]/i', $this->getModulePhpFiles($module)); foreach ($tags as &$tag) { $tag = true; |