From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Sun, 25 Apr 2010 18:02:21 +0000 (+0000)
Subject: Updated strings
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=feb1db4fb235627fc0dcb5aad2471b6abbb2e954;p=gosa.git

Updated strings


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17828 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 3fa15b597..e09cc5ef8 100644
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -3596,5 +3596,14 @@ function postDecode($str)
   return(base64_decode(preg_replace("/_/","=", $str)));
 }
 
+
+/*! \brief    Generate bold output
+ */
+function bold($str)
+{
+  return "<b>$str</b>";
+}
+
+
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>
diff --git a/gosa-core/include/utils/class_timezone.inc b/gosa-core/include/utils/class_timezone.inc
index 7fcd7d5ca..21549cdea 100644
--- a/gosa-core/include/utils/class_timezone.inc
+++ b/gosa-core/include/utils/class_timezone.inc
@@ -44,7 +44,7 @@ class timezone {
       $tz = $config->get_cfg_value("timezone");
 
       if(!@date_default_timezone_set($tz)){
-        msg_dialog::display(_("Configuration error"), sprintf(_("The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate correct timezone offset."), $tz), ERROR_DIALOG);
+        msg_dialog::display(_("Configuration error"), sprintf(_("The configured timezone '%s' is not valid!"), $tz), ERROR_DIALOG);
       }
       $tz_delta = date("Z", $stamp);
       $tz_delta = $tz_delta / 3600 ;
diff --git a/gosa-core/include/utils/class_xml.inc b/gosa-core/include/utils/class_xml.inc
index 5824e805a..01d5a4ade 100644
--- a/gosa-core/include/utils/class_xml.inc
+++ b/gosa-core/include/utils/class_xml.inc
@@ -31,23 +31,23 @@ class xml {
     if (!$xml->schemaValidate($schema)) {
       $errors = libxml_get_errors();
       foreach ($errors as $error) {
-        $str= "";
+        $estr= "";
         switch ($error->level) {
             case LIBXML_ERR_WARNING:
-                $str= _("Warning")." ".$error->code.": ";
+                $estr= _("Warning")." ".$error->code.":";
                 break;
             case LIBXML_ERR_ERROR:
-                $str= _("Error")." ".$error->code.": ";
+                $estr= _("Error")." ".$error->code.":";
                 break;
             case LIBXML_ERR_FATAL:
-                $str= _("Fatal error")." ".$error->code.": ";
+                $estr= _("Fatal error")." ".$error->code.":";
                 break;
         }
-        $str.= trim($error->message);
         if ($error->file) {
-            $str.= " "._("in")." ".$error->file;
+          $str= sprintf("%s %s in %s", $estr, trim($error->message), $error->file);
+        } else {
+          $str= sprintf("%s %s in %s on line %s", $estr, trim($error->message), $error->file, $error->line);
         }
-        $str.= " "._("on line")." ".$error->line;
         msg_dialog::display(_("XML error"), $str, ERROR_DIALOG);
       }
       libxml_clear_errors();