diff options
| author | Cedric Snauwaert <csn@openerp.com> | 2014-09-16 09:55:01 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2014-11-05 15:27:59 +0100 |
| commit | 347c0e15401990fd7f32007da849ef2d0ae375b3 (patch) | |
| tree | 5b5bded4432182cd54c9ea6bf49569e60d37af3d /addons/web/controllers/main.py | |
| parent | a878de477f6c31ab3308407ac34a4895fe409734 (diff) | |
[FIX] web: remove lazy load of datejs locale
Diffstat (limited to 'addons/web/controllers/main.py')
| -rw-r--r-- | addons/web/controllers/main.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 85219dd47b1..dd4d32aff35 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -558,14 +558,6 @@ class WebClient(http.Controller): def load_locale(self, lang): magic_file_finding = [lang.replace("_",'-').lower(), lang.split('_')[0]] addons_path = http.addons_manifest['web']['addons_path'] - #load datejs locale - datejs_locale = "" - try: - with open(os.path.join(addons_path, 'web', 'static', 'lib', 'datejs', 'globalization', lang.replace('_', '-') + '.js'), 'r') as f: - datejs_locale = f.read() - except IOError: - pass - #load momentjs locale momentjs_locale_file = False momentjs_locale = "" @@ -580,7 +572,7 @@ class WebClient(http.Controller): #return the content of the locale headers = [('Content-Type', 'application/javascript'), ('Cache-Control', 'max-age=%s' % (36000))] - return request.make_response(datejs_locale + "\n"+ momentjs_locale, headers) + return request.make_response(momentjs_locale, headers) @http.route('/web/webclient/qweb', type='http', auth="none") def qweb(self, mods=None, db=None): |