From 7ad1f5dc672c272c6e15d9b6dae19bec384d204a Mon Sep 17 00:00:00 2001
From: Bachir Soussi Chiadmi <bachir@g-u-i.me>
Date: Wed, 14 Oct 2015 17:15:19 +0200
Subject: [PATCH] patched i18n modules for node don't record chosen language on
 create see https://www.drupal.org/node/1852102#comment-9612303

---
 sites/all/.directory                                       | 4 ----
 .../contrib/localisation/i18n/i18n_node/i18n_node.module   | 7 ++++++-
 2 files changed, 6 insertions(+), 5 deletions(-)
 delete mode 100644 sites/all/.directory

diff --git a/sites/all/.directory b/sites/all/.directory
deleted file mode 100644
index 46462e04..00000000
--- a/sites/all/.directory
+++ /dev/null
@@ -1,4 +0,0 @@
-[Dolphin]
-Timestamp=2015,4,27,12,4,40
-Version=3
-ViewMode=2
diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_node/i18n_node.module b/sites/all/modules/contrib/localisation/i18n/i18n_node/i18n_node.module
index 8c2e38e3..8f14bcd9 100644
--- a/sites/all/modules/contrib/localisation/i18n/i18n_node/i18n_node.module
+++ b/sites/all/modules/contrib/localisation/i18n/i18n_node/i18n_node.module
@@ -507,7 +507,12 @@ function _i18n_node_form_node_form_alter($form, &$form_state) {
   }
   elseif (variable_get('i18n_node_default_language_none', 0) && !isset($form['#node']->nid)) {
     // Override locale module setting default language to nodes. It is already in form_state.
-    $form['language']['#value'] = $form_state['values']['language'] = LANGUAGE_NONE;
+    // $form['language']['#value'] = $form_state['values']['language'] = LANGUAGE_NONE;
+    // Only do this if the language is really disabled
+    if (variable_get('language_content_type_' . $node->type, 0) == 0) {
+      // Override locale module setting default language to nodes. It is already in form_state.
+      $form['language']['#value'] = $form_state['values']['language'] = LANGUAGE_NONE;
+    }
   }
   // Translate field names for title and body for the node edit form.
   if (!empty($form['title']['#title'])) {