updated core and some modules

2017-02-27 13:42:16 +01:00
parent 8a300d7d79
commit b38c8e71d1
228 changed files with 2503 additions and 750 deletions
@@ -0,0 +1,63 @@
+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 modules:
+
+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/docs/7/extending-drupal-7/installing-contributed-modules-find-import-enable-configure-drupal-7 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 you would like translated and 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
@@ -4,9 +4,9 @@ core = 7.x
 package = Multilingual - Internationalization
 dependencies[] = i18n_variable

-; Information added by Drupal.org packaging script on 2016-10-22
-version = "7.x-1.14"
+; Information added by Drupal.org packaging script on 2017-01-31
+version = "7.x-1.15"
 core = "7.x"
 project = "i18n"
-datestamp = "1477154943"
+datestamp = "1485834792"

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