From 45ce123503d6f4745074802856a5cc2b2238635f Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 6 Sep 2015 21:50:41 +0100
Subject: [PATCH] Issue #2551047 by Sweetchuck: Simplify the switch-case in
 system_tokens()

---
 core/modules/system/system.tokens.inc | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/core/modules/system/system.tokens.inc b/core/modules/system/system.tokens.inc
index 31b8030cef8..a11f55d0c8f 100644
--- a/core/modules/system/system.tokens.inc
+++ b/core/modules/system/system.tokens.inc
@@ -165,21 +165,11 @@ function system_tokens($type, $tokens, array $data, array $options, BubbleableMe
     foreach ($tokens as $name => $original) {
       switch ($name) {
         case 'short':
-          $date_format = DateFormat::load('short');
-          $bubbleable_metadata->addCacheableDependency($date_format);
-          $replacements[$original] = format_date($date, 'short', '', NULL, $langcode);
-          break;
-
         case 'medium':
-          $date_format = DateFormat::load('medium');
-          $bubbleable_metadata->addCacheableDependency($date_format);
-          $replacements[$original] = format_date($date, 'medium', '', NULL, $langcode);
-          break;
-
         case 'long':
-          $date_format = DateFormat::load('long');
+          $date_format = DateFormat::load($name);
           $bubbleable_metadata->addCacheableDependency($date_format);
-          $replacements[$original] = format_date($date, 'long', '', NULL, $langcode);
+          $replacements[$original] = format_date($date, $name, '', NULL, $langcode);
           break;
 
         case 'since':