commit 35279d825cdf4ac8c655f243baa9c3a3759ecc76 Merge: e4ba1ba 8ef4f59 Author: Arturo Filastò <hellais@gmail.com> Date: Fri Mar 2 16:19:06 2012 -0800 Merge branch 'master' of github.com:hellais/TorStatus js/models/relay.js | 1 + templates/details/main.html | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --cc js/models/relay.js index f43593c,b195f01..a72d838 --- a/js/models/relay.js +++ b/js/models/relay.js @@@ -132,8 -132,9 +132,9 @@@ define( //console.log(data); var bw = relay.advertised_bandwidth; relay.bandwidth = bw; + relay.family = relay.family ? relay.family : null; relay.bandwidth_hr = hrBandwidth(bw); - relay.countryname = CountryCodes[relay.country]; + relay.countryname = CountryCodes[relay.country.toLowerCase()]; relay.uptime = model.parsedate(relay.last_restarted); relay.uptime_hr = relay.uptime.hr; //console.log(relay.uptime.hrfull);