Merge remote-tracking branch 'origin/master'

phpmyadmin · May 9, 2012 · 42e3197 · 42e3197
2 parents 1f6b804 + 1562f58
commit 42e3197
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/libraries/Types.class.php b/libraries/Types.class.php
@@ -616,7 +616,7 @@ public function getColumns()
             'DATE',
 
             // numeric
-            'NUMERIC' => array(
+            __('NUMERIC') => array(
                 'TINYINT',
                 'SMALLINT',
                 'MEDIUMINT',
@@ -635,7 +635,7 @@ public function getColumns()
 
 
             // Date/Time
-            'DATE and TIME' => array(
+            __('DATE and TIME') => array(
                 'DATE',
                 'DATETIME',
                 'TIMESTAMP',
@@ -644,7 +644,7 @@ public function getColumns()
             ),
 
             // Text
-            'STRING' => array(
+            __('STRING') => array(
                 'CHAR',
                 'VARCHAR',
                 '-',
@@ -665,7 +665,7 @@ public function getColumns()
                 'SET',
             ),
 
-            'SPATIAL' => array(
+            __('SPATIAL') => array(
                 'GEOMETRY',
                 'POINT',
                 'LINESTRING',
@@ -942,7 +942,7 @@ public function getColumns()
             'DATE',
 
             // numeric
-            'NUMERIC' => array(
+            __('NUMERIC') => array(
                 'INTEGER',
                 'BIGINT',
                 '-',
@@ -956,15 +956,15 @@ public function getColumns()
 
 
             // Date/Time
-            'DATE and TIME' => array(
+            __('DATE and TIME') => array(
                 'DATE',
                 'DATETIME',
                 'TIMESTAMP',
                 'TIME',
             ),
 
             // Text
-            'STRING' => array(
+            __('STRING') => array(
                 'VARCHAR',
                 'TEXT',
                 '-',