Projet

Général

Profil

Révision 8c72e82a

Ajouté par Assos Assos il y a environ 7 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/i18n/i18n_node/i18n_node.module
222 222
function i18n_node_node_prepare($node) {
223 223
  $options = variable_get('i18n_node_options_' . $node->type, array());
224 224
  if (i18n_node_type_enabled($node) && empty($node->nid) && !i18n_object_langcode($node) && in_array('current', $options)) {
225
    $default = variable_get('i18n_node_default_language_for_' . $node->type, '-- current --');
226

  
225 227
    // Set current language for new nodes if option enabled
226
    $node->language = i18n_language_content()->language;
228
    if ($default === '-- current --') {
229
      $node->language = i18n_language_content()->language;
230
    }
231
    // If a custom language was specified, apply it.
232
    else {
233
      $node->language = $default;
234
    }
227 235
  }
228 236
}
229 237

  
......
417 425
    // Some settings about node languages. Add variables for node type from variable definition
418 426
    if ($form['#node_type']->type) {
419 427
      variable_type_include('node_type');
420
      $form['i18n'] += node_variable_type_subform($form['#node_type']->type, array('i18n_node_options', 'i18n_node_extended'));
428
      $form['i18n'] += node_variable_type_subform($form['#node_type']->type, array('i18n_node_options', 'i18n_node_default_language_for', 'i18n_node_extended'));
429
      // Only show custom default language field if "current" is checked.
430
      $form['i18n']['i18n_node_default_language_for']['#states'] = array(
431
        'visible' => array(
432
          ':input[name="i18n_node_options[current]"]' => array('checked' => TRUE),
433
        ),
434
        'required' => array(
435
          ':input[name="i18n_node_options[current]"]' => array('checked' => TRUE),
436
        ),
437
      );
421 438
    }
422 439
    // Add disabled message
423 440
    if ($disabled) {

Formats disponibles : Unified diff