Merge branch '1.1.x' into prod/1.1.x

config/install/locale.settings.yml

@@ -9,5 +9,5 @@ translation:
   overwrite_customized: false
   overwrite_not_customized: true
   update_interval_days: 0
-  path: sites/a8.fdsu1/files/translations
+  path: sites/default/files/translations
   import_enabled: true

uw_sites_all.info.yml

@@ -149,6 +149,7 @@ dependencies:
   - 'sophron:sophron'
   - 'subpathauto:subpathauto'
   - 'svg_image:svg_image'
+  - 'taxonomy_max_depth:taxonomy_max_depth'
   - 'taxonomy_term_locks:taxonomy_term_depth'
   - 'taxonomy_term_locks:taxonomy_term_locks'
   - 'token:token'

uw_sites_all.install

@@ -92,6 +92,11 @@ function uw_sites_all_install() {
     ],
   ])
     ->save();
+
+  // Set preferred_admin_langcode to en instead of NULL in 'users_field_data'.
+  \Drupal::database()->update('users_field_data')
+    ->fields(['preferred_admin_langcode' => 'en'])
+    ->execute();
 }
 
 /**
@@ -1802,3 +1807,24 @@ function uw_sites_all_update_9151(&$sandbox) {
 
   \Drupal::service('module_installer')->install($modules);
 }
+
+/**
+ * Update preferred_admin_langcode to 'en'.
+ */
+function uw_sites_all_update_9152(&$sandbox) {
+
+  \Drupal::database()->update('users_field_data')
+    ->fields(['preferred_admin_langcode' => 'en'])
+    ->execute();
+}
+
+/**
+ * Install taxonomy_max_depth.
+ */
+function uw_sites_all_update_9153(&$sandbox) {
+  $modules = [
+    'taxonomy_max_depth',
+  ];
+
+  \Drupal::service('module_installer')->install($modules);
+}