diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index f4f9c217e..0846bf3e8 100644 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -6513,11 +6513,11 @@ class e_admin_form_ui extends e_form //TODO today, yesterday, this-month, last-month . $dateFilters = array ( - 'hour' => LAN_UI_PAST_HOUR, - "day" => LAN_UI_PAST_24_HOURS, - "week" => LAN_UI_PAST_WEEK, - "month" => LAN_UI_PAST_MONTH, - "year" => LAN_UI_PAST_YEAR + 'hour' => LAN_UI_FILTER_PAST_HOUR, + "day" => LAN_UI_FILTER_PAST_24_HOURS, + "week" => LAN_UI_FILTER_PAST_WEEK, + "month" => LAN_UI_FILTER_PAST_MONTH, + "year" => LAN_UI_FILTER_PAST_YEAR ); foreach($dateFilters as $k => $name) diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 1a72e1e9d..544f148f1 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -400,7 +400,6 @@ define("LAN_FILTER_LABEL_DISPLAYALL", "Display All"); define("LAN_FILTER_LABEL_CLEAR", "Clear Filter"); define("LAN_FILTER_LABEL_TYPED", "(typed)"); -//FIXME Remove html define("LAN_UI_NOPID_ERROR", "There is no [b]Primary ID[/b] set"); define("LAN_UI_BATCHDEL_ERROR", "Batch delete not allowed!"); define("LAN_UI_404_BODY_ERROR", "Requested page was not found!"); @@ -424,11 +423,11 @@ define("LAN_UI_BATCH_CREATELINK", "Create Link"); define("LAN_UI_USING_DATABASE_TABLE", "Using [x] database table"); define("LAN_UI_TOTAL_RECORDS", "Total Records: [x]"); -define("LAN_UI_PAST_HOUR", "Past Hour"); -define("LAN_UI_PAST_24_HOURS", "Past 24 hours"); -define("LAN_UI_PAST_WEEK", "Past Week"); -define("LAN_UI_PAST_MONTH", "Past Month"); -define("LAN_UI_PAST_YEAR", "Past Year"); +define("LAN_UI_FILTER_PAST_HOUR", "Past Hour"); +define("LAN_UI_FILTER_PAST_24_HOURS", "Past 24 hours"); +define("LAN_UI_FILTER_PAST_WEEK", "Past Week"); +define("LAN_UI_FILTER_PAST_MONTH", "Past Month"); +define("LAN_UI_FILTER_PAST_YEAR", "Past Year"); define("LAN_USER_MANAGEALL", "Manage all User, Userclass and Extended User-Field settings"); define("LAN_USER_LIST", "User List");