From 93f0677748d841f14eeb60bb57a207798cc2c7ea Mon Sep 17 00:00:00 2001
From: msolv <msolv@users.noreply.github.com>
Date: Wed, 26 Jul 2017 18:37:50 -0300
Subject: [PATCH] Include language selectors on 'chosen_jquery_selector' config
 (#2034)

* Added upgrade hook

* Update CHANGELOG.txt

* Updated chosen_jquery_selector config on dkan_dataset_content_types

* Update CHANGELOG.txt
---
 CHANGELOG.txt                                            | 1 +
 dkan.install                                             | 9 +++++++++
 .../dkan_dataset_content_types.strongarm.inc             | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1bfaf2ecaa..8bbca98f61 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,6 @@
 7.x-1.13.6
 ----------
+ - #2034 Added language selectors on 'chosen_jquery_selector' configuration.
  - #2018 Additional test/devops improvements needed for deployment. See #2012, #2014, #2015 and #2016 for specifics.
 
 7.x-1.13.5
diff --git a/dkan.install b/dkan.install
index f91f8a8e35..3da7a176f9 100644
--- a/dkan.install
+++ b/dkan.install
@@ -378,3 +378,12 @@ function dkan_update_7021() {
     ->condition('eid', $eid)
     ->execute();
 }
+
+/**
+ * Update chosen_jquery_selector to include language selectors.
+ */
+function dkan_update_7022() {
+  // REF #1936, #1890.
+  variable_set('chosen_jquery_selector',
+    '.page-node select:not([class*="delta-order"], [name*="workbench_moderation"], [class*="filter-list"], [id*="delimiter"],[name*="sort_by"],[name*="sort_order"], [id*="lines-terminated-by"], [id*="lang-dropdown-select-language"])');
+}
diff --git a/modules/dkan/dkan_dataset/modules/dkan_dataset_content_types/dkan_dataset_content_types.strongarm.inc b/modules/dkan/dkan_dataset/modules/dkan_dataset_content_types/dkan_dataset_content_types.strongarm.inc
index fce31d54b3..417b6db762 100644
--- a/modules/dkan/dkan_dataset/modules/dkan_dataset_content_types/dkan_dataset_content_types.strongarm.inc
+++ b/modules/dkan/dkan_dataset/modules/dkan_dataset_content_types/dkan_dataset_content_types.strongarm.inc
@@ -15,7 +15,7 @@ function dkan_dataset_content_types_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'chosen_jquery_selector';
-  $strongarm->value = '.page-node select:not([class*="delta-order"], [name*="workbench_moderation"], [class*="filter-list"], [id*="delimiter"],[name*="sort_by"],[name*="sort_order"], [id*="lines-terminated-by"])';
+  $strongarm->value = '.page-node select:not([class*="delta-order"], [name*="workbench_moderation"], [class*="filter-list"], [id*="delimiter"],[name*="sort_by"],[name*="sort_order"], [id*="lines-terminated-by"], [id*="lang-dropdown-select-language"])';
   $export['chosen_jquery_selector'] = $strongarm;
 
   $strongarm = new stdClass();