commit
fecfa5c82a
|
|
@ -6,6 +6,7 @@
|
|||
import babel.dates
|
||||
import pytz
|
||||
import logging
|
||||
from babel import Locale
|
||||
import odoo
|
||||
from odoo import models, api
|
||||
from odoo.osv import expression
|
||||
|
|
@ -37,7 +38,8 @@ def format_date(env, value, lang_code=False, date_format=False):
|
|||
|
||||
lang = env['res.lang']._lang_get(lang_code or env.context.get('lang') or 'en_US')
|
||||
locale = babel.Locale.parse(lang.code)
|
||||
if locale.lower().startswith('ar'):
|
||||
locale_str = str(locale) if isinstance(locale, Locale) else locale
|
||||
if locale_str and locale_str.lower().startswith('ar'):
|
||||
locale = "ar"
|
||||
if not date_format:
|
||||
date_format = posix_to_ldml(lang.date_format, locale=locale)
|
||||
|
|
@ -66,7 +68,7 @@ class WebClientIhnerit(WebClient):
|
|||
direct_passthrough=True,
|
||||
)
|
||||
except IOError:
|
||||
_logger.debug("No moment locale for code %s", code)
|
||||
_logger.debug("No moment for code %s", code)
|
||||
|
||||
return request.make_response("", headers=[
|
||||
('Content-Type', 'application/javascript'),
|
||||
|
|
@ -109,10 +111,10 @@ class BaseModelExtend(models.BaseModel):
|
|||
if ftype == 'many2one':
|
||||
value = value[0]
|
||||
elif ftype in ('date', 'datetime'):
|
||||
locale = self._context.get('lang') or 'en_US'
|
||||
= self._context.get('lang') or 'en_US'
|
||||
# use arabic instade of arabic syria
|
||||
if locale.lower().startswith('ar'):
|
||||
locale = "ar"
|
||||
if .lower().startswith('ar'):
|
||||
= "ar"
|
||||
fmt = DEFAULT_SERVER_DATETIME_FORMAT if ftype == 'datetime' else DEFAULT_SERVER_DATE_FORMAT
|
||||
tzinfo = None
|
||||
range_start = value
|
||||
|
|
@ -131,12 +133,12 @@ class BaseModelExtend(models.BaseModel):
|
|||
if ftype == 'datetime':
|
||||
label = babel.dates.format_datetime(
|
||||
value, format=gb['display_format'],
|
||||
tzinfo=tzinfo, locale=locale
|
||||
tzinfo=tzinfo, =
|
||||
)
|
||||
else:
|
||||
label = babel.dates.format_date(
|
||||
value, format=gb['display_format'],
|
||||
locale=locale
|
||||
=
|
||||
)
|
||||
data[gb['groupby']] = ('%s/%s' % (range_start, range_end), label)
|
||||
d = [
|
||||
|
|
|
|||
Loading…
Reference in New Issue