Merge lp:~ycheng-twn/ubuntu-weather-app/ubuntu-weather-app_1432503 into lp:ubuntu-weather-app/obsolete.trunk

Proposed by Yuan-Chen Cheng on 2015-07-30
Status: Rejected
Rejected by: Victor Thompson on 2015-12-16
Proposed branch: lp:~ycheng-twn/ubuntu-weather-app/ubuntu-weather-app_1432503
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 21 lines (+2/-2)
1 file modified
components/CountryCodes.js (+2/-2)
To merge this branch: bzr merge lp:~ycheng-twn/ubuntu-weather-app/ubuntu-weather-app_1432503
Reviewer Review Type Date Requested Status
Victor Thompson 2015-07-30 Disapprove on 2015-07-30
Review via email:

Description of the change

Use customary names instead of official name in description of country code

To post a comment you must log in.
Victor Thompson (vthompson) wrote :


Please try the same use cases against the "reboot" series of this app. I believe this is working as you desire in that branch. The "reboot" branch will be replacing the version in trunk and on the device/phone fairly soon.


review: Disapprove

Unmerged revisions

421. By Yuan-Chen Cheng on 2015-07-30

Use customary names instead of official name in description of country code

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components/CountryCodes.js'
2--- components/CountryCodes.js 2013-09-28 10:32:31 +0000
3+++ components/CountryCodes.js 2015-07-30 02:50:14 +0000
4@@ -187,7 +187,7 @@
5 "OM": "Oman",
6 "PK": "Pakistan",
7 "PW": "Palau",
8- "PS": "Palestine, State of",
9+ "PS": "Palestine",
10 "PA": "Panama",
11 "PG": "Papua New Guinea",
12 "PY": "Paraguay",
13@@ -235,7 +235,7 @@
14 "SE": "Sweden",
15 "CH": "Switzerland",
16 "SY": "Syrian Arab Republic",
17- "TW": "Taiwan, Province of China",
18+ "TW": "Taiwan",
19 "TJ": "Tajikistan",
20 "TZ": "Tanzania, United Republic of",
21 "TH": "Thailand",


People subscribed via source and target branches