ubuntu-system-settings

Merge lp://staging/~mterry/ubuntu-system-settings/timezone-name into lp://staging/ubuntu-system-settings

  1. timezone-name
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 1634
Merged at revision: 1661
Proposed branch: lp://staging/~mterry/ubuntu-system-settings/timezone-name
Merge into: lp://staging/ubuntu-system-settings
Diff against target: 245 lines (+69/-25)
7 files modified
debian/changelog (+6/-0)
debian/control (+1/-0)
plugins/time-date/ChooseTimeZone.qml (+3/-3)
plugins/time-date/PageComponent.qml (+2/-3)
plugins/time-date/plugin.cpp (+1/-1)
plugins/time-date/timedate.cpp (+47/-15)
plugins/time-date/timedate.h (+9/-3)
To merge this branch: bzr merge lp://staging/~mterry/ubuntu-system-settings/timezone-name
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) Approve
Jonas G. Drange (community) Approve
Review via email: mp+291041@code.staging.launchpad.net

Commit message

Show user-friendly city name for the timezone.

Description of the change

Use existing timezone-name gsettings field to store a user-friendly version of the timezone. This is a strategy already used on the desktop. This branch just brings it to Touch too.

https://code.launchpad.net/~mterry/unity8/timezone-name/+merge/291042 should land at the same. I don't know of any other consumers.

To post a comment you must log in.
Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

Since we're currently not getting any debs from ci, Michael, could you create arm debs either manually, in a silo (silo preferred so we can test both changes together?).

Revision history for this message
Michael Terry (mterry) wrote :

OK, check silo 33. It also has the geonames translation support (so when searching for timezones, you can see localized city names). But that's unrelated to this MP. Just a silo bonus.

Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

This is great. Currently, if I select the city “Bergen”, the tz is set to “Europe/Oslo”. Silo 33 presents the tz as “Bergen +2”.

Thanks!

review: Approve
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Worked well in my testing too (in silo 33)

review: Approve
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Minor nitpick:

QString TimeDate::timeZoneName()

should be const

Revision history for this message
Michael Terry (mterry) wrote :

But if it's const, it can't call initializeTimeZone. Maybe lazily-initializing the timezone info isn't worth the const-uncleanliness... But I figured I'd follow timeZone()'s lead here.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches