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

dev/translation#40 - Fix crash when change language on installer page
civicrm · Mar 25, 2020 · 269f890 · 269f890
2 parents dc966a6 + d0051c5
commit 269f890
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/install/index.php b/install/index.php
@@ -138,6 +138,11 @@
 $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.