diff options
Diffstat (limited to 'cgi/framework.py')
-rw-r--r-- | cgi/framework.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cgi/framework.py b/cgi/framework.py index 898d6a1..94f6f30 100644 --- a/cgi/framework.py +++ b/cgi/framework.py @@ -24,8 +24,7 @@ def setBoard(dir): if not dir: raise UserError, _("The specified board is invalid.") logging.debug("Seteando el board " + dir) - board = FetchOne( - "SELECT * FROM `boards` WHERE `dir` = '%s' LIMIT 1" % _mysql.escape_string(dir)) + board = FetchOne("SELECT * FROM `boards` WHERE `dir` = '%s' LIMIT 1" % _mysql.escape_string(dir)) if not board: raise UserError, _("The specified board is invalid.") @@ -96,7 +95,8 @@ def addressIsProxy(ip): def addressIsES(ip): ES = ['AR', 'BO', 'CL', 'CO', 'CR', 'CU', 'EC', 'ES', 'GF', - 'GY', 'GT', 'HN', 'MX', 'NI', 'PA', 'PE', 'PY', 'PR', 'SR', 'UY', 'VE', 'v6'] # 'BR', + 'GY', 'GT', 'HN', 'MX', 'NI', 'PA', 'PE', 'PY', 'PR', + 'SR', 'UY', 'VE', 'v6'] # 'BR', return getCountry(ip) in ES @@ -176,10 +176,10 @@ def formatDate(t=None, home=False): if not home: try: board = Settings._.BOARD - if board["dir"] == 'world': - daylist = days['en'] - elif board["dir"] == '2d': + if board["dir"] == '2d': daylist = days['jp'] + elif board["dir"] == 'world': + daylist = days['en'] except: pass |