Time format for country
This commit is contained in:
parent
fe586755e3
commit
a8861238ac
|
|
@ -15,6 +15,13 @@ class Country(TranslatedFieldsMixin, SVGImageMixin, ProjectBaseMixin):
|
||||||
|
|
||||||
STR_FIELD_NAME = 'name'
|
STR_FIELD_NAME = 'name'
|
||||||
|
|
||||||
|
TWENTEEN_HOURS_FORMAT_COUNTRIES = [
|
||||||
|
'ca', # Canada
|
||||||
|
'au', # Australia
|
||||||
|
'us', # USA
|
||||||
|
'nz', # New Zeland
|
||||||
|
]
|
||||||
|
|
||||||
name = TJSONField(null=True, blank=True, default=None,
|
name = TJSONField(null=True, blank=True, default=None,
|
||||||
verbose_name=_('Name'), help_text='{"en-GB":"some text"}')
|
verbose_name=_('Name'), help_text='{"en-GB":"some text"}')
|
||||||
code = models.CharField(max_length=255, unique=True, verbose_name=_('Code'))
|
code = models.CharField(max_length=255, unique=True, verbose_name=_('Code'))
|
||||||
|
|
@ -23,6 +30,10 @@ class Country(TranslatedFieldsMixin, SVGImageMixin, ProjectBaseMixin):
|
||||||
languages = models.ManyToManyField(Language, verbose_name=_('Languages'))
|
languages = models.ManyToManyField(Language, verbose_name=_('Languages'))
|
||||||
old_id = models.IntegerField(null=True, blank=True, default=None)
|
old_id = models.IntegerField(null=True, blank=True, default=None)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def time_format(self):
|
||||||
|
return 'hh:mmA' if self.code.lower() in self.TWENTEEN_HOURS_FORMAT_COUNTRIES else 'hh:mm'
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def country_id(self):
|
def country_id(self):
|
||||||
return self.id
|
return self.id
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,7 @@ class SiteSettingsSerializer(serializers.ModelSerializer):
|
||||||
country_code = serializers.CharField(source='subdomain', read_only=True)
|
country_code = serializers.CharField(source='subdomain', read_only=True)
|
||||||
|
|
||||||
country_name = serializers.CharField(source='country.name_translated', read_only=True)
|
country_name = serializers.CharField(source='country.name_translated', read_only=True)
|
||||||
|
time_format = serializers.CharField(source='country.time_format', read_only=True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
"""Meta class."""
|
"""Meta class."""
|
||||||
|
|
@ -71,6 +72,7 @@ class SiteSettingsSerializer(serializers.ModelSerializer):
|
||||||
model = models.SiteSettings
|
model = models.SiteSettings
|
||||||
fields = (
|
fields = (
|
||||||
'country_code',
|
'country_code',
|
||||||
|
'time_format',
|
||||||
'subdomain',
|
'subdomain',
|
||||||
'pinterest_page_url',
|
'pinterest_page_url',
|
||||||
'twitter_page_url',
|
'twitter_page_url',
|
||||||
|
|
@ -81,7 +83,7 @@ class SiteSettingsSerializer(serializers.ModelSerializer):
|
||||||
'ad_config',
|
'ad_config',
|
||||||
'published_features',
|
'published_features',
|
||||||
'currency',
|
'currency',
|
||||||
'country_name'
|
'country_name',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user