diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index c9f9632..20394f5 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -2961,17 +2961,17 @@ function template_preprocess_system_date_format_localize_form(&$variables) {
     $row = array();
     $row[] = $form['date_formats'][$key]['#title'];
     unset($form['date_formats'][$key]['#title']);
-    $row[] = array('data' => $form['date_formats'][$key]);
+    $row[] = array('data' => drupal_render($form['date_formats'][$key]));
     $rows[] = $row;
   }
 
-  $variables['language'] = $form['language'];
+  $variables['language'] = drupal_render($form['language']);
   $variables['table'] = array(
     '#theme' => 'table',
     '#header' => $header,
     '#rows' => $rows
   );
-  $variables['actions'] = $form['actions'];
+  $variables['buttons'] = drupal_render_children($form);
 }
 
 /**
diff --git a/core/modules/system/templates/datetime.html.twig b/core/modules/system/templates/datetime.html.twig
index d6c84c6..6ff52be 100644
--- a/core/modules/system/templates/datetime.html.twig
+++ b/core/modules/system/templates/datetime.html.twig
@@ -26,6 +26,6 @@
 #}
 {# 
   @todo Revisit once http://drupal.org/node/1825952 is resolved.
-  @todo Revisit once http://drupal.org/node/1905584 is resolved.
+  @todo http://drupal.org/node/1939080
 #}
 <time class="{{ attributes.class }}" {{ attributes }}>{{ html ? text|raw : text|escape }}</time>
diff --git a/core/modules/system/templates/system-date-format-localize-form.html.twig b/core/modules/system/templates/system-date-format-localize-form.html.twig
index 8d950ab..f2f8c36 100644
--- a/core/modules/system/templates/system-date-format-localize-form.html.twig
+++ b/core/modules/system/templates/system-date-format-localize-form.html.twig
@@ -17,4 +17,4 @@
 #}
 {{ language }}
 {{ table }}
-{{ actions }}
+{{ buttons }}