Merge branch 'feature/ISTWCMS-6910-ebremner-menu-translations' into '1.1.x'

ISTWCMS-6062: modifying admin label to include publications on reference...

See merge request !128

templates/regions/region--footer.html.twig

@@ -12,13 +12,11 @@
  * @see template_preprocess_region()
  */
 #}
-{% set social_media = simplify_menu('uw-menu-global-social-media') %}
-{% set footer_menu = simplify_menu('uw-menu-global-footer') %}
 
 {% embed '@layouts/footer/footer.twig' with {
   "social_media": social_media,
   "social_media_placement": "global-site-footer",
-  "footer_menu": footer_menu.menu_tree
+  "footer_menu": footer_menu
 } %}
 
   {% block content %}

uw_fdsu_theme_resp.theme

@@ -192,10 +192,10 @@ function uw_fdsu_theme_resp_preprocess_region(&$variables) {
     $variables['home_link'] = Url::fromRoute('<front>')->setAbsolute()->toString();
 
     // Set the main menu variable.
-    $variables['main_menu'] = \Drupal::service('uw_cfg_common.uw_service')->uwGetMenu('main', TRUE, TRUE);
+    $variables['main_menu'] = \Drupal::service('uw_cfg_common.uw_menu_items')->getMenuTree('main', TRUE, TRUE);
 
     // Set the secondary menu variable.
-    $variables['secondary_menu'] = \Drupal::service('uw_cfg_common.uw_service')->uwGetMenu('uw-menu-audience-menu', TRUE, TRUE);
+    $variables['secondary_menu'] = \Drupal::service('uw_cfg_common.uw_menu_items')->getMenuTree('uw-menu-audience-menu', TRUE, TRUE);
 
     // The class that is used for the header.
     $variables['classes'][] = 'uw-header';
@@ -249,6 +249,22 @@ function uw_fdsu_theme_resp_preprocess_region(&$variables) {
       $variables['classes'][] = 'uw-contained-width';
     }
   }
+
+  if ($region == 'footer') {
+    $variables['social_media'] = \Drupal::service('uw_cfg_common.uw_menu_items')
+      ->getMenuTree(
+        'uw-menu-global-social-media',
+        FALSE
+      );
+
+    $variables['footer_menu'] = \Drupal::service('uw_cfg_common.uw_menu_items')
+      ->getMenuTree(
+        'uw-menu-global-footer',
+        FALSE
+      );
+    $test = '';
+  }
+
   $variables['language'] = \Drupal::languageManager()->getCurrentLanguage();
 }