From 5ff6cf575af0d16762d9a551c3b5d09f9ae45d3e Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Tue, 30 Mar 2021 17:52:23 +0200 Subject: [PATCH] libnm: don't use defined strings in translated strings in "nm-setting-ip-config.c" [thaller@redhat.com: reworked patch by Yuri] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/800 --- src/libnm-core-impl/nm-setting-ip-config.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c index c0324331ce..48ae9ed8f9 100644 --- a/src/libnm-core-impl/nm-setting-ip-config.c +++ b/src/libnm-core-impl/nm-setting-ip-config.c @@ -2949,7 +2949,7 @@ nm_ip_routing_rule_from_dbus(GVariant *variant, gboolean strict, GError **error) g_set_error_literal(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("missing \"" NM_IP_ROUTING_RULE_ATTR_FAMILY "\"")); + _("missing \"family\"")); return NULL; } addr_family = g_variant_get_int32(variants[RR_DBUS_ATTR_FAMILY]); @@ -2957,7 +2957,7 @@ nm_ip_routing_rule_from_dbus(GVariant *variant, gboolean strict, GError **error) g_set_error_literal(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("invalid \"" NM_IP_ROUTING_RULE_ATTR_FAMILY "\"")); + _("invalid \"family\"")); return NULL; } @@ -3014,9 +3014,7 @@ nm_ip_routing_rule_from_dbus(GVariant *variant, gboolean strict, GError **error) g_set_error_literal(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("\"" NM_IP_ROUTING_RULE_ATTR_UID_RANGE_START - "\" is greater than \"" NM_IP_ROUTING_RULE_ATTR_UID_RANGE_END - "\"")); + _("\"uid-range-start\" is greater than \"uid-range-end\"")); return FALSE; } } else