colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: add get_type argument to ap_wpa_rsn_flags_to_string() for optional i18n

Browse Source 
Will be used later.
This commit is contained in:
Thomas Haller
2020-03-11 13:10:04 +01:00
parent 49dacaa34e
commit a01355ba64
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
clients/cli/devices.c
View File

@@ -27,9 +27,9 @@
/*****************************************************************************/ /*****************************************************************************/
static char * static char *
ap_wpa_rsn_flags_to_string (NM80211ApSecurityFlags flags) ap_wpa_rsn_flags_to_string (NM80211ApSecurityFlags flags, NMMetaAccessorGetType get_type)
{ {
char *flags_str[14]; char *flags_str[16];
int i = 0; int i = 0;
if (flags & NM_802_11_AP_SEC_PAIR_WEP40) if (flags & NM_802_11_AP_SEC_PAIR_WEP40)
@@ -56,13 +56,17 @@ ap_wpa_rsn_flags_to_string (NM80211ApSecurityFlags flags)
flags_str[i++] = "sae"; flags_str[i++] = "sae";
if (flags & NM_802_11_AP_SEC_KEY_MGMT_OWE) if (flags & NM_802_11_AP_SEC_KEY_MGMT_OWE)
flags_str[i++] = "owe"; flags_str[i++] = "owe";
/* Make sure you grow flags_str when adding items here. */
if (i == 0) /* Make sure you grow flags_str when adding items here. */
flags_str[i++] = _("(none)"); nm_assert (i < G_N_ELEMENTS (flags_str));
if (i == 0) {
if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY)
return g_strdup (_("(none)"));
return g_strdup ("(none)");
}
flags_str[i] = NULL; flags_str[i] = NULL;
return g_strjoinv (" ", flags_str); return g_strjoinv (" ", flags_str);
} }
@@ -1189,8 +1193,8 @@ fill_output_access_point (gpointer data, gpointer user_data)
freq_str = g_strdup_printf (_("%u MHz"), freq); freq_str = g_strdup_printf (_("%u MHz"), freq);
bitrate_str = g_strdup_printf (_("%u Mbit/s"), bitrate/1000); bitrate_str = g_strdup_printf (_("%u Mbit/s"), bitrate/1000);
strength_str = g_strdup_printf ("%u", strength); strength_str = g_strdup_printf ("%u", strength);
wpa_flags_str = ap_wpa_rsn_flags_to_string (wpa_flags); wpa_flags_str = ap_wpa_rsn_flags_to_string (wpa_flags, NM_META_ACCESSOR_GET_TYPE_PRETTY);
rsn_flags_str = ap_wpa_rsn_flags_to_string (rsn_flags); rsn_flags_str = ap_wpa_rsn_flags_to_string (rsn_flags, NM_META_ACCESSOR_GET_TYPE_PRETTY);
sig_bars = nmc_wifi_strength_bars (strength); sig_bars = nmc_wifi_strength_bars (strength);
security_str = g_string_new (NULL); security_str = g_string_new (NULL);