From 5a80d320b57475f9af3fbf094d4d7d1755bb380d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 18 Jan 2018 13:50:46 +0100 Subject: Update translations --- ishtar_common/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 2c8240a72..aa3e94ae0 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2732,7 +2732,7 @@ class Town(Imported, models.Model): year = models.IntegerField( _("Year of creation"), null=True, blank=True, help_text=_(u"Filling this field is relevant to distinguish old towns " - u"to new towns.")) + u"from new towns.")) children = models.ManyToManyField( 'Town', verbose_name=_(u"Town children"), blank=True, related_name='parents') -- cgit v1.2.3 From 1e4e2f26d45ae45c2055bd86b9af3a41aaaf520a Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Thu, 18 Jan 2018 14:00:30 +0100 Subject: Update labels --- ishtar_common/models.py | 6 +++--- ishtar_common/models_imports.py | 2 +- ishtar_common/views.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index aa3e94ae0..1394cb8eb 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -932,9 +932,9 @@ class JsonDataField(models.Model): key = models.CharField( _(u"Key"), max_length=200, help_text=_(u"Value of the key in the JSON schema. For hierarchical " - u"key use \"__\" to explain it. For instance the key " + u"key use \"__\" to explain it. For instance for the key " u"'my_subkey' with data such as {'my_key': {'my_subkey': " - u"'value'}} will be reached with my_key__my_subkey.")) + u"'value'}}, its value will be reached with my_key__my_subkey.")) display = models.BooleanField(_(u"Display"), default=True) order = models.IntegerField(_(u"Order"), default=10) section = models.ForeignKey(JsonDataSection, blank=True, null=True) @@ -952,7 +952,7 @@ class JsonDataField(models.Model): return if self.section.content_type != self.content_type: raise ValidationError( - _(u"Content type of the field and of the menu do not match")) + _(u"Content types of the field and of the menu do not match")) class JsonData(models.Model): diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 01a64da22..f8281148b 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -502,7 +502,7 @@ class TargetKeyGroup(models.Model): Group of target keys for imports. """ name = models.TextField(_(u"Name"), unique=True) - all_user_can_use = models.BooleanField(_(u"All user can user it"), + all_user_can_use = models.BooleanField(_(u"All user can use it"), default=False) all_user_can_modify = models.BooleanField(_(u"All user can modify it"), default=False) diff --git a/ishtar_common/views.py b/ishtar_common/views.py index d8c5b1997..613e02a61 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -96,12 +96,12 @@ def index(request): dct = {'warnings': []} if settings.PROJECT_SLUG == 'default': dct['warnings'].append(_( - u"PROJECT_SLUG is set to \"default\" change it in your " + u"PROJECT_SLUG is set to \"default\". Change it in your " u"local_settings (or ask your admin to do it).")) profile = get_current_profile() if profile.slug == 'default': dct['warnings'].append(_( - u"The slug of your current profile is set to \"default\" change it " + u"The slug of your current profile is set to \"default\". Change it " u"on the administration page (or ask your admin to do it).")) image = get_random_item_image_link(request) if hasattr(profile, 'homepage') and profile.homepage: -- cgit v1.2.3