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 3fa15b59736320d44756773c24ba663127c06b38..e09cc5ef8adf2a17e9c376192964779ad8c91d94 100644 (file)
--- 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 7fcd7d5ca79ca6fc612159944821d8bb4f43c68c..21549cdeadfaae0494a482a2620846c7b257b0c1 100644 (file)
--- 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 5824e805a3c9ddc81216333db61840310d70f23f..01d5a4ade3cd0997dc86c2128edda4ad8d24b95d 100644 (file)
--- 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();