From b0911ebb7eba6cfb128352ac197130020488846a Mon Sep 17 00:00:00 2001 From: TheWitness Date: Fri, 9 Oct 2026 17:38:00 -0400 Subject: [PATCH 1/2] mactrack: shorten interface status pill labels to single words Interface Up/No Alias/Errors Present/Discards Present/No Graphs/Interface Down become Up/Alias/Errors/Discards/Graphs so the per-row Issues pills fit better; footer legend and Status filter stay in sync. Regenerated cacti.pot. --- lib/mactrack_functions.php | 12 ++++++------ locales/po/cacti.pot | 31 +++++++++---------------------- mactrack_view_interfaces.php | 12 ++++++------ 3 files changed, 21 insertions(+), 34 deletions(-) diff --git a/lib/mactrack_functions.php b/lib/mactrack_functions.php index 474f8f0e..12fae249 100644 --- a/lib/mactrack_functions.php +++ b/lib/mactrack_functions.php @@ -3426,12 +3426,12 @@ function mactrack_interfaces_show_issues(): bool { */ function mactrack_interface_status_legend(): array { return [ - 'int_up' => __('Interface Up', 'mactrack'), - 'int_up_wo_alias' => __('No Alias', 'mactrack'), - 'int_errors' => __('Errors Present', 'mactrack'), - 'int_discards' => __('Discards Present', 'mactrack'), - 'int_no_graph' => __('No Graphs', 'mactrack'), - 'int_down' => __('Interface Down', 'mactrack'), + 'int_up' => __('Up', 'mactrack'), + 'int_up_wo_alias' => __('Alias', 'mactrack'), + 'int_errors' => __('Errors', 'mactrack'), + 'int_discards' => __('Discards', 'mactrack'), + 'int_no_graph' => __('Graphs', 'mactrack'), + 'int_down' => __('Down', 'mactrack'), ]; } diff --git a/locales/po/cacti.pot b/locales/po/cacti.pot index 76a91cc9..eb8f2b36 100644 --- a/locales/po/cacti.pot +++ b/locales/po/cacti.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Cacti \n" "Report-Msgid-Bugs-To: developers@cacti.net\n" -"POT-Creation-Date: 2026-10-08 19:41-0400\n" +"POT-Creation-Date: 2026-10-09 17:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Cacti Developers >\n" "Language-Team: Cacti Developers \n" @@ -129,35 +129,30 @@ msgid "Since Restart" msgstr "" #: lib/mactrack_functions.php mactrack_devices.php mactrack_view_devices.php +#: mactrack_view_interfaces.php msgid "Down" msgstr "" #: lib/mactrack_functions.php mactrack_devices.php mactrack_view_devices.php +#: mactrack_view_interfaces.php msgid "Up" msgstr "" #: lib/mactrack_functions.php mactrack_view_interfaces.php -msgid "Interface Up" -msgstr "" - -#: lib/mactrack_functions.php mactrack_view_interfaces.php -msgid "No Alias" -msgstr "" - -#: lib/mactrack_functions.php mactrack_view_interfaces.php -msgid "Errors Present" +msgid "Alias" msgstr "" #: lib/mactrack_functions.php mactrack_view_interfaces.php -msgid "Discards Present" +msgid "Errors" msgstr "" #: lib/mactrack_functions.php mactrack_view_interfaces.php -msgid "No Graphs" +msgid "Discards" msgstr "" -#: lib/mactrack_functions.php mactrack_view_interfaces.php -msgid "Interface Down" +#: lib/mactrack_functions.php mactrack_view_graphs.php +#: mactrack_view_interfaces.php +msgid "Graphs" msgstr "" #: lib/mactrack_functions.php mactrack_device_types.php mactrack_devices.php @@ -284,10 +279,6 @@ msgstr "" msgid "Dot1x" msgstr "" -#: lib/mactrack_functions.php mactrack_view_graphs.php -msgid "Graphs" -msgstr "" - #: lib/mactrack_functions.php mactrack_device_types.php mactrack_devices.php #: mactrack_macauth.php mactrack_macwatch.php mactrack_snmp.php #: mactrack_vendormacs.php mactrack_view_arp.php mactrack_view_devices.php @@ -1668,10 +1659,6 @@ msgstr "" msgid "Issues" msgstr "" -#: mactrack_view_interfaces.php -msgid "Alias" -msgstr "" - #: mactrack_view_interfaces.php msgid "InBound %%%" msgstr "" diff --git a/mactrack_view_interfaces.php b/mactrack_view_interfaces.php index e7ff2712..65791ea2 100644 --- a/mactrack_view_interfaces.php +++ b/mactrack_view_interfaces.php @@ -458,12 +458,12 @@ function mactrack_view(): void { print '
'; mactrack_legend([ - 'int_up' => __('Interface Up', 'mactrack'), - 'int_up_wo_alias' => __('No Alias', 'mactrack'), - 'int_errors' => __('Errors Present', 'mactrack'), - 'int_discards' => __('Discards Present', 'mactrack'), - 'int_no_graph' => __('No Graphs', 'mactrack'), - 'int_down' => __('Interface Down', 'mactrack'), + 'int_up' => __('Up', 'mactrack'), + 'int_up_wo_alias' => __('Alias', 'mactrack'), + 'int_errors' => __('Errors', 'mactrack'), + 'int_discards' => __('Discards', 'mactrack'), + 'int_no_graph' => __('Graphs', 'mactrack'), + 'int_down' => __('Down', 'mactrack'), ]); print '
'; From 3aeb634e8a2d8acf71998202cd8dc862aa0239fa Mon Sep 17 00:00:00 2001 From: TheWitness Date: Fri, 9 Oct 2026 17:43:05 -0400 Subject: [PATCH 2/2] mactrack: keep absence statuses negative (Unaliased/Graphless) Address PR review: 'Alias'/'Graphs' read as the opposite of the int_up_wo_alias/int_no_graph absence conditions they filter on. Use concise negatives so pills, footer legend and the Status filter keep their meaning. Regenerated cacti.pot. --- lib/mactrack_functions.php | 4 ++-- locales/po/cacti.pot | 17 ++++++++++++----- mactrack_view_interfaces.php | 4 ++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/lib/mactrack_functions.php b/lib/mactrack_functions.php index 12fae249..e1729ee2 100644 --- a/lib/mactrack_functions.php +++ b/lib/mactrack_functions.php @@ -3427,10 +3427,10 @@ function mactrack_interfaces_show_issues(): bool { function mactrack_interface_status_legend(): array { return [ 'int_up' => __('Up', 'mactrack'), - 'int_up_wo_alias' => __('Alias', 'mactrack'), + 'int_up_wo_alias' => __('Unaliased', 'mactrack'), 'int_errors' => __('Errors', 'mactrack'), 'int_discards' => __('Discards', 'mactrack'), - 'int_no_graph' => __('Graphs', 'mactrack'), + 'int_no_graph' => __('Graphless', 'mactrack'), 'int_down' => __('Down', 'mactrack'), ]; } diff --git a/locales/po/cacti.pot b/locales/po/cacti.pot index eb8f2b36..f10285aa 100644 --- a/locales/po/cacti.pot +++ b/locales/po/cacti.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Cacti \n" "Report-Msgid-Bugs-To: developers@cacti.net\n" -"POT-Creation-Date: 2026-10-09 17:36-0400\n" +"POT-Creation-Date: 2026-10-09 17:42-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Cacti Developers >\n" "Language-Team: Cacti Developers \n" @@ -139,7 +139,7 @@ msgid "Up" msgstr "" #: lib/mactrack_functions.php mactrack_view_interfaces.php -msgid "Alias" +msgid "Unaliased" msgstr "" #: lib/mactrack_functions.php mactrack_view_interfaces.php @@ -150,9 +150,8 @@ msgstr "" msgid "Discards" msgstr "" -#: lib/mactrack_functions.php mactrack_view_graphs.php -#: mactrack_view_interfaces.php -msgid "Graphs" +#: lib/mactrack_functions.php mactrack_view_interfaces.php +msgid "Graphless" msgstr "" #: lib/mactrack_functions.php mactrack_device_types.php mactrack_devices.php @@ -279,6 +278,10 @@ msgstr "" msgid "Dot1x" msgstr "" +#: lib/mactrack_functions.php mactrack_view_graphs.php +msgid "Graphs" +msgstr "" + #: lib/mactrack_functions.php mactrack_device_types.php mactrack_devices.php #: mactrack_macauth.php mactrack_macwatch.php mactrack_snmp.php #: mactrack_vendormacs.php mactrack_view_arp.php mactrack_view_devices.php @@ -1659,6 +1662,10 @@ msgstr "" msgid "Issues" msgstr "" +#: mactrack_view_interfaces.php +msgid "Alias" +msgstr "" + #: mactrack_view_interfaces.php msgid "InBound %%%" msgstr "" diff --git a/mactrack_view_interfaces.php b/mactrack_view_interfaces.php index 65791ea2..a54fcb35 100644 --- a/mactrack_view_interfaces.php +++ b/mactrack_view_interfaces.php @@ -459,10 +459,10 @@ function mactrack_view(): void { mactrack_legend([ 'int_up' => __('Up', 'mactrack'), - 'int_up_wo_alias' => __('Alias', 'mactrack'), + 'int_up_wo_alias' => __('Unaliased', 'mactrack'), 'int_errors' => __('Errors', 'mactrack'), 'int_discards' => __('Discards', 'mactrack'), - 'int_no_graph' => __('Graphs', 'mactrack'), + 'int_no_graph' => __('Graphless', 'mactrack'), 'int_down' => __('Down', 'mactrack'), ]);