summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>2018-01-18 14:00:30 +0100
committerValérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>2018-01-18 14:00:30 +0100
commit2dcb1608f4ae2352987d263ab81eec2596c696b0 (patch)
treee4315410a83cddd71e1b7cd160a343ccc0a59093
parentdacf4371a68ffcc9ac32c6590e19dd201c0a27ab (diff)
downloadIshtar-2dcb1608f4ae2352987d263ab81eec2596c696b0.tar.bz2
Ishtar-2dcb1608f4ae2352987d263ab81eec2596c696b0.zip
Update labels
-rw-r--r--ishtar_common/models.py6
-rw-r--r--ishtar_common/models_imports.py2
-rw-r--r--ishtar_common/views.py4
3 files changed, 6 insertions, 6 deletions
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: