Merge branch 'master' of github.com:webnotes/wnframework

This commit is contained in:
Anand Doshi 2013-07-26 17:01:47 +05:30
commit 87e2bb7649
2 changed files with 4 additions and 2 deletions

View file

@ -2,6 +2,7 @@ body {
margin: 0px;
padding-top: 70px;
padding-bottom: 50px;
background-color: #F5EFE6;
}
h1, h2, h3, h4, h5 {

View file

@ -49,6 +49,7 @@ def _(msg):
return messages.get(lang, {}).get(msg, msg)
def set_user_lang(user, user_language=None):
global lang, user_lang
try:
from startup import lang_list, lang_names
except ImportError:
@ -57,8 +58,8 @@ def set_user_lang(user, user_language=None):
if not user_language:
user_language = conn.get_value("Profile", user, "language")
if user_language and (user_language.lower() in lang_names):
webnotes.lang = lang_names[user_language.lower()]
webnotes.user_lang = True
lang = lang_names[user_language.lower()]
user_lang = True
def load_translations(module, doctype, name):
from webnotes.translate import load_doc_messages