From 5d2967abdf1d2ed0ab50b2dedc878bdd16079df0 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 17 Oct 2012 09:13:48 -0500 Subject: [PATCH] T.is_writable, thanks Fran --- VERSION | 2 +- gluon/languages.py | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 1375695b..30ff6dd0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.1.1 (2012-10-16 11:47:13) dev +Version 2.1.1 (2012-10-17 09:13:38) dev diff --git a/gluon/languages.py b/gluon/languages.py index 397fabd9..1601f3af 100644 --- a/gluon/languages.py +++ b/gluon/languages.py @@ -35,8 +35,7 @@ pjoin = os.path.join pexists = os.path.exists pdirname = os.path.dirname isdir = os.path.isdir -is_writable = not (settings.global_settings.web2py_runtime_gae or - settings.global_settings.languages_readonly) +is_gae = settings.global_settings.web2py_runtime_gae DEFAULT_LANGUAGE = 'en' DEFAULT_LANGUAGE_NAME = 'English' @@ -275,7 +274,7 @@ def write_plural_dict(filename, contents): fp.write('%s: %s,\n' % (repr(Utf8(key)), forms)) fp.write('}\n') except (IOError, OSError): - if is_writable: + if not is_gae: logging.warning('Unable to write to file %s' % filename) return finally: @@ -417,7 +416,7 @@ class translator(object): self.folder = request.folder self.langpath = pjoin(self.folder, 'languages') self.http_accept_language = request.env.http_accept_language - self.is_writable = is_writable + self.is_writable = not is_gae # filled in self.force(): #------------------------ # self.cache @@ -539,7 +538,7 @@ class translator(object): form = self.construct_plural_form(word, id) forms[id-1] = form self.plural_dict[word] = forms - if self.plural_file and self.is_writable: + if self.is_writable and self.plural_file: write_plural_dict(self.plural_file, self.plural_dict) return form @@ -725,7 +724,7 @@ class translator(object): # guess translation same as original self.t[key] = mt = self.default_t.get(key, message) # update language file for latter translation - if self.language_file != self.default_language_file and self.is_writable: + if self.is_writable and self.language_file != self.default_language_file: write_dict(self.language_file, self.t) return regex_backslash.sub( lambda m: m.group(1).translate(ttab_in), mt)