diff --git a/applications/welcome/languages/it.py b/applications/welcome/languages/it.py index 619ba480..1f17ab79 100644 --- a/applications/welcome/languages/it.py +++ b/applications/welcome/languages/it.py @@ -23,7 +23,7 @@ 'Administrative Interface': 'Interfaccia Amministrativa', 'Administrative interface': 'Interfaccia amministrativa', 'Ajax Recipes': 'Ajax Recipes', -'An error occured, please %s the page': "E' stato rilevato un errore, prego %s la pagina", +'An error occured, please %s the page': "È stato rilevato un errore, prego %s la pagina", 'And': 'E', 'appadmin is disabled because insecure channel': 'Amministrazione (appadmin) disabilitata: comunicazione non sicura', 'Are you sure you want to delete this object?': 'Sicuro di voler cancellare questo oggetto ?', diff --git a/gluon/cache.py b/gluon/cache.py index bf3f33f3..510a724b 100644 --- a/gluon/cache.py +++ b/gluon/cache.py @@ -457,7 +457,7 @@ class Cache(object): public: if False forces the Cache-Control to be 'private' valid_statuses: by default only status codes starting with 1,2,3 will be cached. pass an explicit list of statuses on which turn the cache on - quick: Session,Vars,Lang,User-agent,Public,duration: + quick: Session,Vars,Lang,User-agent,Public: fast overrides with initial strings, e.g. 'SVLP' or 'VLP', or 'VLP' """ from gluon import current @@ -512,7 +512,7 @@ class Cache(object): current.response.headers['Expires'] = expires current.response.headers['Cache-Control'] = cache_control if cache_model and not send_headers: - cache_model.clear(cache_key) + cache_model(cache_key, None) return rtn return func() wrapped_f.__name__ = func.__name__