diff --git a/VERSION b/VERSION index c8dc7885..f8990476 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-05-28 13:33:55) dev +Version 2.00.0 (2012-05-28 13:37:41) dev diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py index f9959b93..e3848f10 100644 --- a/applications/admin/controllers/default.py +++ b/applications/admin/controllers/default.py @@ -63,7 +63,7 @@ def get_app(name=None): if app and (not MULTI_USER_MODE or is_manager() or \ db(db.app.name==app)(db.app.owner==auth.user.id).count()): return app - session.flash = 'App does not exist or your are not authorized' + session.flash = T('App does not exist or your are not authorized') redirect(URL('site')) def index(): @@ -1108,7 +1108,7 @@ def errors(): method = request.args(1) or 'new' db_ready = {} db_ready['status'] = get_ticket_storage(app) - db_ready['errmessage'] = "No ticket_storage.txt found under /private folder" + db_ready['errmessage'] = T("No ticket_storage.txt found under /private folder") db_ready['errlink'] = "http://web2py.com/books/default/chapter/29/13#Collecting-tickets" if method == 'new': @@ -1397,7 +1397,7 @@ def reload_routes(): def manage_students(): if not (MULTI_USER_MODE and is_manager()): - session.flash = 'Not Authorized' + session.flash = T('Not Authorized') redirect(URL('site')) db.auth_user.registration_key.writable = True grid = SQLFORM.grid(db.auth_user) @@ -1405,7 +1405,7 @@ def manage_students(): def bulk_register(): if not (MULTI_USER_MODE and is_manager()): - session.flash = 'Not Authorized' + session.flash = T('Not Authorized') redirect(URL('site')) form = SQLFORM.factory(Field('emails','text')) if form.process().accepted: diff --git a/applications/admin/controllers/gae.py b/applications/admin/controllers/gae.py index 646c7733..77b2458b 100644 --- a/applications/admin/controllers/gae.py +++ b/applications/admin/controllers/gae.py @@ -37,9 +37,9 @@ def deploy(): regex = re.compile('^\w+$') apps = sorted(file for file in os.listdir(apath(r=request)) if regex.match(file)) form = SQLFORM.factory( - Field('appcfg',default=GAE_APPCFG,label='Path to appcfg.py', + Field('appcfg',default=GAE_APPCFG,label=T('Path to appcfg.py'), requires=EXISTS(error_message=T('file not found'))), - Field('google_application_id',requires=IS_ALPHANUMERIC()), + Field('google_application_id',requires=IS_ALPHANUMERIC(),label=T('Google Application Id')), Field('applications','list:string', requires=IS_IN_SET(apps,multiple=True), label=T('web2py apps to deploy')), diff --git a/applications/admin/controllers/wizard.py b/applications/admin/controllers/wizard.py index 4420d94a..8de9dc1a 100644 --- a/applications/admin/controllers/wizard.py +++ b/applications/admin/controllers/wizard.py @@ -166,7 +166,7 @@ def step3(): try: tables=sort_tables(session.app['tables']) except RuntimeError: - response.flash=T('invalid circual reference') + response.flash=T('invalid circular reference') else: if n
- +
>>>
- Type PDB debugger command in here and hit Return (Enter) to execute it. + {{=T('Type PDB debugger command in here and hit Return (Enter) to execute it.')}}
@@ -79,7 +79,7 @@
    -
  • Using the shell may lock the database to other users of this app.
    • +
  • {{=T('Using the shell may lock the database to other users of this app.')}}
diff --git a/applications/admin/views/default/edit.html b/applications/admin/views/default/edit.html index a3f13c3a..5c64ebfc 100644 --- a/applications/admin/views/default/edit.html +++ b/applications/admin/views/default/edit.html @@ -72,7 +72,7 @@ jQuery(document).ready(function(){ {{if functions:}}

- {{=B(T('exposes:'))}}{{=XML(', '.join([A(f,_href=URL(a=app,c=controller,f=f)).xml() for f in functions]))}} + {{=B(T('exposes:'))}} {{=XML(', '.join([A(f,_href=URL(a=app,c=controller,f=f)).xml() for f in functions]))}} {{if editviewlinks:}}
{{=B(T('edit views:'))}} @@ -150,23 +150,23 @@ window.onload = function() { {{if filetype=='html':}}

-

Key bindings for ZenCoding Plugin

+

{{=T('Key bindings for ZenCoding Plugin')}}

    - {{=shortcut('Ctrl+S', 'Save via Ajax')}} - {{=shortcut('Ctrl+,', 'Expand Abbreviation')}} - {{=shortcut('Ctrl+M', 'Match Pair')}} - {{=shortcut('Ctrl+H', 'Wrap with Abbreviation')}} - {{=shortcut('Shift+Ctrl+M', 'Merge Lines')}} - {{=shortcut('Ctrl+Shift+←', 'Previous Edit Point')}} - {{=shortcut('Ctrl+Shift+→', 'Next Edit Point')}} - {{=shortcut('Ctrl+Shift+↑', 'Go to Matching Pair')}} + {{=shortcut('Ctrl+S', T('Save via Ajax'))}} + {{=shortcut('Ctrl+,', T('Expand Abbreviation'))}} + {{=shortcut('Ctrl+M', T('Match Pair'))}} + {{=shortcut('Ctrl+H', T('Wrap with Abbreviation'))}} + {{=shortcut('Shift+Ctrl+M', T('Merge Lines'))}} + {{=shortcut('Ctrl+Shift+←', T('Previous Edit Point'))}} + {{=shortcut('Ctrl+Shift+→', T('Next Edit Point'))}} + {{=shortcut('Ctrl+Shift+↑', T('Go to Matching Pair'))}}
{{else:}}
-

Key bindings

+

{{=T("Key bindings")}}

    - {{=shortcut('Ctrl+S', 'Save via Ajax')}} + {{=shortcut('Ctrl+S', T('Save via Ajax'))}}
{{pass}} diff --git a/applications/admin/views/default/site.html b/applications/admin/views/default/site.html index f992d4de..de4d418e 100644 --- a/applications/admin/views/default/site.html +++ b/applications/admin/views/default/site.html @@ -65,7 +65,7 @@ {{if is_manager():}}
-

{{="Version %s.%s.%s (%s) %s" % myversion}}

+

{{=T("Version %s.%s.%s (%s) %s") % myversion}}

{{if session.check_version:}}

{{=T('Checking for upgrades...')}} diff --git a/applications/admin/views/gae/deploy.html b/applications/admin/views/gae/deploy.html index ee7e9539..f64f92f1 100644 --- a/applications/admin/views/gae/deploy.html +++ b/applications/admin/views/gae/deploy.html @@ -12,7 +12,7 @@ $(document).ready(function() { }); -

Google App Engine Deployment Interface

+

{{=T("Google App Engine Deployment Interface")}}

{{=T("This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.")}}

@@ -20,10 +20,10 @@ $(document).ready(function() {

Command

{{=CODE(command)}} -

GAE Output

+

{{=T("GAE Output")}}


 {{else:}}
-
Deployment form

+
{{=T("Deployment form")}}

 

 {{=form}}
 

diff --git a/applications/examples/views/default/who.html b/applications/examples/views/default/who.html
index 03c4c30f..224e4da6 100644
--- a/applications/examples/views/default/who.html
+++ b/applications/examples/views/default/who.html
@@ -127,7 +127,7 @@
 
  • Yannis Aribaud (CAS compliance)
 
  • Yarko Tymciurak (design)
 
  • Younghyun Jo (internationalization)
-
  • Vladyslav Kozlovskyy (Ukrainian translation)
+
  • Vladyslav Kozlovskyy (internationalization and mercurial support)
 
  • Vidul Nikolaev Petrov (captcha)
 
  • Vinicius Assef
 
  • Zahariash (memory management)
diff --git a/applications/welcome/controllers/default.py b/applications/welcome/controllers/default.py
index 14a5a8ea..f449da20 100644
--- a/applications/welcome/controllers/default.py
+++ b/applications/welcome/controllers/default.py
@@ -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())
-
diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html
index c6a3754c..0e549aee 100644
--- a/applications/welcome/views/layout.html
+++ b/applications/welcome/views/layout.html
@@ -153,7 +153,7 @@
 			
    
 				
    {{=T('Copyright')}} © 2011
    
 				
    
-					Powered by
+					{{=T('Powered by')}}
 					web2py