From 285b9d036704152f2db27516476fec54d1385798 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Wed, 25 Apr 2012 23:01:49 +0200 Subject: [PATCH] Common strings for descriptions of DATE, TIME, DATETIME and VARCHAR2 --- libraries/data_drizzle.inc.php | 10 +++++----- libraries/data_mysql.inc.php | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/data_drizzle.inc.php b/libraries/data_drizzle.inc.php index 1c9c48b24d..3ff3a99072 100644 --- a/libraries/data_drizzle.inc.php +++ b/libraries/data_drizzle.inc.php @@ -244,11 +244,11 @@ function PMA_supportedDataTypesDescriptions() // Drizzle doesn't have UNSIGNED types 'SERIAL' => __('An alias for BIGINT NOT NULL AUTO_INCREMENT UNIQUE'), 'UUID' => __('Stores a Universally Unique Identifier (UUID)'), - 'DATE' => __("A date, supported range is '0001-01-01' to '9999-12-31'"), - 'DATETIME' => __("A date and time combination, supported range is '0001-01-01 00:00:00' to '9999-12-31 23:59:59'"), - 'TIMESTAMP' => __("A timestamp, range is '0001-01-01 00:00:00' UTC to '9999-12-31 23:59:59' UTC, TIMESTAMP(6) can store microseconds"), - 'TIME' => __("A time, range is '00:00:00' to '23:59:59'"), - 'VARCHAR' => __('A variable-length (0-16,383) string'), + 'DATE' => sprintf(__("A date, supported range is '%s' to '%s'"), '0001-01-01', '9999-12-31'), + 'DATETIME' => sprintf(__("A date and time combination, supported range is '%s' to '%s'"), '0001-01-01 00:00:0', '9999-12-31 23:59:59'), + 'TIMESTAMP' => __("A timestamp, range is '0001-01-01 00:00:00' UTC to '9999-12-31 23:59:59' UTC; TIMESTAMP(6) can store microseconds"), + 'TIME' => sprintf(__("A time, range is '%s' to '%s'"), '00:00:00', '23:59:59'), + 'VARCHAR' => sprintf(__('A variable-length (%s) string, the effective maximum length is subject to the maximum row size'), '0-16,383'), 'TEXT' => __('A TEXT column with a maximum length of 65,535 (2^16 - 1) characters, stored with a two-byte prefix indicating the length of the value in bytes'), 'VARBINARY' => __('A variable-length (0-65,535) string, uses binary collation for all comparisons'), 'BLOB' => __('A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with a four-byte prefix indicating the length of the value'), diff --git a/libraries/data_mysql.inc.php b/libraries/data_mysql.inc.php index 16f83f1e47..97e614f25b 100644 --- a/libraries/data_mysql.inc.php +++ b/libraries/data_mysql.inc.php @@ -309,13 +309,13 @@ function PMA_supportedDataTypesDescriptions() 'BIT' => __('A bit-field type (M), storing M of bits per value (default is 1, maximum is 64)'), 'BOOLEAN' => __('A synonym for TINYINT(1), a value of zero is considered false, nonzero values are considered true'), 'SERIAL' => __('An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE'), - 'DATE' => __("A date, supported range is '1000-01-01' to '9999-12-31'"), - 'DATETIME' => __("A date and time combination, supported range is '1000-01-01 00:00:00' to '9999-12-31 23:59:59'"), + 'DATE' => sprintf(__("A date, supported range is '%s' to '%s'"), '1000-01-01', '9999-12-31'), + 'DATETIME' => sprintf(__("A date and time combination, supported range is '%s' to '%s'"), '1000-01-01 00:00:00', '9999-12-31 23:59:59'), 'TIMESTAMP' => __("A timestamp, range is '1970-01-01 00:00:01' UTC to '2038-01-09 03:14:07' UTC, stored as the number of seconds since the epoch ('1970-01-01 00:00:00' UTC)"), - 'TIME' => __("A time, range is '-838:59:59' to '838:59:59'"), + 'TIME' => sprintf(__("A time, range is '%s' to '%s'"), '-838:59:59', '838:59:59'), 'YEAR' => __("A year in four-digit (4, default) or two-digit (2) format, the allowable values are 70 (1970) to 69 (2069) or 1901 to 2155 and 0000"), 'CHAR' => __('A fixed-length (0-255, default 1) string that is always right-padded with spaces to the specified length when stored'), - 'VARCHAR' => __('A variable-length (0-65,535) string, the effective maximum length is subject to the maximum row size (65,535 bytes)'), + 'VARCHAR' => sprintf(__('A variable-length (%s) string, the effective maximum length is subject to the maximum row size'), '0-65,535'), 'TINYTEXT' => __('A TEXT column with a maximum length of 255 (2^8 - 1) characters, stored with a one-byte prefix indicating the length of the value in bytes'), 'TEXT' => __('A TEXT column with a maximum length of 65,535 (2^16 - 1) characters, stored with a two-byte prefix indicating the length of the value in bytes'), 'MEDIUMTEXT' => __('A TEXT column with a maximum length of 16,777,215 (2^24 - 1) characters, stored with a three-byte prefix indicating the length of the value in bytes'),