From 775c3345eb350180656c40d7180cef52fd4cd2a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 4 Feb 2020 19:24:43 +0100 Subject: [PATCH] networkAgent: Update dialog entry descriptions for new design With the new dialog design the descriptions of entries are now implemented as hint-text of the StEntry. That means the colon at the end of the descriptions no longer makes sense and should be removed. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/977 --- js/ui/components/networkAgent.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js index 6699cb6aa..dbd2b2124 100644 --- a/js/ui/components/networkAgent.js +++ b/js/ui/components/networkAgent.js @@ -199,19 +199,19 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog { case 'wpa-none': case 'wpa-psk': case 'sae': - secrets.push({ label: _("Password: "), key: 'psk', + secrets.push({ label: _('Password'), key: 'psk', value: wirelessSecuritySetting.psk || '', validate: this._validateWpaPsk, password: true }); break; case 'none': // static WEP - secrets.push({ label: _("Key: "), key: `wep-key${wirelessSecuritySetting.wep_tx_keyidx}`, + secrets.push({ label: _('Key'), key: `wep-key${wirelessSecuritySetting.wep_tx_keyidx}`, value: wirelessSecuritySetting.get_wep_key(wirelessSecuritySetting.wep_tx_keyidx) || '', wep_key_type: wirelessSecuritySetting.wep_key_type, validate: this._validateStaticWep, password: true }); break; case 'ieee8021x': if (wirelessSecuritySetting.auth_alg == 'leap') { // Cisco LEAP - secrets.push({ label: _("Password: "), key: 'leap-password', + secrets.push({ label: _('Password'), key: 'leap-password', value: wirelessSecuritySetting.leap_password || '', password: true }); } else { // Dynamic (IEEE 802.1x) WEP this._get8021xSecrets(secrets); @@ -231,15 +231,15 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog { /* If hints were given we know exactly what we need to ask */ if (this._settingName == "802-1x" && this._hints.length) { if (this._hints.includes('identity')) { - secrets.push({ label: _("Username: "), key: 'identity', + secrets.push({ label: _('Username'), key: 'identity', value: ieee8021xSetting.identity || '', password: false }); } if (this._hints.includes('password')) { - secrets.push({ label: _("Password: "), key: 'password', + secrets.push({ label: _('Password'), key: 'password', value: ieee8021xSetting.password || '', password: true }); } if (this._hints.includes('private-key-password')) { - secrets.push({ label: _("Private key password: "), key: 'private-key-password', + secrets.push({ label: _('Private key password'), key: 'private-key-password', value: ieee8021xSetting.private_key_password || '', password: true }); } return; @@ -254,15 +254,15 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog { // TTLS and PEAP are actually much more complicated, but this complication // is not visible here since we only care about phase2 authentication // (and don't even care of which one) - secrets.push({ label: _("Username: "), key: null, + secrets.push({ label: _('Username'), key: null, value: ieee8021xSetting.identity || '', password: false }); - secrets.push({ label: _("Password: "), key: 'password', + secrets.push({ label: _('Password'), key: 'password', value: ieee8021xSetting.password || '', password: true }); break; case 'tls': - secrets.push({ label: _("Identity: "), key: null, + secrets.push({ label: _('Identity'), key: null, value: ieee8021xSetting.identity || '', password: false }); - secrets.push({ label: _("Private key password: "), key: 'private-key-password', + secrets.push({ label: _('Private key password'), key: 'private-key-password', value: ieee8021xSetting.private_key_password || '', password: true }); break; default: @@ -272,11 +272,11 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog { _getPPPoESecrets(secrets) { let pppoeSetting = this._connection.get_setting_pppoe(); - secrets.push({ label: _("Username: "), key: 'username', + secrets.push({ label: _('Username'), key: 'username', value: pppoeSetting.username || '', password: false }); - secrets.push({ label: _("Service: "), key: 'service', + secrets.push({ label: _('Service'), key: 'service', value: pppoeSetting.service || '', password: false }); - secrets.push({ label: _("Password: "), key: 'password', + secrets.push({ label: _('Password'), key: 'password', value: pppoeSetting.password || '', password: true }); } @@ -286,7 +286,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog { setting = this._connection.get_setting_cdma() || this._connection.get_setting_gsm(); else setting = this._connection.get_setting_by_name(connectionType); - secrets.push({ label: _("Password: "), key: 'password', + secrets.push({ label: _('Password'), key: 'password', value: setting.value || '', password: true }); } @@ -310,7 +310,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog { case '802-3-ethernet': content.title = _("Wired 802.1X authentication"); content.message = null; - content.secrets.push({ label: _("Network name: "), key: null, + content.secrets.push({ label: _('Network name'), key: null, value: connectionSetting.get_id(), password: false }); this._get8021xSecrets(content.secrets); break; @@ -324,7 +324,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog { let gsmSetting = this._connection.get_setting_gsm(); content.title = _("PIN code required"); content.message = _("PIN code is needed for the mobile broadband device"); - content.secrets.push({ label: _("PIN: "), key: 'pin', + content.secrets.push({ label: _('PIN'), key: 'pin', value: gsmSetting.pin || '', password: true }); break; }