updated i18n, views, imagestyleflush, field_group

patch views_rss_media

sites/all/modules/contrib/localisation/i18n/i18n_user/README.txt

@@ -0,0 +1,70 @@
+CONTENTS OF THIS FILE
+---------------------
+
+* Introduction
+* Requirements
+* Recommended modules
+* Installation
+* Configuration
+* Maintainers
+
+
+INTRODUCTION
+------------
+
+The User mail translation module, part of the Internationalization
+(https://www.drupal.org/project/i18n) package, translates emails sent from the
+User module.
+
+* For a full description of the module, visit this page:
+  https://www.drupal.org/node/133977.
+
+* To submit bug reports and feature suggestions, or to track changes:
+  https://www.drupal.org/project/issues/i18n.
+
+
+REQUIREMENTS
+------------
+
+This module requires the following module:
+
+* Internationalization - https://www.drupal.org/project/i18n
+
+
+RECOMMENDED MODULES
+-------------------
+
+* Internationalization Views - https://www.drupal.org/project/i18nviews
+* Language Icons - https://www.drupal.org/project/languageicons
+* Translation Overview - https://www.drupal.org/project/translation_overview
+* Localization Client - https://www.drupal.org/project/l10n_client
+* Internationalization contributions -
+  https://www.drupal.org/project/i18n_contrib
+
+
+INSTALLATION
+------------
+
+This is a submodule of the Internationalization module. Install the
+Internationalization module as you would normally install a contributed Drupal
+module. Visit https://www.drupal.org/node/895232 for further information.
+
+
+CONFIGURATION
+-------------
+
+To configure email translations
+1. Navigate to Administration > Configuration > Regional and language >
+   Multilingual settings and select the variables tab.
+2. Select the "User emails" tab. Select the variables to be translated. Save
+   configuration.
+
+
+MAINTAINERS
+-----------
+
+* Jose Reyero - https://www.drupal.org/u/jose-reyero
+* Florian Weber (webflo) - https://www.drupal.org/u/webflo
+* Peter Philipp - https://www.drupal.org/u/das-peter
+* Joseph Olstad - https://www.drupal.org/u/joseph.olstad
+* Nathaniel Catchpole - https://www.drupal.org/u/catch

sites/all/modules/contrib/localisation/i18n/i18n_user/i18n_user.info

@@ -4,9 +4,8 @@ core = 7.x
 package = Multilingual - Internationalization
 dependencies[] = i18n_variable
 
-; Information added by Drupal.org packaging script on 2015-05-07
-version = "7.x-1.13"
+; Information added by Drupal.org packaging script on 2018-08-17
+version = "7.x-1.26"
 core = "7.x"
 project = "i18n"
-datestamp = "1430999922"
-
+datestamp = "1534531985"

sites/all/modules/contrib/localisation/i18n/i18n_user/i18n_user.module

@@ -9,7 +9,14 @@
  */
 function i18n_user_mail_alter(&$message) {
   if ($message['module'] == 'user') {
-    $language = $message['language'];
+    $message['language'] = language_default();
+    if (isset($message['params']['account'])) {
+      $user_preferred = user_preferred_language($message['params']['account']);
+      if (isset($user_preferred)) {
+        $message['language'] = $user_preferred;
+      }
+    }
+    $language = (isset($message['language']) ? $message['language'] : language_default());
     $variables = array('user' => $message['params']['account']);
     $key = $message['key'];