diff options
| -rw-r--r-- | includes/controller/user_angeltypes_controller.php | 2 | ||||
| -rw-r--r-- | includes/controller/user_driver_licenses_controller.php | 2 | ||||
| -rw-r--r-- | includes/pages/admin_questions.php | 2 | ||||
| -rw-r--r-- | includes/view/UserHintsRenderer.php | 4 | ||||
| -rw-r--r-- | includes/view/User_view.php | 10 |
5 files changed, 11 insertions, 9 deletions
diff --git a/includes/controller/user_angeltypes_controller.php b/includes/controller/user_angeltypes_controller.php index 206828f5..6ef894c7 100644 --- a/includes/controller/user_angeltypes_controller.php +++ b/includes/controller/user_angeltypes_controller.php @@ -16,7 +16,7 @@ function user_angeltypes_unconfirmed_hint() { $unconfirmed_links[] = '<a href="' . page_link_to('angeltypes') . '&action=view&angeltype_id=' . $user_angeltype['angeltype_id'] . '">' . $user_angeltype['name'] . ' (+' . $user_angeltype['count'] . ')' . '</a>'; } - return info(sprintf(ngettext("There is %d unconfirmed angeltype.", "There are %d unconfirmed angeltypes.", count($unconfirmed_user_angeltypes)), count($unconfirmed_user_angeltypes)) . " " . _('Angel types which need approvals:') . ' ' . join(', ', $unconfirmed_links), true); + return sprintf(ngettext("There is %d unconfirmed angeltype.", "There are %d unconfirmed angeltypes.", count($unconfirmed_user_angeltypes)), count($unconfirmed_user_angeltypes)) . " " . _('Angel types which need approvals:') . ' ' . join(', ', $unconfirmed_links); } /** diff --git a/includes/controller/user_driver_licenses_controller.php b/includes/controller/user_driver_licenses_controller.php index fc2f4916..595fc3b6 100644 --- a/includes/controller/user_driver_licenses_controller.php +++ b/includes/controller/user_driver_licenses_controller.php @@ -16,7 +16,7 @@ function user_driver_license_required_hint() { foreach ($angeltypes as $angeltype) { if ($angeltype['requires_driver_license']) { - return info(sprintf(_("You joined an angeltype which requires a driving license. Please edit your driving license information here: %s."), '<a href="' . user_driver_license_edit_link() . '">' . _("driving license information") . '</a>'), true); + return sprintf(_("You joined an angeltype which requires a driving license. Please edit your driving license information here: %s."), '<a href="' . user_driver_license_edit_link() . '">' . _("driving license information") . '</a>'); } } diff --git a/includes/pages/admin_questions.php b/includes/pages/admin_questions.php index 13614a66..f53cfab9 100644 --- a/includes/pages/admin_questions.php +++ b/includes/pages/admin_questions.php @@ -15,7 +15,7 @@ function admin_new_questions() { $new_messages = sql_num_query("SELECT * FROM `Questions` WHERE `AID` IS NULL"); if ($new_messages > 0) { - return info('<a href="' . page_link_to("admin_questions") . '">' . _('There are unanswered questions!') . '</a>', true); + return '<a href="' . page_link_to("admin_questions") . '">' . _('There are unanswered questions!') . '</a>'; } } } diff --git a/includes/view/UserHintsRenderer.php b/includes/view/UserHintsRenderer.php index 54f9c149..cf4b1414 100644 --- a/includes/view/UserHintsRenderer.php +++ b/includes/view/UserHintsRenderer.php @@ -32,9 +32,11 @@ class UserHintsRenderer { */ public function addHint($hint, $important = false) { if ($hint != null && $hint != '') { - $this->hints[] = $hint; if ($important) { $this->important = true; + $this->hints[] = error($hint, true); + } else { + $this->hints[] = info($hint, true); } } } diff --git a/includes/view/User_view.php b/includes/view/User_view.php index 5349711a..ef7abad6 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -419,7 +419,7 @@ function render_user_departure_date_hint() { global $user; if (! isset($user['planned_departure_date']) || $user['planned_departure_date'] == null) { - return info(_("Please enter your planned date of departure on your settings page to give us a feeling for teardown capacities."), true); + return _("Please enter your planned date of departure on your settings page to give us a feeling for teardown capacities."); } return null; @@ -429,7 +429,7 @@ function render_user_freeloader_hint() { global $user; if (User_is_freeloader($user)) { - return error(sprintf(_("You freeloaded at least %s shifts. Shift signup is locked. Please go to heavens desk to be unlocked again."), $max_freeloadable_shifts), true); + return sprintf(_("You freeloaded at least %s shifts. Shift signup is locked. Please go to heavens desk to be unlocked again."), $max_freeloadable_shifts); } return null; @@ -440,7 +440,7 @@ function render_user_arrived_hint() { global $user; if ($user['Gekommen'] == 0) { - return error(_("You are not marked as arrived. Please go to heaven's desk, get your angel badge and/or tell them that you arrived already."), true); + return _("You are not marked as arrived. Please go to heaven's desk, get your angel badge and/or tell them that you arrived already."); } return null; @@ -450,7 +450,7 @@ function render_user_tshirt_hint() { global $enable_tshirt_size, $user; if ($enable_tshirt_size && $user['Size'] == "") { - return error(_("You need to specify a tshirt size in your settings!"), true); + return _("You need to specify a tshirt size in your settings!"); } return null; @@ -460,7 +460,7 @@ function render_user_dect_hint() { global $user; if ($user['DECT'] == "") { - return error(_("You need to specify a DECT phone number in your settings! If you don't have a DECT phone, just enter \"-\"."), true); + return _("You need to specify a DECT phone number in your settings! If you don't have a DECT phone, just enter \"-\"."); } return null; |