894338 - [Common] mismatch city name of Sao Paulo between tz.json and apn_tz.json

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Gaia, defect, P1)

Description

[Leo]

1. Title : mismatch city name of Sao Paulo between tz.json and apn_tz.json
2. Precondition : insert Brazil Vivo operator SIM
3. Tester's Action : FTU - check timezone in the Date & Time menu
4. Detailed Symptom : city set as Adak
5. Expected : city set as Sao Paulo
6. Reproducibility: Y
   - Frequency Rate : 100%
7.Gaia Master/v1-train : Reproduced
8. Version Info
Gaia : 0d5a9a7577f16b6a72a982148c6f509ee1714ea2
Gecko : 499c1f8ea7ad0cdaa7086214278e2944b8a2ea33

Comment 1

[Leo]

Attachment: patch

Comment 2

[Fabien Cazenave [:kaze]]

Comment on attachment 776319 [details]
patch

The file you patched is generated by shared/resources/apn/Makefile, please fix the mistake at the source (shared/resources/apn/default_timezones.py) and r? me again.

FWIW, I’ve checked all hard-coded timezone IDs in this python file and they all look OK.

Comment 3

[:gerard-majax]

(In reply to Fabien Cazenave [:kaze] from comment #2)
> Comment on attachment 776319 [details]
> patch
> 
> The file you patched is generated by shared/resources/apn/Makefile, please
> fix the mistake at the source (shared/resources/apn/default_timezones.py)
> and r? me again.
> 
> FWIW, I’ve checked all hard-coded timezone IDs in this python file and they
> all look OK.

I think this is the issue:

$ git grep "Sau_Paulo"
shared/resources/apn/default_timezones.py:    'BR': 'America/Sau_Paulo',
shared/resources/apn_tz.json:  "724": "America/Sau_Paulo", 
alex@portable-alex:/media/alex/FirefoxOS/gaia$ git grep "Sao_Paulo"
shared/resources/tz.json:  {"cc":"BR", "offset":"-03:00,-02:00", "city":"Brasilia", "id":"America/Sao_Paulo", "name":"Brasília"},
shared/resources/tz.json:  {"cc":"BR", "offset":"-03:00,-02:00", "city":"Sao_Paulo", "name":"São Paulo"},

Comment 4

[:gerard-majax]

(In reply to Leo from comment #1)
> Created attachment 776319 [details]
> patch

You got the right patch but not on the source file :). I've used it as a starter to provide the correct fix, thanks for the pull request !

Comment 5

[:gerard-majax]

Attachment: Link to Github https://github.com/mozilla-b2g/gaia/pull/11116

Please find a link to the github pull request #11116 https://github.com/mozilla-b2g/gaia/pull/11116

Comment 6

[Fabien Cazenave [:kaze]]

Comment on attachment 779707 [details]
Link to Github https://github.com/mozilla-b2g/gaia/pull/11116

Thanks Leo and Alex!

Comment 7

[Fabien Cazenave [:kaze]]

Merged on master:
https://github.com/mozilla-b2g/gaia/commit/d6db2aa8b39384433969cc807f9fbf5500aec21b

Comment 8

[John Ford [:jhford] CET/CEST Berlin Time]

Uplifted d6db2aa8b39384433969cc807f9fbf5500aec21b to:
v1-train: 1b0669e80101ab880b64f1becc2defec380c9c52

Comment 9

[John Ford [:jhford] CET/CEST Berlin Time]

v1.1.0hd: 1b0669e80101ab880b64f1becc2defec380c9c52