From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 10 Jul 2011 19:11:43 +0000 (-0700)
Subject: Allow any properly-formatted locale, not just ones in LOCALE_NAMES.
X-Git-Tag: v2.1.0~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a93ccd72320989a0ac83fce7039e47df1b9959e6;p=thirdparty%2Ftornado.git

Allow any properly-formatted locale, not just ones in LOCALE_NAMES.
---

diff --git a/tornado/locale.py b/tornado/locale.py
index 5d8def8e8..61cdb7e7e 100644
--- a/tornado/locale.py
+++ b/tornado/locale.py
@@ -43,6 +43,7 @@ import csv
 import datetime
 import logging
 import os
+import re
 
 _default_locale = "en_US"
 _translations = {}
@@ -110,7 +111,7 @@ def load_translations(directory):
     for path in os.listdir(directory):
         if not path.endswith(".csv"): continue
         locale, extension = path.split(".")
-        if locale not in LOCALE_NAMES:
+        if not re.match("[a-z]+(_[A-Z]+)?$", locale):
             logging.error("Unrecognized locale %r (path: %s)", locale,
                           os.path.join(directory, path))
             continue