diff --git a/frappe/commands.py b/frappe/commands.py index 46023ee508..1d7ae3aff8 100644 --- a/frappe/commands.py +++ b/frappe/commands.py @@ -613,6 +613,7 @@ def console(context): site = get_single_site(context) frappe.init(site=site) frappe.connect() + frappe.local.lang = frappe.db.get_default("lang") import IPython IPython.embed() diff --git a/frappe/translations/zh-cn.csv b/frappe/translations/zh-cn.csv index b7e3e8d890..52de6de5df 100644 --- a/frappe/translations/zh-cn.csv +++ b/frappe/translations/zh-cn.csv @@ -1468,3 +1468,12 @@ DocType: System Settings,mm-dd-yyyy,月-日-年 apps/frappe/frappe/desk/doctype/feed/feed.py +91,{0} logged in,{0}已登录 apps/frappe/frappe/templates/emails/new_user.html +4,Your login id is,您的登录ID是 DocType: DocField,Ignore User Permissions,忽略用户权限 +apps/frappe/frappe/templates/pages/login.html +29,Email address,登入电子邮件 +apps/frappe/frappe/templates/pages/login.html +40,Password,密码 +apps/frappe/frappe/templates/pages/login.html +36,Sign in,登入 +apps/frappe/frappe/templates/pages/login.html +40,Not a user yet? Sign up,不是用户吗?注册吧 +apps/frappe/frappe/templates/pages/login.html +44,Forgot Password?,忘记密码了? +apps/frappe/frappe/templates/pages/login.html +54,Sign up,注册 +apps/frappe/frappe/templates/pages/login.html +56,Have an account? Login,已经有账号了?登入吧 +apps/frappe/frappe/templates/pages/login.html +67,Send Password,发密码到邮箱 +apps/frappe/frappe/templates/pages/login.html +69,Back to Login,返回登入 diff --git a/frappe/website/render.py b/frappe/website/render.py index fc5d4bb70b..54f5909807 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -18,6 +18,7 @@ class PageNotFoundError(Exception): pass def render(path, http_status_code=None): """render html page""" path = resolve_path(path.strip("/ ")) + frappe.local.lang = frappe.db.get_default("lang") try: data = render_page(path) @@ -216,4 +217,3 @@ def clear_cache(path=None): for method in frappe.get_hooks("website_clear_cache"): frappe.get_attr(method)(path) -