Commit a0a9807e authored by Adrian Rossouw's avatar Adrian Rossouw Committed by adrian
Browse files

Add a conditional around the secondary batch import. This is needed for atrium...

Add a conditional around the secondary batch import. This is needed for atrium and future install profiles that make use of a l10n server
parent 5f0aba44
......@@ -305,19 +305,21 @@ function install_main() {
}
}
// profile-finished task
// Secondary locale import
if (!empty($install_locale) && ($install_locale != 'en')) {
// Collect files to import for this language. Skip components
// already covered in the initial batch set.
$batch = locale_batch_by_language($install_locale, NULL, $install_locale_batch_components);
if (!empty($batch)) {
// Start a batch, switch to 'locale-remaining-batch' task. We need to
// set the variable here, because batch_process() redirects.
batch_set($batch);
$batch =& batch_get();
$batch['progressive'] = FALSE;
batch_process();
if ($task == 'profile-finished') {
// profile-finished task
// Secondary locale import
if (!empty($install_locale) && ($install_locale != 'en')) {
// Collect files to import for this language. Skip components
// already covered in the initial batch set.
$batch = locale_batch_by_language($install_locale, NULL, $install_locale_batch_components);
if (!empty($batch)) {
// Start a batch, switch to 'locale-remaining-batch' task. We need to
// set the variable here, because batch_process() redirects.
batch_set($batch);
$batch =& batch_get();
$batch['progressive'] = FALSE;
batch_process();
}
}
}
......
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