+
${features.dashboard !== false ? renderNavCard({
href: '/dashboard',
icon: iconDashboard('w-full h-full'),
@@ -93,18 +93,18 @@ function renderHeroSection({ networkName, logoUrl, logoInvertLight, networkCity,
label: t('entities.advertisements'),
colorVar: '--color-adverts',
}) : nothing}
- ${features.messages !== false ? renderNavCard({
- href: '/messages',
- icon: iconMessages('w-full h-full'),
- label: t('entities.messages'),
- colorVar: '--color-messages',
- }) : nothing}
${features.channels !== false ? renderNavCard({
href: '/channels',
icon: iconChannel('w-full h-full'),
label: t('entities.channels'),
colorVar: '--color-channels',
}) : nothing}
+ ${features.messages !== false ? renderNavCard({
+ href: '/messages',
+ icon: iconMessages('w-full h-full'),
+ label: t('entities.messages'),
+ colorVar: '--color-messages',
+ }) : nothing}
${features.members !== false ? renderNavCard({
href: '/members',
icon: iconMembers('w-full h-full'),
diff --git a/src/meshcore_hub/web/static/js/spa/pages/messages.js b/src/meshcore_hub/web/static/js/spa/pages/messages.js
index c710ec8..a78fd99 100644
--- a/src/meshcore_hub/web/static/js/spa/pages/messages.js
+++ b/src/meshcore_hub/web/static/js/spa/pages/messages.js
@@ -211,12 +211,13 @@ ${displayContent}`, container);
apiGet('/api/v1/nodes', { limit: 500, observer: true }),
apiGet('/api/v1/channels'),
]);
- channelLabels = new Map([
- ...getChannelLabelsMap(config),
- ...(channelsData.items || [])
+ const builtinLabels = getChannelLabelsMap(config);
+ const customLabels = new Map(
+ (channelsData.items || [])
.map(ch => [parseInt(ch.channel_hash, 16), ch.name])
.filter(([idx]) => Number.isInteger(idx)),
- ]);
+ );
+ channelLabels = new Map([...builtinLabels, ...customLabels]);
const messages = dedupeBySignature(data.items || []);
const allNodes = nodesData.items || [];
@@ -363,9 +364,12 @@ ${displayContent}`, container);
`,
];
diff --git a/src/meshcore_hub/web/static/locales/en.json b/src/meshcore_hub/web/static/locales/en.json
index 749eda2..7d67649 100644
--- a/src/meshcore_hub/web/static/locales/en.json
+++ b/src/meshcore_hub/web/static/locales/en.json
@@ -5,8 +5,8 @@
"nodes": "Nodes",
"node": "Node",
"node_detail": "Node Detail",
- "advertisements": "Advertisements",
- "advertisement": "Advertisement",
+ "advertisements": "Adverts",
+ "advertisement": "Advert",
"messages": "Messages",
"message": "Message",
"map": "Map",
@@ -235,7 +235,9 @@
"visibility_label": "Visibility",
"enabled_label": "Enabled",
"channel_hash_label": "Hash",
- "disabled": "Disabled"
+ "disabled": "Disabled",
+ "optgroup_standard": "Standard",
+ "optgroup_custom": "Custom"
},
"not_found": {
"description": "The page you're looking for doesn't exist or has been moved."
diff --git a/src/meshcore_hub/web/templates/spa.html b/src/meshcore_hub/web/templates/spa.html
index 31af969..f65b41d 100644
--- a/src/meshcore_hub/web/templates/spa.html
+++ b/src/meshcore_hub/web/templates/spa.html
@@ -67,12 +67,12 @@
{% if features.advertisements %}
{{ t('entities.advertisements') }}
{% endif %}
- {% if features.messages %}
-
{{ t('entities.messages') }}
- {% endif %}
{% if features.channels %}
{{ t('entities.channels') }}
{% endif %}
+ {% if features.messages %}
+
{{ t('entities.messages') }}
+ {% endif %}
{% if features.map %}
{{ t('entities.map') }}
{% endif %}
diff --git a/tests/test_collector/test_letsmesh_decoder.py b/tests/test_collector/test_letsmesh_decoder.py
index 7c6d270..1e364ec 100644
--- a/tests/test_collector/test_letsmesh_decoder.py
+++ b/tests/test_collector/test_letsmesh_decoder.py
@@ -118,7 +118,7 @@ def test_channel_labels_by_index_includes_labeled_entries() -> None:
labels = decoder.channel_labels_by_index()
assert labels[17] == "Public"
- assert labels[217] == "test"
+ assert labels[217] == "Test"
assert labels[202] == "bot"
assert labels[184] == "chat"
diff --git a/tests/test_common/test_i18n.py b/tests/test_common/test_i18n.py
index 863fac9..6ce205e 100644
--- a/tests/test_common/test_i18n.py
+++ b/tests/test_common/test_i18n.py
@@ -48,7 +48,7 @@ class TestTranslation:
def test_nested_key(self):
"""Deeply nested keys resolve correctly."""
- assert t("entities.advertisements") == "Advertisements"
+ assert t("entities.advertisements") == "Adverts"
def test_missing_key_returns_key(self):
"""Missing key returns the key itself as fallback."""
@@ -152,3 +152,8 @@ class TestEnJsonCompleteness:
!= "advertisements.route_type_unknown"
)
assert t("advertisements.col_route_type") != "advertisements.col_route_type"
+
+ def test_channels_optgroup_keys(self):
+ """Channel optgroup labels exist and resolve correctly."""
+ assert t("channels.optgroup_standard") == "Standard"
+ assert t("channels.optgroup_custom") == "Custom"
diff --git a/tests/test_web/test_messages.py b/tests/test_web/test_messages.py
index b6b7091..008f7f3 100644
--- a/tests/test_web/test_messages.py
+++ b/tests/test_web/test_messages.py
@@ -103,4 +103,4 @@ class TestMessagesConfig:
config = json.loads(text[config_start:config_end])
assert config["channel_labels"]["17"] == "Public"
- assert config["channel_labels"]["217"] == "test"
+ assert config["channel_labels"]["217"] == "Test"