From e09655b112169e0d57fd494d299f2e6713b2f52c Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sun, 3 Mar 2019 14:27:12 -0800
Subject: [PATCH] fixed translator

---
 applications/welcome/languages/it.py | 3 +++
 gluon/sqlhtml.py                     | 2 ++
 gluon/validators.py                  | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/applications/welcome/languages/it.py b/applications/welcome/languages/it.py
index acaf1a39..5260343e 100755
--- a/applications/welcome/languages/it.py
+++ b/applications/welcome/languages/it.py
@@ -49,6 +49,7 @@
 'Cannot be empty': 'Non può essere vuoto',
 'Change password': 'Cambia Password',
 'change password': 'Cambia password',
+'Change Password': 'Change Password',
 'Check to delete': 'Seleziona per cancellare',
 'Clear': 'Resetta',
 'Clear CACHE?': 'Resetta CACHE?',
@@ -60,6 +61,7 @@
 'Community': 'Community',
 'Components and Plugins': 'Componenti and Plugin',
 'Config.ini': 'Config.ini',
+'Confirm Password': 'Confirm Password',
 'contains': 'contiene',
 'Controller': 'Controller',
 'Copyright': 'Copyright',
@@ -155,6 +157,7 @@
 'Lost Password': 'Password Smarrita',
 'Lost password?': 'Password smarrita?',
 'lost password?': 'dimenticato la password?',
+'Lost your password?': 'Lost your password?',
 'Main Menu': 'Menu principale',
 'Manage %(action)s': 'Manage %(action)s',
 'Manage Access Control': 'Manage Access Control',
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index fa54f498..1c8d64ac 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -3284,6 +3284,8 @@ class SQLFORM(FORM):
             if isinstance(kwargs.get(key, None), dict):
                 if table._tablename in kwargs[key]:
                     kwargs[key] = kwargs[key][table._tablename]
+                elif '*' in kwargs[key]:
+                    kwargs[key] = kwargs[key]['*']
                 else:
                     del kwargs[key]
         check = {}
diff --git a/gluon/validators.py b/gluon/validators.py
index 9728714f..39974dcc 100644
--- a/gluon/validators.py
+++ b/gluon/validators.py
@@ -3408,7 +3408,7 @@ class IS_FILE(Validator):
         try:
             string = value.filename
         except:
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
         if self.case == 1:
             string = string.lower()
         elif self.case == 2:
@@ -3420,9 +3420,9 @@ class IS_FILE(Validator):
         if dot == -1:
             dot = len(string)
         if self.filename and not self.match(self.filename, string[:dot]):
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
         elif self.extension and not self.match(self.extension, string[dot + 1:]):
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
         else:
             return (value, None)