diff --git a/include/lang.inc.php b/include/lang.inc.php index b7d7c93b..6f13822e 100644 --- a/include/lang.inc.php +++ b/include/lang.inc.php @@ -11,8 +11,13 @@ if (!defined('serendipity_LANG_LOADED') || serendipity_LANG_LOADED !== true) { // The following variable can be set in serendipity_config_local.inc.php to force your templates being able to use language override includes if ($serendipity['useTemplateLanguage']) { - @include (S9Y_INCLUDE_PATH . 'templates/' . $serendipity['template'] . '/' . $charset . 'lang_' . $serendipity['lang'] . '.inc.php'); - @include (S9Y_INCLUDE_PATH . 'templates/' . $serendipity['template'] . '/lang_en.inc.php'); + if (defined('S9Y_DATA_PATH')) { + @include (S9Y_DATA_PATH . 'templates/' . $serendipity['template'] . '/' . $charset . 'lang_' . $serendipity['lang'] . '.inc.php'); + @include (S9Y_DATA_PATH . 'templates/' . $serendipity['template'] . '/lang_en.inc.php'); + } else { + @include (S9Y_INCLUDE_PATH . 'templates/' . $serendipity['template'] . '/' . $charset . 'lang_' . $serendipity['lang'] . '.inc.php'); + @include (S9Y_INCLUDE_PATH . 'templates/' . $serendipity['template'] . '/lang_en.inc.php'); + } } // Try and include preferred language from the configurated setting