brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bluetooth: Update bluetooth submenu title

Browse Source 
- "Bluetooth" to "on/off" labels
  to match with other menus

- Display single connected device name
  to show more relevant information

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2340
This commit is contained in:
Mariana Picolo 2020-03-28 15:56:20 -03:00 committed by Mariana Pícolo
parent 26c2cb9f65
commit 9bc9d5165f
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/ui/status/bluetooth.js
View File

@ -90,6 +90,8 @@ class Indicator extends PanelMenu.SystemIndicator {
deviceInfos.push({ deviceInfos.push({
connected: this._model.get_value(iter, connected: this._model.get_value(iter,
GnomeBluetooth.Column.CONNECTED), GnomeBluetooth.Column.CONNECTED),
name: this._model.get_value(iter,
GnomeBluetooth.Column.ALIAS),
}); });
ret = this._model.iter_next(iter); ret = this._model.iter_next(iter);
@ -122,14 +124,16 @@ class Indicator extends PanelMenu.SystemIndicator {
else else
this._item.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode; this._item.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode;
if (nConnectedDevices > 0) if (nConnectedDevices > 1)
/* Translators: this is the number of connected bluetooth devices */ /* Translators: this is the number of connected bluetooth devices */
this._item.label.text = ngettext("%d Connected", "%d Connected", nConnectedDevices).format(nConnectedDevices); this._item.label.text = ngettext('%d Connected", "%d Connected', nConnectedDevices).format(nConnectedDevices);
else if (nConnectedDevices === 1)
this._item.label.text = connectedDevices[0].name;
else if (adapter === null) else if (adapter === null)
this._item.label.text = _("Off"); this._item.label.text = _('Bluetooth Off');
else else
this._item.label.text = _("On"); this._item.label.text = _('Bluetooth On');
this._toggleItem.label.text = this._proxy.BluetoothAirplaneMode ? _("Turn On") : _("Turn Off"); this._toggleItem.label.text = this._proxy.BluetoothAirplaneMode ? _('Turn On') : _('Turn Off');
} }
}); });