The branch, master has been updated via 00604060e83ed82fb874209b4364fc4c69902798 (commit) from c38f34393fe477870a1bb97a9c40444bb18fa4f2 (commit)
- Log ----------------------------------------------------------------- commit 00604060e83ed82fb874209b4364fc4c69902798 Author: Marc Delisle marc@infomarc.info Date: Wed May 12 12:53:08 2010 -0400
gettext conversion
-----------------------------------------------------------------------
Summary of changes: libraries/common.lib.php | 8 ++++---- libraries/messages.inc.php | 2 -- .../transformations/text_plain__dateformat.inc.php | 2 +- pdf_schema.php | 1 - 4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ef43bde..21d8c2a 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1535,10 +1535,10 @@ function PMA_extractValueFromFormattedSize($formatted_size) */ function PMA_localisedDate($timestamp = -1, $format = '') { - global $datefmt, $month, $day_of_week; + global $month, $day_of_week;
if ($format == '') { - $format = $datefmt; + $format = __('%B %d, %Y at %I:%M %p'); }
if ($timestamp == -1) { @@ -1818,7 +1818,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), /** * Returns a given timespan value in a readable format. * - * @uses $GLOBALS['timespanfmt'] + * @uses __('%s days, %s hours, %s minutes and %s seconds') * @uses sprintf() * @uses floor() * @param int the timespan @@ -1840,7 +1840,7 @@ function PMA_timespanFormat($seconds) if ($days > 0 || $hours > 0 || $minutes > 0) { $seconds -= $minutes * 60; } - return sprintf($GLOBALS['timespanfmt'], (string)$days, (string)$hours, (string)$minutes, (string)$seconds); + return sprintf(__('%s days, %s hours, %s minutes and %s seconds'), (string)$days, (string)$hours, (string)$minutes, (string)$seconds); }
/** diff --git a/libraries/messages.inc.php b/libraries/messages.inc.php index 349a807..5194a4b 100644 --- a/libraries/messages.inc.php +++ b/libraries/messages.inc.php @@ -27,8 +27,6 @@ $byteUnits = array(__('B'), __('KiB'), __('MiB'), __('GiB'), __('TiB'), __('PiB' $day_of_week = array(__('Sun'), __('Mon'), __('Tue'), __('Wed'), __('Thu'), __('Fri'), __('Sat')); $month = array(__('Jan'), __('Feb'), __('Mar'), __('Apr'), __('May'), __('Jun'), __('Jul'), __('Aug'), __('Sep'), __('Oct'), __('Nov'), __('Dec')); /* l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string */ -$datefmt = __('%B %d, %Y at %I:%M %p'); -$timespanfmt = __('%s days, %s hours, %s minutes and %s seconds');
$strAbortedClients = __('Aborted'); $strAccessDenied = __('Access denied'); diff --git a/libraries/transformations/text_plain__dateformat.inc.php b/libraries/transformations/text_plain__dateformat.inc.php index 282cb16..c1386fa 100644 --- a/libraries/transformations/text_plain__dateformat.inc.php +++ b/libraries/transformations/text_plain__dateformat.inc.php @@ -25,7 +25,7 @@ function PMA_transformation_text_plain__dateformat($buffer, $options = array(),
if (empty($options[1])) { if ($options[2] == 'local') { - $options[1] = $GLOBALS['datefmt']; + $options[1] = __('%B %d, %Y at %I:%M %p'); } else { $options[1] = 'Y-m-d H:i:s'; } diff --git a/pdf_schema.php b/pdf_schema.php index a55c85e..3156d21 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -257,7 +257,6 @@ class PMA_PDF extends TCPDF { } // end of the "Error()" method function Header() { - // $datefmt // We only show this if we find something in the new pdf_pages table
// This function must be named "Header" to work with the FPDF library
hooks/post-receive
-
Marc Delisle