From 860f40ca63080a6b83eec73dfb07e19ac1a3cdb0 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 19 Sep 2013 21:33:31 -0500 Subject: [PATCH] added support for 3letter language files, issue 1680, thanks Fran --- VERSION | 2 +- gluon/languages.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 03d0a1ba..43aaa087 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.3-stable+timestamp.2013.09.19.20.49.27 +Version 2.6.3-stable+timestamp.2013.09.19.21.32.38 diff --git a/gluon/languages.py b/gluon/languages.py index d377d34e..a3f0db9e 100644 --- a/gluon/languages.py +++ b/gluon/languages.py @@ -67,8 +67,8 @@ regex_param = re.compile(r'{(?P.+?)}') # pattern for a valid accept_language regex_language = \ - re.compile('([a-z]{2}(?:\-[a-z]{2})?(?:\-[a-z]{2})?)(?:[,;]|$)') -regex_langfile = re.compile('^[a-z]{2}(-[a-z]{2})?\.py$') + re.compile('([a-z]{2,3}(?:\-[a-z]{2})?(?:\-[a-z]{2})?)(?:[,;]|$)') +regex_langfile = re.compile('^[a-z]{2,3}(-[a-z]{2})?\.py$') regex_backslash = re.compile(r"\\([\\{}%])") regex_plural = re.compile('%({.+?})') regex_plural_dict = re.compile('^{(?P[^()[\]][^()[\]]*?)\((?P[^()\[\]]+)\)}$') # %%{word(varname or number)}