Unverified Commit 269f890e authored by Seamus Lee's avatar Seamus Lee Committed by GitHub

Merge pull request #16842 from demeritcowboy/lang-install-crash

translation#40 - Fix crash when change language on installer page
parents dc966a6d d0051c50
......@@ -138,6 +138,11 @@ global $tsLocale;
$tsLocale = 'en_US';
$seedLanguage = 'en_US';
// Backwards compatibility with default location of l10n files
if (!defined('CIVICRM_L10N_BASEDIR') && file_exists($crmPath . DIRECTORY_SEPARATOR . 'l10n')) {
define('CIVICRM_L10N_BASEDIR', $crmPath . DIRECTORY_SEPARATOR . 'l10n');
// CRM-16801 This validates that seedLanguage is valid by looking in $langs.
// NB: the variable is initial a $_REQUEST for the initial page reload,
// then becomes a $_POST when the installation form is submitted.
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