Skip to content
Snippets Groups Projects
Commit c3dbec89 authored by Jared Hancock's avatar Jared Hancock
Browse files

i18n: Fixup several install related issues

parent 2ea84ada
No related branches found
No related tags found
No related merge requests found
......@@ -180,7 +180,7 @@ class Bootstrap {
function loadCode() {
#include required files
require_once INCLUDE_DIR.'class.util.php';
require INCLUDE_DIR.'class.translation.php';
require_once INCLUDE_DIR.'class.translation.php';
require(INCLUDE_DIR.'class.signal.php');
require(INCLUDE_DIR.'class.user.php');
require(INCLUDE_DIR.'class.auth.php');
......
......@@ -253,6 +253,9 @@ class Internationalization {
static function getConfiguredSystemLanguages() {
global $cfg;
if (!$cfg)
return self::availableLanguages();
$langs = array();
// Honor sorting preference of ::availableLanguages()
foreach (self::availableLanguages() as $k=>$l) {
......@@ -272,7 +275,7 @@ class Internationalization {
global $cfg;
if (empty($_SERVER["HTTP_ACCEPT_LANGUAGE"]))
return $cfg->getPrimaryLanguage();
return $cfg ? $cfg->getPrimaryLanguage() : 'en_US';
$languages = self::getConfiguredSystemLanguages();
......
......@@ -442,7 +442,7 @@ class Topic {
if (!($names = static::getHelpTopics(false, true, false)))
return;
if (function_exists('collator_create')) {
if ($cfg && function_exists('collator_create')) {
$coll = Collator::create($cfg->getPrimaryLanguage());
// UASORT is necessary to preserve the keys
uasort($names, function($a, $b) use ($coll) {
......
b26f29a6bb5dbb3510b057632182d138
6f664a3de1435defbdcbaa64ecb2b1ea
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment