- Patch #368408 by jeffschuler: improve consistency of API and settings on administration pages.

2 files changed, 12 insertions, 12 deletions

diff --git a/modules/system/system.test b/modules/system/system.test
index 828ab0e85..b5176fd85 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -1218,7 +1218,7 @@ class TokenReplaceTestCase extends DrupalWebTestCase {
     $source .= '[node:created:since]'; // Time since the node was created
     $source .= '[current-user:name]';  // Current user's name
     $source .= '[user:name]';          // No user passed in, should be untouched
-    $source .= '[date:small]';         // Small date format of REQUEST_TIME
+    $source .= '[date:short]';         // Short date format of REQUEST_TIME
     $source .= '[bogus:token]';        // Nonexistent token, should be untouched
 
     $target  = check_plain($node->title);
@@ -1226,7 +1226,7 @@ class TokenReplaceTestCase extends DrupalWebTestCase {
     $target .= format_interval(REQUEST_TIME - $node->created, 2);
     $target .= check_plain($user->name);
     $target .= '[user:name]';
-    $target .= format_date(REQUEST_TIME, 'small');
+    $target .= format_date(REQUEST_TIME, 'short');
     $target .= '[bogus:token]';
 
     $result = token_replace($source, array('node' => $node));
diff --git a/modules/system/system.tokens.inc b/modules/system/system.tokens.inc
index 5ab7a573b..07afe5deb 100644
--- a/modules/system/system.tokens.inc
+++ b/modules/system/system.tokens.inc
@@ -54,17 +54,17 @@ function system_token_info() {
   );
 
   // Date related tokens.
-  $date['small'] = array(
-    'name' => t("Small format"),
-    'description' => t("A date in 'small' format. (%date)", array('%date' => format_date(REQUEST_TIME, 'small'))),
+  $date['short'] = array(
+    'name' => t("Short format"),
+    'description' => t("A date in 'short' format. (%date)", array('%date' => format_date(REQUEST_TIME, 'short'))),
   );
   $date['medium'] = array(
     'name' => t("Medium format"),
     'description' => t("A date in 'medium' format. (%date)", array('%date' => format_date(REQUEST_TIME, 'medium'))),
   );
-  $date['large'] = array(
-    'name' => t("Large format"),
-    'description' => t("A date in 'large' format. (%date)", array('%date' => format_date(REQUEST_TIME, 'large'))),
+  $date['long'] = array(
+    'name' => t("Long format"),
+    'description' => t("A date in 'long' format. (%date)", array('%date' => format_date(REQUEST_TIME, 'long'))),
   );
   $date['custom'] = array(
     'name' => t("Custom format"),
@@ -203,16 +203,16 @@ function system_tokens($type, $tokens, array $data = array(), array $options = a
           $replacements[$original] = filter_xss($date);
           break;
 
-        case 'small':
-          $replacements[$original] = format_date($date, 'small', '', NULL, $langcode);
+        case 'short':
+          $replacements[$original] = format_date($date, 'short', '', NULL, $langcode);
           break;
 
         case 'medium':
           $replacements[$original] = format_date($date, 'medium', '', NULL, $langcode);
           break;
 
-        case 'large':
-          $replacements[$original] = format_date($date, 'large', '', NULL, $langcode);
+        case 'long':
+          $replacements[$original] = format_date($date, 'long', '', NULL, $langcode);
           break;
 
         case 'since':