Ubuntu Weather App

Merge lp:~dpm/ubuntu-weather-app/fixes-1282081 into lp:ubuntu-weather-app/obsolete.trunk

  1. fixes-1282081
  2. Merge into trunk
Proposed by David Planella
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 204
Merged at revision: 203
Proposed branch: lp:~dpm/ubuntu-weather-app/fixes-1282081
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Prerequisite: lp:~martin-borho/ubuntu-weather-app/conditional-weather
Diff against target: 22 lines (+5/-1)
2 files modified
components/TabFooter.qml (+4/-1)
key.js (+1/-0)
To merge this branch: bzr merge lp:~dpm/ubuntu-weather-app/fixes-1282081
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Martin Borho Approve
Review via email: mp+207190@code.launchpad.net

Commit message

Fixes empty TWC URL if locale is not supported

Description of the change

Fixes empty TWC URL if locale is not supported (bug 1282081)

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:204
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/144/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/142
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/142
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/56

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/144/rebuild

review: Approve (continuous-integration)
Revision history for this message
Martin Borho (martin-borho) wrote :

Thanks for fixing!

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-weather-app-autolanding/81/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-autolanding/81
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-autolanding/81
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-autolanding/31

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components/TabFooter.qml'
2--- components/TabFooter.qml 2014-01-23 19:41:24 +0000
3+++ components/TabFooter.qml 2014-02-19 13:44:16 +0000
4@@ -72,8 +72,11 @@
5 } else if(loc_name === "ru_RU") {
6 url += "ru.weather.com/";
7 if(type) url += ((type === "10day") ? "10дней/" : "ежечасно/");
8+ } else {
9+ url += "www.weather.com/";
10+ if(type) url += "weather/"+((type === "10day") ? "tenday/" : "hourbyhour/graph/");
11+ }
12
13- }
14 if(type) url += serviceId;
15 url += "?par=ubuntu"
16 print(url)
17
18=== added file 'key.js'
19--- key.js 1970-01-01 00:00:00 +0000
20+++ key.js 2014-02-19 13:44:16 +0000
21@@ -0,0 +1,1 @@
22+var twcKey = "";

Subscribers

People subscribed via source and target branches