From 752bb7e048276c2f40d421c03b2c3ee9c87a63c3 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 22 Oct 2012 22:21:11 -0500
Subject: [PATCH] portable languages

---
 VERSION                                   | 2 +-
 applications/admin/controllers/default.py | 2 +-
 applications/welcome/languages/it.py      | 1 -
 gluon/compileapp.py                       | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/VERSION b/VERSION
index 8c46a8a0..6bbf2868 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.2.1 (2012-10-22 22:14:35) stable
+Version 2.2.1 (2012-10-22 22:21:06) stable
diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py
index 3daad36b..1de5098e 100644
--- a/applications/admin/controllers/default.py
+++ b/applications/admin/controllers/default.py
@@ -998,7 +998,7 @@ def design():
     statics.sort()
 
     # Get all languages
-    langpath = os.path.join(apath(app, r=request),'language')
+    langpath = os.path.join(apath(app, r=request),'languages')
     languages = dict([(lang, info) for lang, info
                       in read_possible_languages(langpath).iteritems()
                       if info[2] != 0])  # info[2] is langfile_mtime:
diff --git a/applications/welcome/languages/it.py b/applications/welcome/languages/it.py
index 17988e3c..fcd9c933 100644
--- a/applications/welcome/languages/it.py
+++ b/applications/welcome/languages/it.py
@@ -6,7 +6,6 @@
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" è un\'espressione opzionale come "campo1=\'nuovo valore\'". Non si può fare "update" o "delete" dei risultati di un JOIN ',
 '%(nrows)s records found': '%(nrows)s records found',
 '%d seconds ago': '%d seconds ago',
-'%m/%d/%Y': '%m/%d/%Y',
 '%s %%{row} deleted': '%s righe ("record") cancellate',
 '%s %%{row} updated': '%s righe ("record") modificate',
 '%s selected': '%s selezionato',
diff --git a/gluon/compileapp.py b/gluon/compileapp.py
index 33ee0564..b98e77aa 100644
--- a/gluon/compileapp.py
+++ b/gluon/compileapp.py
@@ -397,7 +397,7 @@ def build_environment(request, response, session, store_current=True):
                               r'^%s/%s/\w+\.py$' % (request.controller, request.function)]
 
     t = environment['T'] = translator(os.path.join(request.folder,'languages'),
-                                      request.env.http_accept_langauge)
+                                      request.env.http_accept_language)
     c = environment['cache'] = Cache(request)
 
     if store_current: