Merge branch 'master' of github.com:web2py/web2py

2012-06-06 11:10:56 +02:00
parent 9ee964165b b45134512a
commit 560aef2a1d
55 changed files with 2112 additions and 1281 deletions
@@ -14,7 +14,7 @@ def index():
    example action using the internationalization operator T and flash
    rendered by views/default/index.html or views/generic.html
    """
-    response.flash = "Welcome to web2py!"
+    response.flash = T("Welcome to web2py!")
    return dict(message=T('Hello World'))

 def user():
@@ -68,4 +68,3 @@ def data():
      LOAD('default','data.load',args='tables',ajax=True,user_signature=True)
    """
    return dict(form=crud())
-