Changeset 1463 for releases/0.9/lib

Timestamp:

12/16/07 22:36:17 (1 year ago)

Author:

misja

Message:

Misja Hoebe <misja@curverider.co.uk> Merge r1456, r1457, r1458, r1459, r1460, r1461, r1462 into 0.9 branch

Files:

• releases/0.9/lib/setup.php (modified) (4 diffs)

releases/0.9/lib/setup.php

@@ -518 +518 @@
-    $date = date('Y-m-d H:i:s');
-    $fatal = "$errmsg (# $errno)";
-"Error in line $errline of file $errfile"
+sprintf(__gettext("Error in line %d of file %s"),$errline,$errfile)
-    $script = "Script: {$_SERVER['PHP_SELF']}";
-
@@ -525 +525 @@
-        case E_NOTICE:
-            if ($CFG->debug == 2047) {
-"$date\nNotice: $fatal\n$file\n$script\n"
+sprintf(__gettext("%s\nNotice: %s \n %s\n%s\n"),$date,$fatal,$file,$script)
-                error_log($msg);
-            }
@@ -536 +536 @@
-            if ($CFG->debug >= 7) {
-                $msg = "$date\nWarning: $fatal\n$file\n$script\n";
+                $msg = sprintf(__gettext("%s\nWarning: %s\n%s\%s\n"),$date,$fatal,$file,$script);
-                error_log($msg);
-            }
@@ -550 +551 @@
-
-            if ($CFG->debug > 0) {
-Disable debug mode if you do not want to display errors on screen browser
+".__gettext("Disable debug mode if you do not want to display errors on screen browser")."
-                echo $msg;
-            } else {
-Our apologies, the system can't complete your request
+".__gettext("Our apologies, the system can't complete your request")."
-                echo "<p><em>{$CFG->sitename} team</em><br/>";
-                echo "<a href=\"{$CFG->wwwroot}\">{$CFG->wwwroot}</a></p>";