Commit 3471ea4b authored by samuelsov's avatar samuelsov Committed by atif-shaikh

Get the default language from database not from current viewing language

Conflicts:
	CRM/Core/BAO/ConfigSetting.php
parent f0276cd5
......@@ -318,14 +318,8 @@ class CRM_Core_BAO_ConfigSetting {
}
}
if ($lcMessages) {
// update config lcMessages - CRM-5027 fixed.
$defaults['lcMessages'] = $lcMessages;
}
else {
// if a single-lang site or the above didn't yield a result, use default
$lcMessages = CRM_Utils_Array::value('lcMessages', $defaults);
}
// if a single-lang site or the above didn't yield a result, use default
$lcMessages = CRM_Utils_Array::value( 'lcMessages', $defaults );
// set suffix for table names - use views if more than one language
$dbLocale = $multiLang ? "_{$lcMessages}" : '';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment