Commit 1f9814e8 authored by Nedjo Rogers's avatar Nedjo Rogers
Browse files

Issue #2444675: Call to install_profile_info() breaks non-English installs.

parent 0fb22bcd
Loading
Loading
Loading
Loading
+8 −4
Original line number Diff line number Diff line
@@ -15,18 +15,22 @@
 *   The install task definition.
 */
function _subprofiles_install_tasks($install_state) {
  if (isset($install_state['parameters']['profile']) && $info = install_profile_info($install_state['parameters']['profile'])) {
    $profile = $info['name'];
  // If there's a custom distibution name, use it.
  if (isset($install_state['profile_info']['distribution_name']) && $install_state['profile_info']['distribution_name'] != 'Drupal') {
    $profile = $install_state['profile_info']['distribution_name'];
  }
  // Otherwise, if there's a profile name, use it.
  elseif (isset($install_state['profile_info']['name'])) {
    $profile = $install_state['profile_info']['name'];
  }
  else {
    $profile = st('profile');
  }

  $args = array('!profile' => $profile);
  $tasks = array(
    // Enable the selected features.
    'subprofiles_install_profile_features' => array(
      'display_name' => st('Install !profile features', $args),
      'display_name' => st('Install !profile features', array('!profile' => $profile)),
      'type' => 'batch',
    ),
    // Subprofiles is no longer needed when it's done its work, so disable.