Merge remote-tracking branches 'mkaysi/showImperialAndMetric' and 'origin/patch-1' into devel

This commit is contained in:
GLolol 2014-11-14 19:51:37 -08:00
commit c803b2ee29
2 changed files with 2 additions and 2 deletions

View File

@ -36,7 +36,7 @@ reload(plugin)
# reloaded when this plugin is reloaded. Don't forget to import them as well!
if world.testing:
import test
from . import test
Class = plugin.Class
configure = config.configure

View File

@ -30,7 +30,7 @@ conf.registerGlobalValue(Weather,'astronomy', registry.Boolean(False, ("""Displa
conf.registerGlobalValue(Weather,'showPressure', registry.Boolean(False, ("""Show pressure in output?""")))
conf.registerGlobalValue(Weather,'showWind', registry.Boolean(False, ("""Show wind in output?""")))
conf.registerGlobalValue(Weather,'showUpdated', registry.Boolean(False, ("""Show updated in output?""")))
conf.registerChannelValue(Weather,'showImperialAndMetric', registry.Boolean(False, ("""In channel, display output with Imperial and Metric?""")))
conf.registerChannelValue(Weather,'showImperialAndMetric', registry.Boolean(True, ("""In channel, display output with Imperial and Metric?""")))
conf.registerGlobalValue(Weather,'lang', registry.String('EN', ("""language to use. See docs for available codes.""")))