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,86 @@
+CONTENTS OF THIS FILE
+---------------------
+
+* Introduction
+* Requirements
+* Recommended modules
+* Installation
+* Configuration
+* Maintainers
+
+
+INTRODUCTION
+------------
+
+The Taxonomy translation module, part of the Internationalization (https://www.drupal.org/project/i18n) package, provides multiple options to translate taxonomy vocabularies and terms. For each vocabulary, there are four types of behaviors to choose from: Language-independent terms, Language-specific terms, Localized terms, and Mixed-language vocabulary.
+
+* For a full description of the module visit https://www.drupal.org/node/1114016
+
+* To submit bug reports and feature suggestions, or to track changes visit 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
+-------------
+
+Language-independent terms - only vocabulary will be translatable.
+1. Navigate to Structure > Taxonomy.
+2. Select the "edit vocabulary" link.
+3. Select the "No multilingual options for terms".
+
+Language-specific terms - vocabulary is only used for content in that language. The terms will only be available if the term language matches the UI language.
+1. Navigate to Structure > Taxonomy and select the "edit vocabulary link".
+2. Choose "Fixed Language" and a Language drop-down field will be displayed.
+3. Select the language.
+4. Select "Fixed Language" and Save.
+
+Localized terms - Terms are common for all languages, but their name and description may be localized.
+1. Navigate to Structure > Taxonomy > vocabulary-to-edit > Edit.
+2. Select "Localize" and select Save.
+3. Edit a term and there will be a Translate tab. Select this tab.
+4. Select Translate, translate the Name and Description, select "Save translation", and repeat for all languages.
+5. Repeat the process for all terms.
+6. Navigate to Structure > Content types > term-to-edit > Manage display.
+7. By default, the term reference is set to Link. Change this to "Link (localized)" and Save.
+The vocabulary will be appropriate for the language.
+
+Mixed-language vocabulary - Use for vocabularies with terms in multiple languages.
+1. Navigate to Structure > Taxonomy > vocabulary-to-edit > Edit.
+2. Select the Translate radio button and Save.
+3. Edit a vocabulary term and there will be a new Language field. Choose a language and then select Save and translate.
+4. There are two options, the user can either select "Add translation link" or the user can select an existing term in the Select translations form.
+5. Create translations for the terms and add terms for specific languages only.
+Now if the user edits a node associated with this vocabulary, only the relevant terms will appear.
+
+
+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
@@ -11,9 +11,9 @@ files[] = i18n_taxonomy.pages.inc
 files[] = i18n_taxonomy.admin.inc
 files[] = i18n_taxonomy.test

-; 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"

@@ -1096,7 +1096,7 @@ function i18n_taxonomy_get_tree($vid, $langcode, $parent = 0, $max_depth = NULL,
    $query->join('taxonomy_term_hierarchy', 'h', 'h.tid = t.tid');
    $result = $query
      ->addTag('translatable')
-      ->addTag('term_access')
+      ->addTag('taxonomy_term_access')
      ->fields('t')
      ->fields('h', array('parent'))
      ->condition('t.vid', $vid)
@@ -1270,3 +1270,22 @@ function i18n_taxonomy_modules_enabled($modules) {
    }
  }
 }
+
+/**
+ * Implements hook_views_pre_render().
+ */
+function i18n_taxonomy_views_pre_render(&$view) {
+  if(!module_exists('rules_scheduler')) {
+    global $language;
+
+    foreach ($view->result as $delta => $term){
+      if (isset($term->tid)) {
+        i18n_string_translate_langcode($language->language);
+        $localized_term = i18n_taxonomy_localize_terms(taxonomy_term_load($term->tid));
+        $term->tid = $localized_term->tid;
+        $term->taxonomy_term_data_name = $localized_term->name;
+        $term->taxonomy_term_data_description = $localized_term->description;
+      }
+    }
+  }
+}
@@ -100,7 +100,7 @@ function _i18n_taxonomy_autocomplete($langcode, $vids, $tags_typed = '') {
    $query = db_select('taxonomy_term_data', 't')
      ->fields('t', array('tid', 'name'));
    $query->addTag('translatable');
-    $query->addTag('term_access');
+    $query->addTag('taxonomy_term_access');
    // Disable i18n_select for this query
    $query->addTag('i18n_select');
    // Add language condition