non security modules update

sites/all/modules/contrib/localisation/entity_translation/views/entity_translation.views.inc

@@ -224,4 +224,24 @@ function entity_translation_views_data_alter(&$data) {
       );
     }
   }
+
+  // Expose all translatable fields, using a handler based off Views' default
+  // field handler, that allows users to select the language to display the
+  // field in.
+  foreach (field_info_fields() as $field) {
+    if ($field['translatable'] && $field['storage']['type'] == 'field_sql_storage') {
+      // Set defaults and just change the handler, title, group, and help.
+      $defaults = field_views_field_default_views_data($field);
+      foreach ($defaults as $table_name => $table_data) {
+        if (isset($data[$table_name][$field['field_name']])) {
+          $field_title = $table_data[$field['field_name']]['title'];
+          $table_data[$field['field_name']]['title'] = t('!title: translated', array('!title' => $field_title));
+          $table_data[$field['field_name']]['group'] = t('Entity translation');
+          $table_data[$field['field_name']]['help'] .= ' ' . t('Show the field !title translated into a specified language', array('!title' => $field_title));
+          $table_data[$field['field_name']]['field']['handler'] = 'entity_translation_handler_field_field';
+          $data[$table_name][$field['field_name'] . '_et'] = $table_data[$field['field_name']];
+        }
+      }
+    }
+  }
 }

sites/all/modules/contrib/localisation/entity_translation/views/entity_translation_handler_field_field.inc

@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * This file contains a field handler for entity translation that shows field
+ * content translated into a specified language.
+ */
+
+class entity_translation_handler_field_field extends views_handler_field_field {
+
+  function option_definition() {
+    $options = parent::option_definition();
+
+    $options['language'] = array(
+      'default' => '***CURRENT_LANGUAGE***',
+    );
+    return $options;
+  }
+
+  function options_form(&$form, &$form_state) {
+    parent::options_form($form, $form_state);
+
+    $languages = array(
+      '***CURRENT_LANGUAGE***' => t("Current user's language"),
+      '***DEFAULT_LANGUAGE***' => t("Default site language"),
+      LANGUAGE_NONE => t('Language neutral'),
+    );
+
+    $languages = array_merge($languages, locale_language_list());
+
+    $form['language'] = array(
+      '#type' => 'select',
+      '#title' => t('Language'),
+      '#options' => $languages,
+      '#default_value' => $this->options['language'],
+      '#description' => t('Select the language to display this field in')
+    );
+  }
+
+  /**
+   * Overrides parent::field_language, retrieving the language from the handler
+   * options.
+   */
+  function field_language($entity_type, $entity) {
+    global $language_content;
+
+    if (field_is_translatable($entity_type, $this->field_info)) {
+      $default_language = language_default('language');
+      $language = str_replace(array('***CURRENT_LANGUAGE***', '***DEFAULT_LANGUAGE***'),
+                              array($language_content->language, $default_language),
+                              $this->options['language']);
+
+      // Give the Field Language API a chance to fallback to a different language
+      // (or LANGUAGE_NONE), in case the field has no data for the selected language.
+      // field_view_field() does this as well, but since the returned language code
+      // is used before calling it, the fallback needs to happen explicitly.
+      $language = field_language($entity_type, $entity, $this->field_info['field_name'], $language);
+
+      return $language;
+    }
+    else {
+      return LANGUAGE_NONE;
+    }
+  }
+}