who.html updated

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

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:

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')),

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<m-1:
                 redirect(URL('step3',args=n+1))

applications/admin/views/debug/index.html

@@ -64,14 +64,14 @@
 </style-->
 
 <div id="wrapper">
-  <textarea id="output" readonly="readonly">web2py Debugger {{=request.env.web2py_version}}{{=data}}</textarea>
+  <textarea id="output" readonly="readonly">{{=T('web2py Debugger')}} {{=request.env.web2py_version}}{{=data}}</textarea>
 
   <form id="form" action="{{=URL(r=request,f='callback',args=app)}}" method="get">
     <div id="shellwrapper">
       <div id="caret">&gt;&gt;&gt;</div>
       <div class="tooltip">
         <textarea class="prompt" name="statement" id="statement"></textarea>
-        <span>Type PDB debugger command in here and hit Return (Enter) to execute it.</span>
+        <span>{{=T('Type PDB debugger command in here and hit Return (Enter) to execute it.')}}</span>
       </div>
     </div>
   </form>
@@ -79,7 +79,7 @@
 
 <div class="help">
   <ul>
-    <li>Using the shell may lock the database to other users of this app.</li>
+    <li>{{=T('Using the shell may lock the database to other users of this app.')}}</li>
   </ul>
 </div>
 

applications/admin/views/default/edit.html

@@ -72,7 +72,7 @@ jQuery(document).ready(function(){
 {{if functions:}}
   <p class="formfield">
 <span style="text-align:left;" id="exposed">
-  {{=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]))}}
 </span>
   {{if editviewlinks:}}<br/>
   {{=B(T('edit views:'))}}
@@ -150,23 +150,23 @@ window.onload = function() {
 
 {{if filetype=='html':}}
 <div class="help">
-  <h3>Key bindings for ZenCoding Plugin</h3>
+  <h3>{{=T('Key bindings for ZenCoding Plugin')}}</h3>
   <ul>
-    {{=shortcut('Ctrl+S', 'Save via Ajax')}}
+    {{=shortcut('Ctrl+S', T('Save via Ajax'))}}
-    {{=shortcut('Ctrl+,', 'Expand Abbreviation')}}
+    {{=shortcut('Ctrl+,', T('Expand Abbreviation'))}}
-    {{=shortcut('Ctrl+M', 'Match Pair')}}
+    {{=shortcut('Ctrl+M', T('Match Pair'))}}
-    {{=shortcut('Ctrl+H', 'Wrap with Abbreviation')}}
+    {{=shortcut('Ctrl+H', T('Wrap with Abbreviation'))}}
-    {{=shortcut('Shift+Ctrl+M', 'Merge Lines')}}
+    {{=shortcut('Shift+Ctrl+M', T('Merge Lines'))}}
-    {{=shortcut('Ctrl+Shift+←', 'Previous Edit Point')}}
+    {{=shortcut('Ctrl+Shift+←', T('Previous Edit Point'))}}
-    {{=shortcut('Ctrl+Shift+→', 'Next Edit Point')}}
+    {{=shortcut('Ctrl+Shift+→', T('Next Edit Point'))}}
-    {{=shortcut('Ctrl+Shift+↑', 'Go to Matching Pair')}}
+    {{=shortcut('Ctrl+Shift+↑', T('Go to Matching Pair'))}}
   </ul>
 </div>
 {{else:}}
 <div class="help">
-  <h3>Key bindings</h3>
+  <h3>{{=T("Key bindings")}}</h3>
   <ul>
-    {{=shortcut('Ctrl+S', 'Save via Ajax')}}
+    {{=shortcut('Ctrl+S', T('Save via Ajax'))}}
   </ul>
 </div>
 {{pass}}

applications/admin/views/default/site.html

@@ -65,7 +65,7 @@
     <!-- VERSION -->
     {{if is_manager():}}
     <div class="box">
-      <h3>{{="Version %s.%s.%s (%s) %s" % myversion}}</h3>
+      <h3>{{=T("Version %s.%s.%s (%s) %s") % myversion}}</h3>
       {{if session.check_version:}}
       <p id="check_version">
         {{=T('Checking for upgrades...')}}

applications/admin/views/gae/deploy.html

@@ -12,7 +12,7 @@ $(document).ready(function() {
 });
 </script>
 
-<h2>Google App Engine Deployment Interface</h2>
+<h2>{{=T("Google App Engine Deployment Interface")}}</h2>
 
 <p class="help">{{=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.")}}</p>
 
@@ -20,10 +20,10 @@ $(document).ready(function() {
 <h3>Command</h3>
 <button onclick="$.get('{{=URL(r=request,f='kill')}}');">kill process</button>
 {{=CODE(command)}}
-<h3>GAE Output</h3>
+<h3>{{=T("GAE Output")}}</h3>
 <pre id="target"></pre>
 {{else:}}
-<h3>Deployment form</h3>
+<h3>{{=T("Deployment form")}}</h3>
 <div class="deploy_form form">
 {{=form}}
 </div>

applications/examples/views/default/who.html

@@ -127,7 +127,7 @@
 </li><li>Yannis Aribaud (CAS compliance)
 </li><li>Yarko Tymciurak (design)
 </li><li>Younghyun Jo (internationalization)
-</li><li>Vladyslav Kozlovskyy (Ukrainian translation)
+</li><li>Vladyslav Kozlovskyy (internationalization and mercurial support)
 </li><li>Vidul Nikolaev Petrov (captcha)
 </li><li>Vinicius Assef
 </li><li>Zahariash (memory management)

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())
-

applications/welcome/views/layout.html

@@ -153,7 +153,7 @@
 			<div class="footer-content">
 				<div class="copyright pull-left">{{=T('Copyright')}} &#169; 2011</div>
 				<div id="poweredBy" class="pull-right">
-					Powered by
+					{{=T('Powered by')}}
 					<a href="http://www.web2py.com/">web2py</a>
 				</div>
 			</div>