← Back to branch summary

~ubuntu-branches/ubuntu/vivid/libgweather/vivid

« back to all changes in this revision

Viewing changes to libgweather/weather-yrno.c

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2015-01-06 06:15:50 UTC
  • mfrom: (1.3.46) (14.1.11 sid)
  • Revision ID: package-import@ubuntu.com-20150106061550-jpjeggdgta3dkfyk
Tags: 3.14.2-0ubuntu1
* New upstream release
* Merge from debian. Remaining changes:
  - debian/control.in, debian/rules:
    + Run autoreconf
  - debian/rules:
    + Generate POT files on build
  - debian/patches/02_no_external_gettext.patch:
    + Can't have both IT_PROG_INTLTOOL and AM_GNU_GETTEXT
  - debian/control: Update Vcs-* field.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libgweather/weather-yrno.c
407
407
 
408
408
    while (glocation) {
409
409
        if (glocation->level == GWEATHER_LOCATION_CITY)
410
 
            city_name = glocation->name;
 
410
            city_name = glocation->english_name;
411
411
        if (glocation->level == GWEATHER_LOCATION_ADM1 ||
412
412
            glocation->level == GWEATHER_LOCATION_ADM2)
413
 
            adm_division = glocation->name;
 
413
            adm_division = glocation->english_name;
414
414
        if (glocation->level == GWEATHER_LOCATION_COUNTRY)
415
 
            country = glocation->name;
 
415
            country = glocation->english_name;
416
416
        glocation = glocation->parent;
417
417
    }
418
418