From bbe0b07f5ad4d5779675cbe7a7a3b7c7a0eb8661 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Wed, 11 Jul 2012 22:40:48 -0500
Subject: [PATCH] removed some of recent changes until futher study

---
 VERSION                                   |  2 +-
 applications/admin/controllers/default.py |  7 ++-----
 applications/admin/views/layout.html      | 22 +++++++++++-----------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/VERSION b/VERSION
index 090d03a4..d704d636 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-11 22:16:03) dev
+Version 2.00.0 (2012-07-11 22:40:45) dev
diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py
index cc56a5e2..559b19c9 100644
--- a/applications/admin/controllers/default.py
+++ b/applications/admin/controllers/default.py
@@ -794,11 +794,8 @@ def design():
     statics.sort()
 
     # Get all languages
-    languages = sorted([lang+'.py' for lang, info in
-                    T.get_possible_languages_info().iteritems()
-                    if info[2]!=0]) # info[2] is langfile_mtime:
-                                    # get only existed files
-
+    languages = listdir(apath('%s/languages/' % app, r=request), '[\w-]*\.py')
+    
     #Get crontab
     cronfolder = apath('%s/cron' % app, r=request)
     if not os.path.exists(cronfolder): os.mkdir(cronfolder)
diff --git a/applications/admin/views/layout.html b/applications/admin/views/layout.html
index 79f0efa3..8455ea22 100644
--- a/applications/admin/views/layout.html
+++ b/applications/admin/views/layout.html
@@ -28,17 +28,17 @@
             </div>
         </div>
         <div id="footer" class="fixed">
-            {{=T('Powered by')}} {{=A('web2py', _href='http://www.web2py.com')}}&trade; {{=T('created by')}} Massimo Di Pierro &copy;2007-2012 -
-        {{if hasattr(T,'get_possible_languages_info'):}}
-        <span>
-          {{=T('Admin language')}}
-          <select name="adminlanguage" onchange="var date = new Date();cookieDate=date.setTime(date.getTime()+(100*24*60*60*1000));document.cookie='adminLanguage='+this.options[this.selectedIndex].id+'; expires='+cookieDate+'; path=/';window.location.reload()">
-          {{for langinfo in sorted([(code,info[1]) for code,info in T.get_possible_languages_info().iteritems() if code != 'default']):}}
-            <option {{=T.accepted_language==langinfo[0] and 'selected' or ''}} {{='id='+langinfo[0]}} >{{=langinfo[1]}}</option>
-          {{pass}}
-          </select>
-        </span>
-        {{pass}}
+            {{=T('Powered by')}} {{=A('web2py', _href='http://www.web2py.com')}}&trade; {{=T('created by')}} Massimo Di Pierro &copy;2007-2011 -
+	    {{if hasattr(T,'get_possible_languages'):}}
+	    <span>
+	      {{=T('Admin language')}}
+	      <select name="adminlanguage" onchange="var date = new Date();cookieDate=date.setTime(date.getTime()+(100*24*60*60*1000));document.cookie='adminLanguage='+this.options[this.selectedIndex].value+'; expires='+cookieDate+'; path=/';window.location.reload()">
+		{{for language in T.get_possible_languages():}}
+		<option {{=T.accepted_language==language and 'selected' or ''}} >{{=language}}</option>
+		{{pass}}
+	      </select>
+	    </span>
+	    {{pass}}
         </div>
     </body>
 </html>