- Added: Translate tags vocablary name on node form, by dboulet, #494576

- Fixed i18n Filter in Views results in SQL Error, by markus_petrux, #522162

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 676cc42..67cbc98 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,9 @@
 
 6.x-1.1 to .......
 ------------------
+- Added: Translate tags vocablary name on node form, by dboulet, #494576
+- Fixed i18n Filter in Views results in SQL Error, by markus_petrux, #522162
+- Added tag support for taxonomy synchronization, #605600
 - Fixed buggy taxonomy synchronization, #365606, #365606, #379306
 - Cleaning some module dependencies and old code.
 - Fixed: Select translations autocomplete wrong filtering by hass, #557980

diff --git a/i18ntaxonomy/i18ntaxonomy.module b/i18ntaxonomy/i18ntaxonomy.module
index e304820..29217e3 100644 (file)
--- a/i18ntaxonomy/i18ntaxonomy.module
+++ b/i18ntaxonomy/i18ntaxonomy.module
@@ -482,6 +482,7 @@ function i18ntaxonomy_node_form(&$form) {
       // Special treatment for tags, add some help texts
       foreach (element_children($form['taxonomy']['tags']) as $vid) {
         if (i18ntaxonomy_vocabulary($vid) == I18N_TAXONOMY_LOCALIZE) {
+          $form['taxonomy']['tags'][$vid]['#title'] = check_plain(tt("taxonomy:vocabulary:$vid:name", $form['taxonomy']['tags'][$vid]['#title']));
           $form['taxonomy']['tags'][$vid]['#description'] .= ' '. t('This is a localizable vocabulary, so only terms in %language are allowed here.', array('%language' => language_default('name')));
         }
       }

diff --git a/i18nviews/includes/content_negotiation_filter_handler.inc b/i18nviews/includes/content_negotiation_filter_handler.inc
index c238df8..5a8f922 100644 (file)
--- a/i18nviews/includes/content_negotiation_filter_handler.inc
+++ b/i18nviews/includes/content_negotiation_filter_handler.inc
@@ -2,9 +2,11 @@
 
 class content_negotiation_filter_handler extends views_handler_filter {
   function query() {
-    $table_alias = $this->query->ensure_table('node');
-    $where = i18n_db_rewrite_where($table_alias, 'node');
-    $this->query->add_where($this->options['group'], $where);
+    $this->ensure_my_table();
+    $where = i18n_db_rewrite_where($this->table_alias, 'node');
+    if (!empty($where)) {
+      $this->query->add_where($this->options['group'], $where);
+    }
   }
 
   function option_definition() {