summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorValérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>2016-11-14 22:17:04 +0100
committerValérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>2016-11-14 22:17:04 +0100
commitf9a03487582f555428b947cb1130740b0cad5e90 (patch)
tree8da7073558fd83b852727151b7d97a0c09e65626 /ishtar_common
parent87208abf2d2616faad094f33168b491d2a4efcc8 (diff)
downloadIshtar-f9a03487582f555428b947cb1130740b0cad5e90.tar.bz2
Ishtar-f9a03487582f555428b947cb1130740b0cad5e90.zip
Update labels
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/forms_common.py2
-rw-r--r--ishtar_common/ishtar_menu.py2
-rw-r--r--ishtar_common/templates/base.html4
-rw-r--r--ishtar_common/templates/ishtar/blocks/window_nav.html2
-rw-r--r--ishtar_common/templates/ishtar/wizard/default_wizard.html2
5 files changed, 6 insertions, 6 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index 82849d21c..7ab09f9f7 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -40,7 +40,7 @@ from forms import FinalForm, FormSet, reverse_lazy, name_validator, \
def get_town_field(label=_(u"Town"), required=True):
help_text = _(
- u"<p>Type name, department code and/or postal code of the "
+ u"<p>Type name, department code of the "
u"town you would like to select. The search is insensitive to case."
u"</p>\n<p>Only the first twenty results are displayed but specifying "
u"the department code is generally sufficient to get the appropriate "
diff --git a/ishtar_common/ishtar_menu.py b/ishtar_common/ishtar_menu.py
index a733ea612..5ed8cad37 100644
--- a/ishtar_common/ishtar_menu.py
+++ b/ishtar_common/ishtar_menu.py
@@ -30,7 +30,7 @@ MENU_SECTIONS = [
childs=[
SectionItem(
'account', _(u"Account"),
- childs=[MenuItem('account_management', _(u"Add/modify"),
+ childs=[MenuItem('account_management', _(u"Addition/modification"),
model=models.IshtarUser,
access_controls=['add_ishtaruser', ]),
MenuItem('account_deletion', _(u"Deletion"),
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 7101ed7de..dcd3043ca 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -38,8 +38,8 @@
var get_find_url = '{% url "get-find-shortcut" %}';
var activate_all_search_url = '{% url "activate-all-search" %}';
var activate_own_search_url = '{% url "activate-own-search" %}';
- var activate_all_search_msg = "{% trans 'Searches in the shortcut menu deals with all items.' %}";
- var activate_own_search_msg = "{% trans 'Searches in the shortcut menu deals with only your items.' %}";
+ var activate_all_search_msg = "{% trans 'Searches in the shortcut menu deal with all items.' %}";
+ var activate_own_search_msg = "{% trans 'Searches in the shortcut menu deal with only your items.' %}";
</script>
</head>
<body{% if current_theme%} id='{{current_theme}}'{%endif%}>
diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html
index 4ce316217..3c52063f4 100644
--- a/ishtar_common/templates/ishtar/blocks/window_nav.html
+++ b/ishtar_common/templates/ishtar/blocks/window_nav.html
@@ -14,7 +14,7 @@
<span class='history-nav'> </span>
{% endif %}
{% if next %}
- <a class='history-nav' title="{% trans 'Restore this version' %}" href="#" onclick='if(confirm("{%trans 'Are you sure to restore to this version? All changement made since this version will be lost.' %}")){load_url("{% url revert_url item.pk item.history_date|date:"c"%}");closeAllWindows();load_window("{% url show_url item.pk None %}");}'>
+ <a class='history-nav' title="{% trans 'Restore this version' %}" href="#" onclick='if(confirm("{%trans 'Are you sure to restore to this version? All changes made since this version will be lost.' %}")){load_url("{% url revert_url item.pk item.history_date|date:"c"%}");closeAllWindows();load_window("{% url show_url item.pk None %}");}'>
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-history fa-stack-1x fa-inverse"></i>
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html
index 6491b7a0f..c52d71536 100644
--- a/ishtar_common/templates/ishtar/wizard/default_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html
@@ -55,7 +55,7 @@ $(document).ready(function(){
$('form :input').change(function(){form_changed=true;});
$('.change_step').click(function(){
if(!form_changed ||
- confirm("{% trans "The form has changed if you don't validate it all your changes will be lost." %}")){
+ confirm("{% trans "The form has changed. If you don't validate it, all your changes will be lost." %}")){
return true;
}
return false;