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

location: Improved language

Browse Source 
* 'Turn On' -> 'Enable'
* 'Turn Off' -> 'Disable'
* 'Off' -> 'Disabled'
* 'On' ->  'In Use' or 'Enabled' depending on whether or not service is
  in use.

https://bugzilla.gnome.org/show_bug.cgi?id=726498
This commit is contained in:
Zeeshan Ali (Khattak) 2014-03-20 13:17:47 +00:00
parent d0f69a72dc
commit b0bdf7f6c3
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/ui/status/location.js
View File

@ -56,8 +56,8 @@ const Indicator = new Lang.Class({
this._agent = Gio.DBusExportedObject.wrapJSObject(AgentIface, this); this._agent = Gio.DBusExportedObject.wrapJSObject(AgentIface, this);
this._agent.export(Gio.DBus.system, '/org/freedesktop/GeoClue2/Agent'); this._agent.export(Gio.DBus.system, '/org/freedesktop/GeoClue2/Agent');
this._item.status.text = _("On"); this._item.status.text = _("Enabled");
this._onOffAction = this._item.menu.addAction(_("Turn Off"), Lang.bind(this, this._onOnOffAction)); this._onOffAction = this._item.menu.addAction(_("Disable"), Lang.bind(this, this._onOnOffAction));
this.menu.addMenuItem(this._item); this.menu.addMenuItem(this._item);
@ -97,6 +97,7 @@ const Indicator = new Lang.Class({
} }
this._indicator.visible = this._proxy.InUse; this._indicator.visible = this._proxy.InUse;
this._updateMenuLabels();
}, },
_connectToGeoclue: function() { _connectToGeoclue: function() {
@ -158,14 +159,18 @@ const Indicator = new Lang.Class({
this.menu.setSensitive(sensitive); this.menu.setSensitive(sensitive);
}, },
_onMaxAccuracyLevelChanged: function() { _updateMenuLabels: function() {
if (this._getMaxAccuracyLevel() == 0) { if (this._getMaxAccuracyLevel() == 0) {
this._item.status.text = _("Off"); this._item.status.text = _("Disabled");
this._onOffAction.label.text = _("Turn On"); this._onOffAction.label.text = _("Enable");
} else { } else {
this._item.status.text = _("On"); this._item.status.text = this._indicator.visible ? _("In Use") : _("Enabled");
this._onOffAction.label.text = _("Turn Off"); this._onOffAction.label.text = _("Disable");
} }
},
_onMaxAccuracyLevelChanged: function() {
this._updateMenuLabels();
// Gotta ensure geoclue is up and we are registered as agent to it // Gotta ensure geoclue is up and we are registered as agent to it
// before we emit the notify for this property change. // before we emit the notify for this property change.