iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #307 from MyIgel/real-path 

Fix relative paths: missing / on internationalization
This commit is contained in:
msquare 2017-01-02 00:10:49 +01:00 committed by GitHub
parent 29128763fd 1f0ca24f5c
commit 4a95dfa171
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/helper/internationalization_helper.php
View File

@ -25,15 +25,15 @@ function locale_short() {
*/ */
function gettext_init() { function gettext_init() {
global $locales, $default_locale; global $locales, $default_locale;
if (isset($_REQUEST['set_locale']) && in_array($_REQUEST['set_locale'], array_keys($locales))) { if (isset($_REQUEST['set_locale']) && isset($locales[$_REQUEST['set_locale']])) {
$_SESSION['locale'] = $_REQUEST['set_locale']; $_SESSION['locale'] = $_REQUEST['set_locale'];
} elseif (! isset($_SESSION['locale'])) { } elseif (! isset($_SESSION['locale'])) {
$_SESSION['locale'] = $default_locale; $_SESSION['locale'] = $default_locale;
} }
gettext_locale(); gettext_locale();
bindtextdomain('default', __DIR__ . '../../locale'); bindtextdomain('default', realpath(__DIR__ . '/../../locale'));
bind_textdomain_codeset('default', 'UTF-8'); bind_textdomain_codeset('default', 'UTF-8');
textdomain('default'); textdomain('default');
} }