diff options
| author | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-01-11 20:41:18 +0100 |
|---|---|---|
| committer | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-01-11 20:41:18 +0100 |
| commit | e50193c9c6c5d6d2ae50f0035ce6c9cf66d787fe (patch) | |
| tree | d0fbcd2db93906f1aec28dbe6d658a531025edc4 /ishtar_common | |
| parent | 98c1b479cba0348a8253325ad98db555419d2570 (diff) | |
| parent | b8d1d34feafb626bb4351ffbf7fd7d2d43724c2d (diff) | |
| download | Ishtar-e50193c9c6c5d6d2ae50f0035ce6c9cf66d787fe.tar.bz2 Ishtar-e50193c9c6c5d6d2ae50f0035ce6c9cf66d787fe.zip | |
Merge branch 'master' into master-trad
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/locale/django.pot | 9 | ||||
| -rw-r--r-- | ishtar_common/templatetags/window_field.py | 3 | ||||
| -rw-r--r-- | ishtar_common/widgets.py | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 270893b60..2a60902e5 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -5,6 +5,7 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata # Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata +# Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" @@ -1865,7 +1866,7 @@ msgid "where the magic happens." msgstr "" #: templates/window.html:40 templates/blocks/JQueryJqGrid.html:28 -#: templates/ishtar/manage_basket.html:9 +#: templates/ishtar/manage_basket.html:12 msgid "Add" msgstr "" @@ -1992,11 +1993,11 @@ msgstr "" msgid "Control file" msgstr "" -#: templates/ishtar/manage_basket.html:7 -msgid "Checking \"Select all\" only select the current page." +#: templates/ishtar/manage_basket.html:9 +msgid "Checking \"Select all\" only selects the current page." msgstr "" -#: templates/ishtar/manage_basket.html:10 +#: templates/ishtar/manage_basket.html:13 msgid "Basket content" msgstr "" diff --git a/ishtar_common/templatetags/window_field.py b/ishtar_common/templatetags/window_field.py index 2a58d844a..5180955d8 100644 --- a/ishtar_common/templatetags/window_field.py +++ b/ishtar_common/templatetags/window_field.py @@ -9,6 +9,9 @@ register = template.Library() def field(caption, data, pre_data='', post_data='', li=False): if data in (True, False): data = _(unicode(data)) + # fix bad conversion + if data == 'None': + data = "" return {'caption': caption, 'data': data, "pre_data": pre_data, 'post_data': post_data, 'li': li} diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py index ddbfa91bf..020eca5af 100644 --- a/ishtar_common/widgets.py +++ b/ishtar_common/widgets.py @@ -61,6 +61,7 @@ class Select2Multiple(forms.SelectMultiple): return super(Select2Multiple, self).render(name, value, attrs, choices) + class CheckboxSelectMultiple(CheckboxSelectMultipleBase): """ Fix initialization bug. |