dateMenu: Try harder finding a reasonable weather location name

Weather stations can have unwieldy long names, which don't fit the
limited space we have available. City names are usually more suitable,
so use the name of the nearest city instead if possible.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/1927
This commit is contained in:
Florian Müllner 2019-11-20 22:15:26 +01:00
parent f2df9f1ae4
commit 784c0b7e4b

View File

@ -388,7 +388,12 @@ class WeatherSection extends St.Button {
} }
let info = this._weatherClient.info; let info = this._weatherClient.info;
this._titleLocation.text = info.get_location().get_name(); let loc = info.get_location();
if (loc.get_level() !== GWeather.LocationLevel.CITY && loc.has_coords()) {
let world = GWeather.Location.get_world();
loc = world.find_nearest_city(...loc.get_coords());
}
this._titleLocation.text = loc.get_name();
if (this._weatherClient.loading) { if (this._weatherClient.loading) {
this._setStatusLabel(_("Loading…")); this._setStatusLabel(_("Loading…"));