diff --git a/calendar/edit_entry.php b/calendar/edit_entry.php index a0ada38285..29d592b700 100755 --- a/calendar/edit_entry.php +++ b/calendar/edit_entry.php @@ -174,6 +174,7 @@ . ''."\n"; $vars = Array( + 'font' => $phpgw_info['theme']['font'], 'bg_color' => $phpgw_info['theme']['bg_text'], 'calendar_action' => $action, 'action_url' => $phpgw->link('/calendar/edit_entry_handler.php'), diff --git a/calendar/templates/default/edit.tpl b/calendar/templates/default/edit.tpl index 82b18f5a72..d32405343d 100755 --- a/calendar/templates/default/edit.tpl +++ b/calendar/templates/default/edit.tpl @@ -2,14 +2,15 @@
-

{calendar_action}

+ +

{calendar_action}

{common_hidden} @@ -19,6 +20,7 @@ {delete_button} + diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php index d44077acf3..b60a9da04f 100644 --- a/phpgwapi/inc/class.common.inc.php +++ b/phpgwapi/inc/class.common.inc.php @@ -1258,11 +1258,11 @@ . '
' . lang('On *nix systems please type: x','chmod 770 ' . $phpgw_info['server']['files_dir'] . '/groups/'); break; - case 40: $s .= lang("You have not entered a\nBrief Description").'.'; + case 40: $s .= lang("You have not entered a title").'.'; break; - case 41: $s .= lang("You have not entered a\nvalid time of day."); + case 41: $s .= lang("You have not entered a valid time of day").'.'; break; - case 42: $s .= lang("You have not entered a\nvalid date."); + case 42: $s .= lang("You have not entered a valid date").'.'; break; default: return ''; } diff --git a/setup/phpgw_en.lang b/setup/phpgw_en.lang index cdc50d678b..bd51e6d4da 100644 --- a/setup/phpgw_en.lang +++ b/setup/phpgw_en.lang @@ -685,8 +685,9 @@ you have been successfully logged out login en You have been successfully logged you have entered an invailed date todo en you have entered an invailed date you have messages! common en You have messages! you have no new messages common en You have no new messages -you have not entered a\nbrief description calendar en You have not entered a\nBrief Description -you have not entered a\nvalid time of day. calendar en You have not entered a\nvalid time of day. +you have not entered a valid date calendar en You have not entered a valid date +you have not entered a title calendar en You have not entered a title +you have not entered a valid time of day calendar en You have not entered a valid time of day you have x high priority events on your calendar today. common en You have %1 high priority events on your calendar today. you have x new messages! common en You have %1 new messages! you must add at least 1 permission or group to this account admin en You must add at least 1 permission or group to this account
-

{errormsg}

+
{errormsg}