Fix world city layout in extreme layout cases

- readded the space between the city name and day of week
- adjusted layout to elide city name first before truncating day of week

Change-Id: Idf88f78d6d21f7a9bcbbc64b002177acd3611efb