diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ce0ae80a5..aef3aa988 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,12 @@ Release history ===================================== +0.1.3 +------------------------------------- +2014-10-13 + +- Django 1.7 support. +- Add HTML5 "placeholder" field attribute support. + 0.1.2 ------------------------------------- 2014-10-11 diff --git a/README.rst b/README.rst index b1b55c881..637fc0fc3 100644 --- a/README.rst +++ b/README.rst @@ -9,10 +9,10 @@ data. API allows you to build your own form elements and form handlers Prerequisites =============================================== -- Django 1.5.+, 1.6.+ -- Python 2.6.8+, 2.7.+, 3.3.+ +- Django 1.5, 1.6, 1.7 +- Python >= 2.6.8, 2.7.*, 3.3.* -Note, that Django 1.7 is not yet supported! +Note, that Django 1.7 is not yet proclaimed to be flawlessly supported! Key concepts =============================================== @@ -1110,6 +1110,7 @@ The following HTML5 fields are supported in appropriate bundled plugins: - email - number - url +- placeholder Available translations =============================================== diff --git a/docs/index.rst b/docs/index.rst index 19565eb30..d412a0f82 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -9,10 +9,10 @@ data. API allows you to build your own form elements and form handlers Prerequisites =============================================== -- Django 1.5.+, 1.6.+ -- Python 2.6.8+, 2.7.+, 3.3.+ +- Django 1.5, 1.6, 1.7 +- Python >= 2.6.8, 2.7.*, 3.3.* -Note, that Django 1.7 is not yet supported! +Note, that Django 1.7 is not yet proclaimed to be flawlessly supported! Key concepts =============================================== @@ -1110,6 +1110,7 @@ The following HTML5 fields are supported in appropriate bundled plugins: - email - number - url +- placeholder Available translations =============================================== diff --git a/examples/requirements.txt b/examples/requirements.txt index 04f68bf92..c3404072e 100644 --- a/examples/requirements.txt +++ b/examples/requirements.txt @@ -1,5 +1,5 @@ -Django>=1.5,<1.7 -#Django>=1.5,<1.8 +#Django>=1.5,<1.7 +Django>=1.5,<1.8 Jinja2 MarkupSafe South diff --git a/examples/simple/locale/hy/LC_MESSAGES/django.po b/examples/simple/locale/hy/LC_MESSAGES/django.po index 12dacf98c..8c19418df 100644 --- a/examples/simple/locale/hy/LC_MESSAGES/django.po +++ b/examples/simple/locale/hy/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-11 02:24+0200\n" +"POT-Creation-Date: 2014-10-14 00:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/examples/simple/locale/nl/LC_MESSAGES/django.po b/examples/simple/locale/nl/LC_MESSAGES/django.po index ee288dc68..bc2713475 100644 --- a/examples/simple/locale/nl/LC_MESSAGES/django.po +++ b/examples/simple/locale/nl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-11 02:24+0200\n" +"POT-Creation-Date: 2014-10-14 00:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/examples/simple/locale/ru/LC_MESSAGES/django.po b/examples/simple/locale/ru/LC_MESSAGES/django.po index bf3c97874..57d2cabc7 100644 --- a/examples/simple/locale/ru/LC_MESSAGES/django.po +++ b/examples/simple/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-11 02:24+0200\n" +"POT-Creation-Date: 2014-10-14 00:19+0200\n" "PO-Revision-Date: 2014-10-11 03:25+0100\n" "Last-Translator: Artur Barseghyan \n" "Language-Team: LANGUAGE \n" @@ -15,7 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: settings.py:43 msgid "English" @@ -37,48 +38,39 @@ msgstr "" msgid "© django-fobi example site 2014" msgstr "© пример django-fobi сайта 2014" -#: admin_tools_dashboard/__init__.py:28 -#: admin_tools_dashboard/menu.py:27 +#: admin_tools_dashboard/__init__.py:28 admin_tools_dashboard/menu.py:27 msgid "Foo" msgstr "" -#: admin_tools_dashboard/__init__.py:36 -#: admin_tools_dashboard/menu.py:33 +#: admin_tools_dashboard/__init__.py:36 admin_tools_dashboard/menu.py:33 msgid "Fobi" msgstr "" -#: admin_tools_dashboard/__init__.py:39 -#: admin_tools_dashboard/menu.py:35 +#: admin_tools_dashboard/__init__.py:39 admin_tools_dashboard/menu.py:35 msgid "Plugins" msgstr "" -#: admin_tools_dashboard/__init__.py:40 -#: admin_tools_dashboard/menu.py:36 +#: admin_tools_dashboard/__init__.py:40 admin_tools_dashboard/menu.py:36 msgid "Forms" msgstr "" -#: admin_tools_dashboard/__init__.py:41 -#: admin_tools_dashboard/menu.py:37 +#: admin_tools_dashboard/__init__.py:41 admin_tools_dashboard/menu.py:37 msgid "Data" msgstr "" -#: admin_tools_dashboard/__init__.py:47 -#: admin_tools_dashboard/menu.py:43 +#: admin_tools_dashboard/__init__.py:47 admin_tools_dashboard/menu.py:43 msgid "Pages" msgstr "" -#: admin_tools_dashboard/__init__.py:55 -#: admin_tools_dashboard/menu.py:49 +#: admin_tools_dashboard/__init__.py:55 admin_tools_dashboard/menu.py:49 msgid "Administration" msgstr "" -#: admin_tools_dashboard/__init__.py:62 -#: admin_tools_dashboard/__init__.py:76 +#: admin_tools_dashboard/__init__.py:62 admin_tools_dashboard/__init__.py:76 msgid "Recent Actions" msgstr "" -#: admin_tools_dashboard/menu.py:23 -#: templates/home/base.html:38 +#: admin_tools_dashboard/menu.py:23 templates/home/base.html:38 #: templates/home/foundation5.html:32 msgid "Dashboard" msgstr "" @@ -115,34 +107,37 @@ msgstr "" msgid "Home" msgstr "" -#: templates/home/base.html:13 -#: templates/page/base.html:13 +#: templates/home/base.html:13 templates/page/base.html:13 msgid "django-fobi example site" msgstr "" -#: templates/home/base.html:22 -#: templates/home/foundation5.html:16 +#: templates/home/base.html:22 templates/home/foundation5.html:16 msgid "" "\n" "

\n" -" Welcome to `django-fobi` (later on named just `Fobi`) - a customisable, modular, developer-friendly form\n" -" builder application for Django. With `Fobi` you can build Django forms using a user-friendly GUI,\n" -" save or mail posted form data. Developer-friendly API allows you to build your own form elements\n" +" Welcome to `django-fobi` (later on named just `Fobi`) - a customisable, " +"modular, developer-friendly form\n" +" builder application for Django. With `Fobi` you can build Django forms " +"using a user-friendly GUI,\n" +" save or mail posted form data. Developer-friendly API allows you to " +"build your own form elements\n" " and form handlers (mechanisms for handling the submitted form data).\n" "

\n" " " msgstr "" "\n" "

\n" -" Добро пожаловать в `django-fobi` (далее просто `Fobi`) настраиваемый, модульный, удобный разработчику пакет \n" -" для создания форм в Django. С помощью `Fobi` вы можете создать форму для Django используя удобный графический интерфейс,\n" -" сохранить или отослать отправленные данные по эл. почте. Дружелюбный разработчику API позволит вам создать ваши собственные элементы- и \n" +" Добро пожаловать в `django-fobi` (далее просто `Fobi`) настраиваемый, " +"модульный, удобный разработчику пакет \n" +" для создания форм в Django. С помощью `Fobi` вы можете создать форму для " +"Django используя удобный графический интерфейс,\n" +" сохранить или отослать отправленные данные по эл. почте. Дружелюбный " +"разработчику API позволит вам создать ваши собственные элементы- и \n" " обработчики- форм (механизм для обработки отправленых данных).\n" "

\n" " " -#: templates/home/base.html:30 -#: templates/home/foundation5.html:24 +#: templates/home/base.html:30 templates/home/foundation5.html:24 msgid "Learn more" msgstr "Узнать подробнее" @@ -150,19 +145,22 @@ msgstr "Узнать подробнее" #, python-format msgid "" "\n" -"

The `Fobi` dashboard, where you can see all the forms you have created, edit them (add/remove elements,\n" +"

The `Fobi` dashboard, where you can see all the forms you have " +"created, edit them (add/remove elements,\n" " form handlers), create new forms as well as remove existing ones.

\n" -"

Go to dashboard »

\n" +"

Go to dashboard »

\n" " " msgstr "" "\n" -"

Приборная панель `Fobi`, в которой вы можете просмотреть ранее созданные формы изменить их (добавить/удалить элементы,\n" +"

Приборная панель `Fobi`, в которой вы можете просмотреть ранее " +"созданные формы изменить их (добавить/удалить элементы,\n" " обработчики), создать новые формы или удалить существующие.

\n" -"

Go to dashboard »

\n" +"

Go to dashboard »

\n" " " -#: templates/home/base.html:47 -#: templates/home/foundation5.html:41 +#: templates/home/base.html:47 templates/home/foundation5.html:41 msgid "Create a form" msgstr "Создать форму" @@ -170,17 +168,20 @@ msgstr "Создать форму" #, python-format msgid "" "\n" -"

Create your first form using awesome user-friendly GUI. Choose what to do with the posted data.

\n" -"

Create form »

\n" +"

Create your first form using awesome user-friendly GUI. Choose what " +"to do with the posted data.

\n" +"

Create form »

\n" " " msgstr "" "\n" -"

Создайте свою первую форму, используя удобный графический интерфейс. Выберите что делать с отправленными данными.

\n" -"

Создать форму »

\n" +"

Создайте свою первую форму, используя удобный графический " +"интерфейс. Выберите что делать с отправленными данными.

\n" +"

Создать форму »

\n" " " -#: templates/home/base.html:55 -#: templates/home/foundation5.html:49 +#: templates/home/base.html:55 templates/home/foundation5.html:49 msgid "See the admin part" msgstr "Перейти к административной части" @@ -188,52 +189,67 @@ msgstr "Перейти к административной части" #, python-format msgid "" "\n" -"

See the Django-admin for saved data, as well as choose who to grant with permissions of using\n" +"

See the Django-admin for saved data, as well as choose who to grant " +"with permissions of using\n" " one or another `Fobi` plugin (form element or form handler).

\n" -"

Go to admin »

\n" +"

Go to admin »

\n" " " msgstr "" "\n" -"

Используйте Django-admin для просмотра сохраненных данных, а также для распределения доступа \n" -" к тому или иному `Fobi` плагину (элемента- или обработчика- формы).

\n" -"

Go to admin »

\n" +"

Используйте Django-admin для просмотра сохраненных данных, а также " +"для распределения доступа \n" +" к тому или иному `Fobi` плагину (элемента- или обработчика- формы).\n" +"

Go to admin »

\n" " " #: templates/home/foundation5.html:34 #, python-format msgid "" "\n" -"

The `Fobi` dashboard, where you can see all the forms you have created, edit them (add/remove elements,\n" +"

The `Fobi` dashboard, where you can see all the forms you have " +"created, edit them (add/remove elements,\n" " form handlers), create new forms as well as remove existing ones.

\n" -"

Go to dashboard »

\n" +"

Go to dashboard »

\n" " " msgstr "" "\n" -"

Приборная панель `Fobi`, в которой вы можете просмотреть ранее созданные формы изменить их (добавить/удалить элементы,\n" +"

Приборная панель `Fobi`, в которой вы можете просмотреть ранее " +"созданные формы изменить их (добавить/удалить элементы,\n" " обработчики), создать новые формы или удалить существующие.

\n" -"

Go to dashboard »

\n" +"

Go to dashboard »

\n" " " #: templates/home/foundation5.html:43 #, python-format msgid "" "\n" -"

Create your first form using awesome user-friendly GUI. Choose what to do with the posted data.

\n" -"

Create form »

\n" +"

Create your first form using awesome user-friendly GUI. Choose what " +"to do with the posted data.

\n" +"

Create form »

\n" " " msgstr "" "\n" -"

Создайте свою первую форму, используя удобный графический интерфейс. Выберите что делать с отправленными данными.

\n" -"

Создать форму »

\n" +"

Создайте свою первую форму, используя удобный графический " +"интерфейс. Выберите что делать с отправленными данными.

\n" +"

Создать форму »

\n" " " #: templates/home/foundation5.html:51 #, python-format msgid "" "\n" -"

See the Django-admin for saved data, as well as choose who to grant with permissions of using\n" +"

See the Django-admin for saved data, as well as choose who to grant " +"with permissions of using\n" " one or another `Fobi` plugin (form element or form handler).

\n" -"

Go to admin »

\n" +"

Go to admin »

\n" " " msgstr "" @@ -254,19 +270,23 @@ msgstr "" msgid "" "\n" " Thanks %(account)s, activation complete!\n" -" You may now login using the username and password you set at registration.\n" +" You may now login using the username " +"and password you set at registration.\n" " " msgstr "" #: templates/registration/activate.html:22 -msgid "Oops – it seems that your activation key is invalid. Please check the url again." +msgid "" +"Oops – it seems that your activation key is invalid. Please check the " +"url again." msgstr "" #: templates/registration/activation_complete.html:16 #, python-format msgid "" "\n" -" Thanks, activation complete! You may now login using the username and password you set at registration.\n" +" Thanks, activation complete! You may now login using the username and password you set at registration.\n" " " msgstr "" @@ -278,13 +298,15 @@ msgid "" "

\n" "You (or someone pretending to be you) have asked to register an account at\n" "%(sitename)s.
\n" -"If this wasn't you, please ignore this email and your address will be removed\n" +"If this wasn't you, please ignore this email and your address will be " +"removed\n" "from our records.\n" "

\n" "

\n" "To activate this account, please click the following link within the next \n" "%(expiration_days)s days:
\n" -"http://%(sitedomain)s%(activation_key_url)s\n" +"http://%(sitedomain)s" +"%(activation_key_url)s\n" "

\n" "

\n" "Sincerely,
\n" @@ -331,8 +353,7 @@ msgid "" " Need an account?" msgstr "" -#: templates/registration/logout.html:5 -#: templates/registration/logout.html:12 +#: templates/registration/logout.html:5 templates/registration/logout.html:12 msgid "Logged out" msgstr "" @@ -408,10 +429,12 @@ msgstr "" #, python-format msgid "" "You are receiving this email because you (or someone pretending to be you)\n" -"requested that your password be reset on the %(domain)s site. If you do not \n" +"requested that your password be reset on the %(domain)s site. If you do " +"not \n" "wish to reset your password, please ignore this message.\n" "\n" -"To reset your password, please click the following link, or copy and paste it\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" "into your web browser:" msgstr "" @@ -434,7 +457,8 @@ msgstr "" #: templates/registration/password_reset_form_ajax.html:10 msgid "" "\n" -" Forgot your password? Enter your email in the form below and we'll send you\n" +" Forgot your password? Enter your email in the form below and we'll " +"send you\n" " instructions for creating a new one.\n" " " msgstr "" @@ -460,4 +484,3 @@ msgstr "" #: templates/registration/registration_form_ajax.html:12 msgid "Send activation email" msgstr "" - diff --git a/examples/simple/settings_django17.py b/examples/simple/settings_django17.py index 964c58b45..815988a8d 100644 --- a/examples/simple/settings_django17.py +++ b/examples/simple/settings_django17.py @@ -3,6 +3,6 @@ INSTALLED_APPS = list(INSTALLED_APPS) try: - INSTALLED_APPS.remove('tinymce') + INSTALLED_APPS.remove('south') except Exception as e: pass diff --git a/install_django17.sh b/install_django17.sh new file mode 100755 index 000000000..c115bffcd --- /dev/null +++ b/install_django17.sh @@ -0,0 +1,9 @@ +#pip install -r examples/requirements.txt --allow-all-external --allow-unverified django-admin-tools +pip install -r examples/requirements.txt +python setup.py install +mkdir -p examples/logs examples/db examples/media examples/media/static examples/media/fobi_plugins/content_image +mkdir -p examples/media/fobi_plugins/file +python examples/simple/manage.py collectstatic --noinput --settings=settings_django17 --traceback -v 3 +python examples/simple/manage.py syncdb --noinput --settings=settings_django17 --traceback -v 3 +python examples/simple/manage.py migrate --noinput --settings=settings_django17 --traceback -v 3 +python examples/simple/manage.py fobi_create_test_data --settings=settings_django17 --traceback -v 3 diff --git a/reinstall_django17.sh b/reinstall_django17.sh new file mode 100755 index 000000000..175cb67e2 --- /dev/null +++ b/reinstall_django17.sh @@ -0,0 +1,3 @@ +reset +./uninstall.sh +./install_django17.sh \ No newline at end of file diff --git a/setup.py b/setup.py index 87295c68e..552772298 100644 --- a/setup.py +++ b/setup.py @@ -56,13 +56,13 @@ for locale_dir in locale_dirs: locale_files += [os.path.join(locale_dir, f) for f in os.listdir(locale_dir)] -version = '0.1.2' +version = '0.1.3' install_requires = [ 'Pillow>=2.0.0', 'requests>=1.0.0', 'django-autoslug>=1.3.0', - #'django-tinymce>=1.5', + 'django-tinymce>=1.5.3', 'ordereddict>=1.1', 'radar>=0.3', 'six>=1.4.1', diff --git a/src/fobi/__init__.py b/src/fobi/__init__.py index 92abda9d1..0e20c737e 100644 --- a/src/fobi/__init__.py +++ b/src/fobi/__init__.py @@ -1,6 +1,6 @@ __title__ = 'django-fobi' -__version__ = '0.1.2' -__build__ = 0x000003 +__version__ = '0.1.3' +__build__ = 0x000004 __author__ = 'Artur Barseghyan ' __copyright__ = 'Copyright (c) 2014 Artur Barseghyan' __license__ = 'GPL 2.0/LGPL 2.1' diff --git a/src/fobi/admin.py b/src/fobi/admin.py index 1bc9dbf81..f28e1dfcf 100644 --- a/src/fobi/admin.py +++ b/src/fobi/admin.py @@ -202,7 +202,7 @@ def queryset(self, request): queryset = super(FormElementEntryAdmin, self).queryset(request) queryset = queryset.select_related('form_entry', 'form_fieldset_entry') return queryset - + get_queryset = queryset #admin.site.register(FormElementEntry, FormElementEntryAdmin) @@ -235,7 +235,7 @@ def queryset(self, request): queryset = super(FormHandlerEntryAdmin, self).queryset(request) queryset = queryset.select_related('form_entry',) return queryset - + get_queryset = queryset #admin.site.register(FormHandlerEntry, FormHandlerEntryAdmin) @@ -277,6 +277,7 @@ def queryset(self, request): queryset = super(BasePluginModelAdmin, self).queryset(request) queryset = queryset.prefetch_related('users', 'groups') return queryset + get_queryset = queryset def _get_bulk_change_form_class(self): raise NotImplemented("You should implement `get_bulk_change_form_class`") diff --git a/src/fobi/contrib/plugins/form_elements/content/text/apps.py b/src/fobi/contrib/plugins/form_elements/content/text/apps.py index 0670b08a5..bbf39a939 100644 --- a/src/fobi/contrib/plugins/form_elements/content/text/apps.py +++ b/src/fobi/contrib/plugins/form_elements/content/text/apps.py @@ -1,5 +1,15 @@ -from django.apps import AppConfig +__title__ = 'fobi.contrib.plugins.form_elements.content.text.apps' +__author__ = 'Artur Barseghyan ' +__copyright__ = 'Copyright (c) 2014 Artur Barseghyan' +__license__ = 'GPL 2.0/LGPL 2.1' +__all__ = ('Config',) -class Config(AppConfig): - label = 'fobi.contrib.plugins.form_elements.content.text' - name = 'fobi.contrib.plugins.form_elements.content.text' +try: + from django.apps import AppConfig + + class Config(AppConfig): + label = 'fobi.contrib.plugins.form_elements.content.text' + name = 'fobi.contrib.plugins.form_elements.content.text' + +except ImportError: + pass diff --git a/src/fobi/contrib/plugins/form_elements/fields/date/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/date/fobi_form_elements.py index a113991d9..ca2d4bbeb 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/date/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/date/fobi_form_elements.py @@ -5,7 +5,7 @@ __all__ = ('DateInputPlugin',) from django.forms.fields import DateField -from django.forms.widgets import DateInput, TextInput +from django.forms.widgets import DateInput#, TextInput from django.utils.translation import ugettext_lazy as _ from fobi.base import FormFieldPlugin, form_element_plugin_registry, get_theme @@ -27,15 +27,18 @@ def get_form_field_instances(self): """ Get form field instances. """ + widget_attrs = { + 'class': theme.form_element_html_class, + 'type': 'date', + } + kwargs = { 'label': self.data.label, 'help_text': self.data.help_text, 'initial': self.data.initial, #'input_formats': self.data.input_formats, 'required': self.data.required, - 'widget': DateInput( - attrs={'class': theme.form_element_html_class, 'type': 'date'} - ), + 'widget': DateInput(attrs=widget_attrs), } #if self.data.input_formats: # kwargs['input_formats'] = self.data.input_formats diff --git a/src/fobi/contrib/plugins/form_elements/fields/date/forms.py b/src/fobi/contrib/plugins/form_elements/fields/date/forms.py index 8451bf224..93e3d6afe 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/date/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/date/forms.py @@ -21,7 +21,7 @@ class DateInputForm(forms.Form, BaseFormFieldPluginForm): ("help_text", ""), ("initial", ""), ("input_formats", ""), - ("required", False) + ("required", False), ] label = forms.CharField( diff --git a/src/fobi/contrib/plugins/form_elements/fields/datetime/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/datetime/fobi_form_elements.py index bd6aaa1ee..10b1135b3 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/datetime/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/datetime/fobi_form_elements.py @@ -28,15 +28,18 @@ def get_form_field_instances(self): """ Get form field instances. """ + widget_attrs = { + 'class': theme.form_element_html_class, + 'type': 'date', + } + kwargs = { 'label': self.data.label, 'help_text': self.data.help_text, 'initial': self.data.initial, #'input_formats': self.data.input_formats, 'required': self.data.required, - 'widget': DateTimeInput( - attrs={'class': theme.form_element_html_class, 'type': 'datetime'} - ), + 'widget': DateTimeInput(attrs=widget_attrs), } #if self.data.input_formats: # kwargs['input_formats'] = self.data.input_formats diff --git a/src/fobi/contrib/plugins/form_elements/fields/email/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/email/fobi_form_elements.py index 472d6717f..813a829f2 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/email/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/email/fobi_form_elements.py @@ -29,14 +29,18 @@ def get_form_field_instances(self): """ Get form field instances. """ + widget_attrs = { + 'class': theme.form_element_html_class, + 'type': 'email', + 'placeholder': self.data.placeholder, + } + kwargs = { 'label': self.data.label, 'help_text': self.data.help_text, 'initial': self.data.initial, 'required': self.data.required, - 'widget': TextInput( - attrs={'class': theme.form_element_html_class, 'type': 'email'} - ), + 'widget': TextInput(attrs=widget_attrs), } if self.data.max_length: kwargs['max_length'] = self.data.max_length diff --git a/src/fobi/contrib/plugins/form_elements/fields/email/forms.py b/src/fobi/contrib/plugins/form_elements/fields/email/forms.py index 2c79e10a9..a5b781a62 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/email/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/email/forms.py @@ -24,7 +24,8 @@ class EmailForm(forms.Form, BaseFormFieldPluginForm): ("help_text", ""), ("initial", ""), ("max_length", "255"), - ("required", False) + ("required", False), + ("placeholder", ""), ] label = forms.CharField( @@ -58,3 +59,8 @@ class EmailForm(forms.Form, BaseFormFieldPluginForm): required = False, widget = forms.widgets.CheckboxInput(attrs={'class': theme.form_element_checkbox_html_class}) ) + placeholder = forms.CharField( + label = _("Placeholder"), + required = False, + widget = forms.widgets.TextInput(attrs={'class': theme.form_element_html_class}) + ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/integer/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/integer/fobi_form_elements.py index f44d60ff0..f70e4c0a7 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/integer/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/integer/fobi_form_elements.py @@ -29,7 +29,8 @@ def get_form_field_instances(self): """ widget_attrs = { 'class': theme.form_element_html_class, - 'type': 'number' + 'type': 'number', + 'placeholder': self.data.placeholder, } kwargs = { 'label': self.data.label, diff --git a/src/fobi/contrib/plugins/form_elements/fields/integer/forms.py b/src/fobi/contrib/plugins/form_elements/fields/integer/forms.py index cb451e696..d07ea7cb6 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/integer/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/integer/forms.py @@ -22,7 +22,8 @@ class IntegerInputForm(forms.Form, BaseFormFieldPluginForm): ("initial", ""), ("min_value", None), ("max_value", None), - ("required", False) + ("required", False), + ("placeholder", ""), ] label = forms.CharField( @@ -60,4 +61,8 @@ class IntegerInputForm(forms.Form, BaseFormFieldPluginForm): required = False, widget = forms.widgets.CheckboxInput(attrs={'class': theme.form_element_html_class}) ) - + placeholder = forms.CharField( + label = _("Placeholder"), + required = False, + widget = forms.widgets.TextInput(attrs={'class': theme.form_element_html_class}) + ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/password/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/password/fobi_form_elements.py index 1335cbc25..38071076d 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/password/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/password/fobi_form_elements.py @@ -28,12 +28,17 @@ def get_form_field_instances(self): """ Get form field instances. """ + widget_attrs = { + 'class': theme.form_element_html_class, + 'placeholder': self.data.placeholder, + } + kwargs = { 'label': self.data.label, 'help_text': self.data.help_text, 'initial': self.data.initial, 'required': self.data.required, - 'widget': PasswordInput(attrs={'class': theme.form_element_html_class}), + 'widget': PasswordInput(attrs=widget_attrs), } if self.data.max_length: kwargs['max_length'] = self.data.max_length diff --git a/src/fobi/contrib/plugins/form_elements/fields/password/forms.py b/src/fobi/contrib/plugins/form_elements/fields/password/forms.py index 8329faa9d..9e5bb4b03 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/password/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/password/forms.py @@ -22,7 +22,8 @@ class PasswordInputForm(forms.Form, BaseFormFieldPluginForm): ("help_text", ""), ("initial", ""), ("max_length", "255"), - ("required", False) + ("required", False), + ("placeholder", ""), ] label = forms.CharField( @@ -56,3 +57,8 @@ class PasswordInputForm(forms.Form, BaseFormFieldPluginForm): required = False, widget = forms.widgets.CheckboxInput(attrs={'class': theme.form_element_html_class}) ) + placeholder = forms.CharField( + label = _("Placeholder"), + required = False, + widget = forms.widgets.TextInput(attrs={'class': theme.form_element_html_class}) + ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/forms.py b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/forms.py index 3b430e2fa..3c31f527d 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/forms.py @@ -9,7 +9,8 @@ from fobi.base import BaseFormFieldPluginForm, get_theme from fobi.helpers import get_registered_models -from fobi.contrib.plugins.form_elements.fields.select_model_object.settings import IGNORED_MODELS +from fobi.contrib.plugins.form_elements.fields.select_model_object.settings \ + import IGNORED_MODELS theme = get_theme(request=None, as_instance=True) @@ -38,7 +39,7 @@ class SelectModelObjectInputForm(forms.Form, BaseFormFieldPluginForm): ) model = forms.ChoiceField( label = _("Model"), - choices = get_registered_models(ignore=IGNORED_MODELS), + choices = [], required = False, widget = forms.widgets.Select(attrs={'class': theme.form_element_html_class}) ) @@ -57,3 +58,12 @@ class SelectModelObjectInputForm(forms.Form, BaseFormFieldPluginForm): required = False, widget = forms.widgets.CheckboxInput(attrs={'class': theme.form_element_html_class}) ) + + def __init__(self, *args, **kwargs): + """ + In order to avoid static calls to `get_registered_models`. + """ + super(SelectModelObjectInputForm, self).__init__(*args, **kwargs) + self.fields['model'].choices = get_registered_models( + ignore = IGNORED_MODELS + ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py index 224e1f85e..03562f9ec 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py @@ -9,7 +9,8 @@ from fobi.base import BaseFormFieldPluginForm, get_theme from fobi.helpers import get_registered_models -from fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects.settings import IGNORED_MODELS +from fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects.settings \ + import IGNORED_MODELS theme = get_theme(request=None, as_instance=True) @@ -38,7 +39,7 @@ class SelectMultipleModelObjectsInputForm(forms.Form, BaseFormFieldPluginForm): ) model = forms.ChoiceField( label = _("Model"), - choices = get_registered_models(ignore=IGNORED_MODELS), + choices = [], required = False, widget = forms.widgets.Select(attrs={'class': theme.form_element_html_class}) ) @@ -57,3 +58,12 @@ class SelectMultipleModelObjectsInputForm(forms.Form, BaseFormFieldPluginForm): required = False, widget = forms.widgets.CheckboxInput(attrs={'class': theme.form_element_html_class}) ) + + def __init__(self, *args, **kwargs): + """ + In order to avoid static calls to `get_registered_models`. + """ + super(SelectMultipleModelObjectsInputForm, self).__init__(*args, **kwargs) + self.fields['model'].choices = get_registered_models( + ignore = IGNORED_MODELS + ) \ No newline at end of file diff --git a/src/fobi/contrib/plugins/form_elements/fields/text/apps.py b/src/fobi/contrib/plugins/form_elements/fields/text/apps.py index 8b96eb78e..94ed3fd10 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/text/apps.py +++ b/src/fobi/contrib/plugins/form_elements/fields/text/apps.py @@ -1,5 +1,15 @@ -from django.apps import AppConfig +__title__ = 'fobi.contrib.plugins.form_elements.fields.text.apps' +__author__ = 'Artur Barseghyan ' +__copyright__ = 'Copyright (c) 2014 Artur Barseghyan' +__license__ = 'GPL 2.0/LGPL 2.1' +__all__ = ('Config',) -class Config(AppConfig): - label = 'fobi.contrib.plugins.form_elements.fields.text' - name = 'fobi.contrib.plugins.form_elements.fields.text' +try: + from django.apps import AppConfig + + class Config(AppConfig): + label = 'fobi.contrib.plugins.form_elements.fields.text' + name = 'fobi.contrib.plugins.form_elements.fields.text' + +except ImportError: + pass diff --git a/src/fobi/contrib/plugins/form_elements/fields/text/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/text/fobi_form_elements.py index 828e128dc..4b1564ebc 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/text/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/text/fobi_form_elements.py @@ -27,12 +27,17 @@ def get_form_field_instances(self): """ Get form field instances. """ + widget_attrs = { + 'class': theme.form_element_html_class, + 'placeholder': self.data.placeholder, + } + kwargs = { 'label': self.data.label, 'help_text': self.data.help_text, 'initial': self.data.initial, 'required': self.data.required, - 'widget': TextInput(attrs={'class': theme.form_element_html_class}), + 'widget': TextInput(attrs=widget_attrs), } if self.data.max_length: kwargs['max_length'] = self.data.max_length diff --git a/src/fobi/contrib/plugins/form_elements/fields/text/forms.py b/src/fobi/contrib/plugins/form_elements/fields/text/forms.py index 4202794c1..82afea34a 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/text/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/text/forms.py @@ -22,7 +22,8 @@ class TextInputForm(forms.Form, BaseFormFieldPluginForm): ("help_text", ""), ("initial", ""), ("max_length", "255"), - ("required", False) + ("required", False), + ("placeholder", ""), ] label = forms.CharField( @@ -56,3 +57,8 @@ class TextInputForm(forms.Form, BaseFormFieldPluginForm): required = False, widget = forms.widgets.CheckboxInput(attrs={'class': theme.form_element_html_class}) ) + placeholder = forms.CharField( + label = _("Placeholder"), + required = False, + widget = forms.widgets.TextInput(attrs={'class': theme.form_element_html_class}) + ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/textarea/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/textarea/fobi_form_elements.py index b8480c71d..e88081e5f 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/textarea/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/textarea/fobi_form_elements.py @@ -27,12 +27,16 @@ def get_form_field_instances(self): """ Get form field instances. """ + widget_attrs = { + 'class': theme.form_element_html_class, + 'placeholder': self.data.placeholder, + } kwargs = { 'label': self.data.label, 'help_text': self.data.help_text, 'initial': self.data.initial, 'required': self.data.required, - 'widget': Textarea(attrs={'class': theme.form_element_html_class}) + 'widget': Textarea(attrs=widget_attrs) } return [(self.data.name, CharField, kwargs)] diff --git a/src/fobi/contrib/plugins/form_elements/fields/textarea/forms.py b/src/fobi/contrib/plugins/form_elements/fields/textarea/forms.py index f1fbf536d..2bd54068f 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/textarea/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/textarea/forms.py @@ -20,7 +20,8 @@ class TextareaForm(forms.Form, BaseFormFieldPluginForm): ("name", ""), ("help_text", ""), ("initial", ""), - ("required", False) + ("required", False), + ("placeholder", ""), ] label = forms.CharField( @@ -48,3 +49,8 @@ class TextareaForm(forms.Form, BaseFormFieldPluginForm): required = False, widget = forms.widgets.CheckboxInput(attrs={'class': theme.form_element_html_class}) ) + placeholder = forms.CharField( + label = _("Placeholder"), + required = False, + widget = forms.widgets.TextInput(attrs={'class': theme.form_element_html_class}) + ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/url/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/url/fobi_form_elements.py index da2057e25..6d214c524 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/url/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/url/fobi_form_elements.py @@ -34,14 +34,18 @@ def get_form_field_instances(self): """ Get form field instances. """ + widget_attrs = { + 'class': theme.form_element_html_class, + 'type': 'url', + 'placeholder': self.data.placeholder, + } + kwargs = { 'label': self.data.label, 'help_text': self.data.help_text, 'initial': self.data.initial, 'required': self.data.required, - 'widget': URLInput( - attrs={'class': theme.form_element_html_class, 'type': 'url'} - ), + 'widget': URLInput(attrs=widget_attrs), } if self.data.max_length: kwargs['max_length'] = self.data.max_length diff --git a/src/fobi/contrib/plugins/form_elements/fields/url/forms.py b/src/fobi/contrib/plugins/form_elements/fields/url/forms.py index 4bdf0a773..53cf57c78 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/url/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/url/forms.py @@ -22,7 +22,8 @@ class URLInputForm(forms.Form, BaseFormFieldPluginForm): ("help_text", ""), ("initial", ""), ("max_length", "255"), - ("required", False) + ("required", False), + ("placeholder", ""), ] label = forms.CharField( @@ -56,3 +57,8 @@ class URLInputForm(forms.Form, BaseFormFieldPluginForm): required = False, widget = forms.widgets.CheckboxInput(attrs={'class': theme.form_element_html_class}) ) + placeholder = forms.CharField( + label = _("Placeholder"), + required = False, + widget = forms.widgets.TextInput(attrs={'class': theme.form_element_html_class}) + ) diff --git a/src/fobi/contrib/plugins/form_handlers/db_store/admin.py b/src/fobi/contrib/plugins/form_handlers/db_store/admin.py index 573d7023c..5311b0e9e 100644 --- a/src/fobi/contrib/plugins/form_handlers/db_store/admin.py +++ b/src/fobi/contrib/plugins/form_handlers/db_store/admin.py @@ -44,6 +44,7 @@ def queryset(self, request): queryset = super(SavedFormDataEntryAdmin, self).queryset(request) queryset = queryset.select_related('form_entry', 'user',) return queryset + get_queryset = queryset admin.site.register(SavedFormDataEntry, SavedFormDataEntryAdmin) diff --git a/src/fobi/locale/hy/LC_MESSAGES/django.po b/src/fobi/locale/hy/LC_MESSAGES/django.po index 7059fa5fc..660ed92e0 100644 --- a/src/fobi/locale/hy/LC_MESSAGES/django.po +++ b/src/fobi/locale/hy/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-11 02:24+0200\n" +"POT-Creation-Date: 2014-10-14 00:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -53,11 +53,11 @@ msgstr "" msgid "Form handler entry" msgstr "" -#: admin.py:335 +#: admin.py:336 msgid "{0} plugins were changed successfully." msgstr "" -#: admin.py:341 +#: admin.py:342 msgid "POST required when changing in bulk!" msgstr "" @@ -69,19 +69,19 @@ msgstr "" #: contrib/plugins/form_elements/fields/boolean/forms.py:32 #: contrib/plugins/form_elements/fields/date/forms.py:33 #: contrib/plugins/form_elements/fields/datetime/forms.py:33 -#: contrib/plugins/form_elements/fields/email/forms.py:36 +#: contrib/plugins/form_elements/fields/email/forms.py:37 #: contrib/plugins/form_elements/fields/file/forms.py:34 #: contrib/plugins/form_elements/fields/hidden/forms.py:33 -#: contrib/plugins/form_elements/fields/integer/forms.py:34 -#: contrib/plugins/form_elements/fields/password/forms.py:34 +#: contrib/plugins/form_elements/fields/integer/forms.py:35 +#: contrib/plugins/form_elements/fields/password/forms.py:35 #: contrib/plugins/form_elements/fields/radio/forms.py:33 #: contrib/plugins/form_elements/fields/select/forms.py:33 -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:35 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:36 #: contrib/plugins/form_elements/fields/select_multiple/forms.py:33 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:35 -#: contrib/plugins/form_elements/fields/text/forms.py:34 -#: contrib/plugins/form_elements/fields/textarea/forms.py:32 -#: contrib/plugins/form_elements/fields/url/forms.py:34 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:36 +#: contrib/plugins/form_elements/fields/text/forms.py:35 +#: contrib/plugins/form_elements/fields/textarea/forms.py:33 +#: contrib/plugins/form_elements/fields/url/forms.py:35 #: contrib/themes/simple/templates/simple/dashboard.html:42 msgid "Name" msgstr "" @@ -89,56 +89,56 @@ msgstr "" #: base.py:477 contrib/plugins/form_elements/fields/boolean/forms.py:27 #: contrib/plugins/form_elements/fields/date/forms.py:28 #: contrib/plugins/form_elements/fields/datetime/forms.py:28 -#: contrib/plugins/form_elements/fields/email/forms.py:31 +#: contrib/plugins/form_elements/fields/email/forms.py:32 #: contrib/plugins/form_elements/fields/file/forms.py:29 #: contrib/plugins/form_elements/fields/hidden/forms.py:28 -#: contrib/plugins/form_elements/fields/integer/forms.py:29 -#: contrib/plugins/form_elements/fields/password/forms.py:29 +#: contrib/plugins/form_elements/fields/integer/forms.py:30 +#: contrib/plugins/form_elements/fields/password/forms.py:30 #: contrib/plugins/form_elements/fields/radio/forms.py:28 #: contrib/plugins/form_elements/fields/select/forms.py:28 -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:30 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:31 #: contrib/plugins/form_elements/fields/select_multiple/forms.py:28 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:30 -#: contrib/plugins/form_elements/fields/text/forms.py:29 -#: contrib/plugins/form_elements/fields/textarea/forms.py:27 -#: contrib/plugins/form_elements/fields/url/forms.py:29 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:31 +#: contrib/plugins/form_elements/fields/text/forms.py:30 +#: contrib/plugins/form_elements/fields/textarea/forms.py:28 +#: contrib/plugins/form_elements/fields/url/forms.py:30 msgid "Label" msgstr "" #: base.py:482 contrib/plugins/form_elements/fields/boolean/forms.py:37 #: contrib/plugins/form_elements/fields/date/forms.py:38 #: contrib/plugins/form_elements/fields/datetime/forms.py:38 -#: contrib/plugins/form_elements/fields/email/forms.py:41 +#: contrib/plugins/form_elements/fields/email/forms.py:42 #: contrib/plugins/form_elements/fields/file/forms.py:39 -#: contrib/plugins/form_elements/fields/integer/forms.py:39 -#: contrib/plugins/form_elements/fields/password/forms.py:39 +#: contrib/plugins/form_elements/fields/integer/forms.py:40 +#: contrib/plugins/form_elements/fields/password/forms.py:40 #: contrib/plugins/form_elements/fields/radio/forms.py:59 #: contrib/plugins/form_elements/fields/select/forms.py:59 -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:46 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:47 #: contrib/plugins/form_elements/fields/select_multiple/forms.py:59 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:46 -#: contrib/plugins/form_elements/fields/text/forms.py:39 -#: contrib/plugins/form_elements/fields/textarea/forms.py:37 -#: contrib/plugins/form_elements/fields/url/forms.py:39 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:47 +#: contrib/plugins/form_elements/fields/text/forms.py:40 +#: contrib/plugins/form_elements/fields/textarea/forms.py:38 +#: contrib/plugins/form_elements/fields/url/forms.py:40 msgid "Help text" msgstr "" #: base.py:487 contrib/plugins/form_elements/fields/boolean/forms.py:47 #: contrib/plugins/form_elements/fields/date/forms.py:53 #: contrib/plugins/form_elements/fields/datetime/forms.py:53 -#: contrib/plugins/form_elements/fields/email/forms.py:57 +#: contrib/plugins/form_elements/fields/email/forms.py:58 #: contrib/plugins/form_elements/fields/file/forms.py:55 #: contrib/plugins/form_elements/fields/hidden/forms.py:49 -#: contrib/plugins/form_elements/fields/integer/forms.py:59 -#: contrib/plugins/form_elements/fields/password/forms.py:55 +#: contrib/plugins/form_elements/fields/integer/forms.py:60 +#: contrib/plugins/form_elements/fields/password/forms.py:56 #: contrib/plugins/form_elements/fields/radio/forms.py:69 #: contrib/plugins/form_elements/fields/select/forms.py:69 -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:56 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:57 #: contrib/plugins/form_elements/fields/select_multiple/forms.py:69 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:56 -#: contrib/plugins/form_elements/fields/text/forms.py:55 -#: contrib/plugins/form_elements/fields/textarea/forms.py:47 -#: contrib/plugins/form_elements/fields/url/forms.py:55 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:57 +#: contrib/plugins/form_elements/fields/text/forms.py:56 +#: contrib/plugins/form_elements/fields/textarea/forms.py:48 +#: contrib/plugins/form_elements/fields/url/forms.py:56 msgid "Required" msgstr "" @@ -535,7 +535,7 @@ msgid "Title" msgstr "" #: contrib/plugins/form_elements/content/video/forms.py:33 -#: contrib/plugins/form_elements/fields/url/fobi_form_elements.py:22 +#: contrib/plugins/form_elements/fields/url/fobi_form_elements.py:29 msgid "URL" msgstr "" @@ -558,26 +558,26 @@ msgstr "" #: contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py:28 #: contrib/plugins/form_elements/fields/text/fobi_form_elements.py:23 #: contrib/plugins/form_elements/fields/textarea/fobi_form_elements.py:23 -#: contrib/plugins/form_elements/fields/url/fobi_form_elements.py:23 +#: contrib/plugins/form_elements/fields/url/fobi_form_elements.py:30 msgid "Fields" msgstr "" #: contrib/plugins/form_elements/fields/boolean/forms.py:42 #: contrib/plugins/form_elements/fields/date/forms.py:43 #: contrib/plugins/form_elements/fields/datetime/forms.py:43 -#: contrib/plugins/form_elements/fields/email/forms.py:46 +#: contrib/plugins/form_elements/fields/email/forms.py:47 #: contrib/plugins/form_elements/fields/file/forms.py:44 #: contrib/plugins/form_elements/fields/hidden/forms.py:38 -#: contrib/plugins/form_elements/fields/integer/forms.py:44 -#: contrib/plugins/form_elements/fields/password/forms.py:44 +#: contrib/plugins/form_elements/fields/integer/forms.py:45 +#: contrib/plugins/form_elements/fields/password/forms.py:45 #: contrib/plugins/form_elements/fields/radio/forms.py:64 #: contrib/plugins/form_elements/fields/select/forms.py:64 -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:51 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:52 #: contrib/plugins/form_elements/fields/select_multiple/forms.py:64 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:51 -#: contrib/plugins/form_elements/fields/text/forms.py:44 -#: contrib/plugins/form_elements/fields/textarea/forms.py:42 -#: contrib/plugins/form_elements/fields/url/forms.py:44 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:52 +#: contrib/plugins/form_elements/fields/text/forms.py:45 +#: contrib/plugins/form_elements/fields/textarea/forms.py:43 +#: contrib/plugins/form_elements/fields/url/forms.py:45 msgid "Initial" msgstr "" @@ -587,7 +587,6 @@ msgid "Date" msgstr "" #: contrib/plugins/form_elements/fields/date/forms.py:48 -#: contrib/plugins/form_elements/fields/datetime/forms.py:48 msgid "Input formats" msgstr "" @@ -595,19 +594,32 @@ msgstr "" msgid "DateTime" msgstr "" +#: contrib/plugins/form_elements/fields/datetime/forms.py:48 +msgid "Input formats" +msgstr "" + #: contrib/plugins/form_elements/fields/email/fobi_form_elements.py:24 msgid "Email" msgstr "" -#: contrib/plugins/form_elements/fields/email/forms.py:51 +#: contrib/plugins/form_elements/fields/email/forms.py:52 #: contrib/plugins/form_elements/fields/file/forms.py:49 #: contrib/plugins/form_elements/fields/hidden/forms.py:43 -#: contrib/plugins/form_elements/fields/password/forms.py:49 -#: contrib/plugins/form_elements/fields/text/forms.py:49 -#: contrib/plugins/form_elements/fields/url/forms.py:49 +#: contrib/plugins/form_elements/fields/password/forms.py:50 +#: contrib/plugins/form_elements/fields/text/forms.py:50 +#: contrib/plugins/form_elements/fields/url/forms.py:50 msgid "Max length" msgstr "" +#: contrib/plugins/form_elements/fields/email/forms.py:63 +#: contrib/plugins/form_elements/fields/integer/forms.py:65 +#: contrib/plugins/form_elements/fields/password/forms.py:61 +#: contrib/plugins/form_elements/fields/text/forms.py:61 +#: contrib/plugins/form_elements/fields/textarea/forms.py:53 +#: contrib/plugins/form_elements/fields/url/forms.py:61 +msgid "Placeholder" +msgstr "" + #: contrib/plugins/form_elements/fields/file/fobi_form_elements.py:23 msgid "File" msgstr "" @@ -620,11 +632,11 @@ msgstr "" msgid "Integer" msgstr "" -#: contrib/plugins/form_elements/fields/integer/forms.py:49 +#: contrib/plugins/form_elements/fields/integer/forms.py:50 msgid "Min value" msgstr "" -#: contrib/plugins/form_elements/fields/integer/forms.py:54 +#: contrib/plugins/form_elements/fields/integer/forms.py:55 msgid "Max value" msgstr "" @@ -666,8 +678,8 @@ msgstr "" msgid "Select model object" msgstr "" -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:40 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:40 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:41 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:41 msgid "Model" msgstr "" @@ -697,11 +709,11 @@ msgstr "" msgid "Saved form data entry" msgstr "" -#: contrib/plugins/form_handlers/db_store/fobi_form_handlers.py:25 +#: contrib/plugins/form_handlers/db_store/fobi_form_handlers.py:26 msgid "DB store" msgstr "" -#: contrib/plugins/form_handlers/db_store/fobi_form_handlers.py:59 +#: contrib/plugins/form_handlers/db_store/fobi_form_handlers.py:62 #: contrib/plugins/form_handlers/db_store/templates/db_store/plugin_data_repr.html:4 msgid "View entries" msgstr "" diff --git a/src/fobi/locale/nl/LC_MESSAGES/django.mo b/src/fobi/locale/nl/LC_MESSAGES/django.mo index b78cb49cd..7f53b2fd9 100644 Binary files a/src/fobi/locale/nl/LC_MESSAGES/django.mo and b/src/fobi/locale/nl/LC_MESSAGES/django.mo differ diff --git a/src/fobi/locale/nl/LC_MESSAGES/django.po b/src/fobi/locale/nl/LC_MESSAGES/django.po index b3cc15bea..09bc9421b 100644 --- a/src/fobi/locale/nl/LC_MESSAGES/django.po +++ b/src/fobi/locale/nl/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-11 02:24+0200\n" -"PO-Revision-Date: 2014-10-11 03:29+0100\n" +"POT-Creation-Date: 2014-10-14 00:19+0200\n" +"PO-Revision-Date: 2014-10-14 00:23+0100\n" "Last-Translator: Artur Barseghyan \n" "Language-Team: LANGUAGE \n" "Language: Dutch\n" @@ -66,11 +66,11 @@ msgstr "Plugin" msgid "Form handler entry" msgstr "Formulier afhandelaar" -#: admin.py:335 +#: admin.py:336 msgid "{0} plugins were changed successfully." msgstr "{0} plugins zijn succesvol bijgewerkt." -#: admin.py:341 +#: admin.py:342 msgid "POST required when changing in bulk!" msgstr "POST vereist bij het veranderen in bulk!" @@ -85,19 +85,19 @@ msgstr "Bouw je formulieren" #: contrib/plugins/form_elements/fields/boolean/forms.py:32 #: contrib/plugins/form_elements/fields/date/forms.py:33 #: contrib/plugins/form_elements/fields/datetime/forms.py:33 -#: contrib/plugins/form_elements/fields/email/forms.py:36 +#: contrib/plugins/form_elements/fields/email/forms.py:37 #: contrib/plugins/form_elements/fields/file/forms.py:34 #: contrib/plugins/form_elements/fields/hidden/forms.py:33 -#: contrib/plugins/form_elements/fields/integer/forms.py:34 -#: contrib/plugins/form_elements/fields/password/forms.py:34 +#: contrib/plugins/form_elements/fields/integer/forms.py:35 +#: contrib/plugins/form_elements/fields/password/forms.py:35 #: contrib/plugins/form_elements/fields/radio/forms.py:33 #: contrib/plugins/form_elements/fields/select/forms.py:33 -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:35 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:36 #: contrib/plugins/form_elements/fields/select_multiple/forms.py:33 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:35 -#: contrib/plugins/form_elements/fields/text/forms.py:34 -#: contrib/plugins/form_elements/fields/textarea/forms.py:32 -#: contrib/plugins/form_elements/fields/url/forms.py:34 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:36 +#: contrib/plugins/form_elements/fields/text/forms.py:35 +#: contrib/plugins/form_elements/fields/textarea/forms.py:33 +#: contrib/plugins/form_elements/fields/url/forms.py:35 #: contrib/themes/simple/templates/simple/dashboard.html:42 msgid "Name" msgstr "Naam" @@ -106,19 +106,19 @@ msgstr "Naam" #: contrib/plugins/form_elements/fields/boolean/forms.py:27 #: contrib/plugins/form_elements/fields/date/forms.py:28 #: contrib/plugins/form_elements/fields/datetime/forms.py:28 -#: contrib/plugins/form_elements/fields/email/forms.py:31 +#: contrib/plugins/form_elements/fields/email/forms.py:32 #: contrib/plugins/form_elements/fields/file/forms.py:29 #: contrib/plugins/form_elements/fields/hidden/forms.py:28 -#: contrib/plugins/form_elements/fields/integer/forms.py:29 -#: contrib/plugins/form_elements/fields/password/forms.py:29 +#: contrib/plugins/form_elements/fields/integer/forms.py:30 +#: contrib/plugins/form_elements/fields/password/forms.py:30 #: contrib/plugins/form_elements/fields/radio/forms.py:28 #: contrib/plugins/form_elements/fields/select/forms.py:28 -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:30 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:31 #: contrib/plugins/form_elements/fields/select_multiple/forms.py:28 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:30 -#: contrib/plugins/form_elements/fields/text/forms.py:29 -#: contrib/plugins/form_elements/fields/textarea/forms.py:27 -#: contrib/plugins/form_elements/fields/url/forms.py:29 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:31 +#: contrib/plugins/form_elements/fields/text/forms.py:30 +#: contrib/plugins/form_elements/fields/textarea/forms.py:28 +#: contrib/plugins/form_elements/fields/url/forms.py:30 msgid "Label" msgstr "Label" @@ -126,18 +126,18 @@ msgstr "Label" #: contrib/plugins/form_elements/fields/boolean/forms.py:37 #: contrib/plugins/form_elements/fields/date/forms.py:38 #: contrib/plugins/form_elements/fields/datetime/forms.py:38 -#: contrib/plugins/form_elements/fields/email/forms.py:41 +#: contrib/plugins/form_elements/fields/email/forms.py:42 #: contrib/plugins/form_elements/fields/file/forms.py:39 -#: contrib/plugins/form_elements/fields/integer/forms.py:39 -#: contrib/plugins/form_elements/fields/password/forms.py:39 +#: contrib/plugins/form_elements/fields/integer/forms.py:40 +#: contrib/plugins/form_elements/fields/password/forms.py:40 #: contrib/plugins/form_elements/fields/radio/forms.py:59 #: contrib/plugins/form_elements/fields/select/forms.py:59 -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:46 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:47 #: contrib/plugins/form_elements/fields/select_multiple/forms.py:59 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:46 -#: contrib/plugins/form_elements/fields/text/forms.py:39 -#: contrib/plugins/form_elements/fields/textarea/forms.py:37 -#: contrib/plugins/form_elements/fields/url/forms.py:39 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:47 +#: contrib/plugins/form_elements/fields/text/forms.py:40 +#: contrib/plugins/form_elements/fields/textarea/forms.py:38 +#: contrib/plugins/form_elements/fields/url/forms.py:40 msgid "Help text" msgstr "Helptekst" @@ -145,19 +145,19 @@ msgstr "Helptekst" #: contrib/plugins/form_elements/fields/boolean/forms.py:47 #: contrib/plugins/form_elements/fields/date/forms.py:53 #: contrib/plugins/form_elements/fields/datetime/forms.py:53 -#: contrib/plugins/form_elements/fields/email/forms.py:57 +#: contrib/plugins/form_elements/fields/email/forms.py:58 #: contrib/plugins/form_elements/fields/file/forms.py:55 #: contrib/plugins/form_elements/fields/hidden/forms.py:49 -#: contrib/plugins/form_elements/fields/integer/forms.py:59 -#: contrib/plugins/form_elements/fields/password/forms.py:55 +#: contrib/plugins/form_elements/fields/integer/forms.py:60 +#: contrib/plugins/form_elements/fields/password/forms.py:56 #: contrib/plugins/form_elements/fields/radio/forms.py:69 #: contrib/plugins/form_elements/fields/select/forms.py:69 -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:56 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:57 #: contrib/plugins/form_elements/fields/select_multiple/forms.py:69 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:56 -#: contrib/plugins/form_elements/fields/text/forms.py:55 -#: contrib/plugins/form_elements/fields/textarea/forms.py:47 -#: contrib/plugins/form_elements/fields/url/forms.py:55 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:57 +#: contrib/plugins/form_elements/fields/text/forms.py:56 +#: contrib/plugins/form_elements/fields/textarea/forms.py:48 +#: contrib/plugins/form_elements/fields/url/forms.py:56 msgid "Required" msgstr "Verplicht" @@ -569,7 +569,7 @@ msgid "Title" msgstr "Titel" #: contrib/plugins/form_elements/content/video/forms.py:33 -#: contrib/plugins/form_elements/fields/url/fobi_form_elements.py:22 +#: contrib/plugins/form_elements/fields/url/fobi_form_elements.py:29 msgid "URL" msgstr "" @@ -592,26 +592,26 @@ msgstr "Selectievakje" #: contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py:28 #: contrib/plugins/form_elements/fields/text/fobi_form_elements.py:23 #: contrib/plugins/form_elements/fields/textarea/fobi_form_elements.py:23 -#: contrib/plugins/form_elements/fields/url/fobi_form_elements.py:23 +#: contrib/plugins/form_elements/fields/url/fobi_form_elements.py:30 msgid "Fields" msgstr "Velden" #: contrib/plugins/form_elements/fields/boolean/forms.py:42 #: contrib/plugins/form_elements/fields/date/forms.py:43 #: contrib/plugins/form_elements/fields/datetime/forms.py:43 -#: contrib/plugins/form_elements/fields/email/forms.py:46 +#: contrib/plugins/form_elements/fields/email/forms.py:47 #: contrib/plugins/form_elements/fields/file/forms.py:44 #: contrib/plugins/form_elements/fields/hidden/forms.py:38 -#: contrib/plugins/form_elements/fields/integer/forms.py:44 -#: contrib/plugins/form_elements/fields/password/forms.py:44 +#: contrib/plugins/form_elements/fields/integer/forms.py:45 +#: contrib/plugins/form_elements/fields/password/forms.py:45 #: contrib/plugins/form_elements/fields/radio/forms.py:64 #: contrib/plugins/form_elements/fields/select/forms.py:64 -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:51 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:52 #: contrib/plugins/form_elements/fields/select_multiple/forms.py:64 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:51 -#: contrib/plugins/form_elements/fields/text/forms.py:44 -#: contrib/plugins/form_elements/fields/textarea/forms.py:42 -#: contrib/plugins/form_elements/fields/url/forms.py:44 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:52 +#: contrib/plugins/form_elements/fields/text/forms.py:45 +#: contrib/plugins/form_elements/fields/textarea/forms.py:43 +#: contrib/plugins/form_elements/fields/url/forms.py:45 msgid "Initial" msgstr "Initiële waarde" @@ -621,27 +621,39 @@ msgid "Date" msgstr "Datum" #: contrib/plugins/form_elements/fields/date/forms.py:48 -#: contrib/plugins/form_elements/fields/datetime/forms.py:48 -msgid "Input formats" +msgid "Input formats" msgstr "Invoerformaten" #: contrib/plugins/form_elements/fields/datetime/fobi_form_elements.py:23 msgid "DateTime" msgstr "Datum/tijd" +#: contrib/plugins/form_elements/fields/datetime/forms.py:48 +msgid "Input formats" +msgstr "Invoerformaten" + #: contrib/plugins/form_elements/fields/email/fobi_form_elements.py:24 msgid "Email" msgstr "Email" -#: contrib/plugins/form_elements/fields/email/forms.py:51 +#: contrib/plugins/form_elements/fields/email/forms.py:52 #: contrib/plugins/form_elements/fields/file/forms.py:49 #: contrib/plugins/form_elements/fields/hidden/forms.py:43 -#: contrib/plugins/form_elements/fields/password/forms.py:49 -#: contrib/plugins/form_elements/fields/text/forms.py:49 -#: contrib/plugins/form_elements/fields/url/forms.py:49 +#: contrib/plugins/form_elements/fields/password/forms.py:50 +#: contrib/plugins/form_elements/fields/text/forms.py:50 +#: contrib/plugins/form_elements/fields/url/forms.py:50 msgid "Max length" msgstr "Maximale lengte" +#: contrib/plugins/form_elements/fields/email/forms.py:63 +#: contrib/plugins/form_elements/fields/integer/forms.py:65 +#: contrib/plugins/form_elements/fields/password/forms.py:61 +#: contrib/plugins/form_elements/fields/text/forms.py:61 +#: contrib/plugins/form_elements/fields/textarea/forms.py:53 +#: contrib/plugins/form_elements/fields/url/forms.py:61 +msgid "Placeholder" +msgstr "Aanduiding" + #: contrib/plugins/form_elements/fields/file/fobi_form_elements.py:23 msgid "File" msgstr "Bestand" @@ -654,11 +666,11 @@ msgstr "Verborgen veld" msgid "Integer" msgstr "Nummer" -#: contrib/plugins/form_elements/fields/integer/forms.py:49 +#: contrib/plugins/form_elements/fields/integer/forms.py:50 msgid "Min value" msgstr "Minimumwaarde" -#: contrib/plugins/form_elements/fields/integer/forms.py:54 +#: contrib/plugins/form_elements/fields/integer/forms.py:55 msgid "Max value" msgstr "Maximumwaarde" @@ -690,8 +702,8 @@ msgstr "Keuzelijst" msgid "Select model object" msgstr "Keuzelijst object model" -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:40 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:40 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:41 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:41 msgid "Model" msgstr "Model" @@ -721,11 +733,11 @@ msgstr "Rui" msgid "Saved form data entry" msgstr "Opgeslagen formulier data" -#: contrib/plugins/form_handlers/db_store/fobi_form_handlers.py:25 +#: contrib/plugins/form_handlers/db_store/fobi_form_handlers.py:26 msgid "DB store" msgstr "Opslaan in database" -#: contrib/plugins/form_handlers/db_store/fobi_form_handlers.py:59 +#: contrib/plugins/form_handlers/db_store/fobi_form_handlers.py:62 #: contrib/plugins/form_handlers/db_store/templates/db_store/plugin_data_repr.html:4 msgid "View entries" msgstr "Inschrijvingen bekijken" diff --git a/src/fobi/locale/ru/LC_MESSAGES/django.mo b/src/fobi/locale/ru/LC_MESSAGES/django.mo index 978761d75..879de049c 100644 Binary files a/src/fobi/locale/ru/LC_MESSAGES/django.mo and b/src/fobi/locale/ru/LC_MESSAGES/django.mo differ diff --git a/src/fobi/locale/ru/LC_MESSAGES/django.po b/src/fobi/locale/ru/LC_MESSAGES/django.po index 8eb93f4d8..1728dbd6c 100644 --- a/src/fobi/locale/ru/LC_MESSAGES/django.po +++ b/src/fobi/locale/ru/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-11 02:24+0200\n" -"PO-Revision-Date: 2014-10-11 03:31+0100\n" +"POT-Creation-Date: 2014-10-14 00:19+0200\n" +"PO-Revision-Date: 2014-10-14 00:21+0100\n" "Last-Translator: Artur Barseghyan \n" "Language-Team: LANGUAGE \n" "Language: Russian\n" @@ -66,11 +66,11 @@ msgstr "Плагин" msgid "Form handler entry" msgstr "Обработчик формы" -#: admin.py:335 +#: admin.py:336 msgid "{0} plugins were changed successfully." msgstr "{0} плагинов были изменены успешно." -#: admin.py:341 +#: admin.py:342 msgid "POST required when changing in bulk!" msgstr "Для множественных изменений необходим POST!" @@ -85,19 +85,19 @@ msgstr "Разработчик форм" #: contrib/plugins/form_elements/fields/boolean/forms.py:32 #: contrib/plugins/form_elements/fields/date/forms.py:33 #: contrib/plugins/form_elements/fields/datetime/forms.py:33 -#: contrib/plugins/form_elements/fields/email/forms.py:36 +#: contrib/plugins/form_elements/fields/email/forms.py:37 #: contrib/plugins/form_elements/fields/file/forms.py:34 #: contrib/plugins/form_elements/fields/hidden/forms.py:33 -#: contrib/plugins/form_elements/fields/integer/forms.py:34 -#: contrib/plugins/form_elements/fields/password/forms.py:34 +#: contrib/plugins/form_elements/fields/integer/forms.py:35 +#: contrib/plugins/form_elements/fields/password/forms.py:35 #: contrib/plugins/form_elements/fields/radio/forms.py:33 #: contrib/plugins/form_elements/fields/select/forms.py:33 -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:35 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:36 #: contrib/plugins/form_elements/fields/select_multiple/forms.py:33 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:35 -#: contrib/plugins/form_elements/fields/text/forms.py:34 -#: contrib/plugins/form_elements/fields/textarea/forms.py:32 -#: contrib/plugins/form_elements/fields/url/forms.py:34 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:36 +#: contrib/plugins/form_elements/fields/text/forms.py:35 +#: contrib/plugins/form_elements/fields/textarea/forms.py:33 +#: contrib/plugins/form_elements/fields/url/forms.py:35 #: contrib/themes/simple/templates/simple/dashboard.html:42 msgid "Name" msgstr "Название" @@ -106,19 +106,19 @@ msgstr "Название" #: contrib/plugins/form_elements/fields/boolean/forms.py:27 #: contrib/plugins/form_elements/fields/date/forms.py:28 #: contrib/plugins/form_elements/fields/datetime/forms.py:28 -#: contrib/plugins/form_elements/fields/email/forms.py:31 +#: contrib/plugins/form_elements/fields/email/forms.py:32 #: contrib/plugins/form_elements/fields/file/forms.py:29 #: contrib/plugins/form_elements/fields/hidden/forms.py:28 -#: contrib/plugins/form_elements/fields/integer/forms.py:29 -#: contrib/plugins/form_elements/fields/password/forms.py:29 +#: contrib/plugins/form_elements/fields/integer/forms.py:30 +#: contrib/plugins/form_elements/fields/password/forms.py:30 #: contrib/plugins/form_elements/fields/radio/forms.py:28 #: contrib/plugins/form_elements/fields/select/forms.py:28 -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:30 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:31 #: contrib/plugins/form_elements/fields/select_multiple/forms.py:28 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:30 -#: contrib/plugins/form_elements/fields/text/forms.py:29 -#: contrib/plugins/form_elements/fields/textarea/forms.py:27 -#: contrib/plugins/form_elements/fields/url/forms.py:29 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:31 +#: contrib/plugins/form_elements/fields/text/forms.py:30 +#: contrib/plugins/form_elements/fields/textarea/forms.py:28 +#: contrib/plugins/form_elements/fields/url/forms.py:30 msgid "Label" msgstr "Ярлык" @@ -126,18 +126,18 @@ msgstr "Ярлык" #: contrib/plugins/form_elements/fields/boolean/forms.py:37 #: contrib/plugins/form_elements/fields/date/forms.py:38 #: contrib/plugins/form_elements/fields/datetime/forms.py:38 -#: contrib/plugins/form_elements/fields/email/forms.py:41 +#: contrib/plugins/form_elements/fields/email/forms.py:42 #: contrib/plugins/form_elements/fields/file/forms.py:39 -#: contrib/plugins/form_elements/fields/integer/forms.py:39 -#: contrib/plugins/form_elements/fields/password/forms.py:39 +#: contrib/plugins/form_elements/fields/integer/forms.py:40 +#: contrib/plugins/form_elements/fields/password/forms.py:40 #: contrib/plugins/form_elements/fields/radio/forms.py:59 #: contrib/plugins/form_elements/fields/select/forms.py:59 -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:46 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:47 #: contrib/plugins/form_elements/fields/select_multiple/forms.py:59 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:46 -#: contrib/plugins/form_elements/fields/text/forms.py:39 -#: contrib/plugins/form_elements/fields/textarea/forms.py:37 -#: contrib/plugins/form_elements/fields/url/forms.py:39 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:47 +#: contrib/plugins/form_elements/fields/text/forms.py:40 +#: contrib/plugins/form_elements/fields/textarea/forms.py:38 +#: contrib/plugins/form_elements/fields/url/forms.py:40 msgid "Help text" msgstr "Помощь" @@ -145,19 +145,19 @@ msgstr "Помощь" #: contrib/plugins/form_elements/fields/boolean/forms.py:47 #: contrib/plugins/form_elements/fields/date/forms.py:53 #: contrib/plugins/form_elements/fields/datetime/forms.py:53 -#: contrib/plugins/form_elements/fields/email/forms.py:57 +#: contrib/plugins/form_elements/fields/email/forms.py:58 #: contrib/plugins/form_elements/fields/file/forms.py:55 #: contrib/plugins/form_elements/fields/hidden/forms.py:49 -#: contrib/plugins/form_elements/fields/integer/forms.py:59 -#: contrib/plugins/form_elements/fields/password/forms.py:55 +#: contrib/plugins/form_elements/fields/integer/forms.py:60 +#: contrib/plugins/form_elements/fields/password/forms.py:56 #: contrib/plugins/form_elements/fields/radio/forms.py:69 #: contrib/plugins/form_elements/fields/select/forms.py:69 -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:56 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:57 #: contrib/plugins/form_elements/fields/select_multiple/forms.py:69 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:56 -#: contrib/plugins/form_elements/fields/text/forms.py:55 -#: contrib/plugins/form_elements/fields/textarea/forms.py:47 -#: contrib/plugins/form_elements/fields/url/forms.py:55 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:57 +#: contrib/plugins/form_elements/fields/text/forms.py:56 +#: contrib/plugins/form_elements/fields/textarea/forms.py:48 +#: contrib/plugins/form_elements/fields/url/forms.py:56 msgid "Required" msgstr "Обязательно" @@ -569,7 +569,7 @@ msgid "Title" msgstr "Название" #: contrib/plugins/form_elements/content/video/forms.py:33 -#: contrib/plugins/form_elements/fields/url/fobi_form_elements.py:22 +#: contrib/plugins/form_elements/fields/url/fobi_form_elements.py:29 msgid "URL" msgstr "Ссылка" @@ -592,26 +592,26 @@ msgstr "Галочка" #: contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py:28 #: contrib/plugins/form_elements/fields/text/fobi_form_elements.py:23 #: contrib/plugins/form_elements/fields/textarea/fobi_form_elements.py:23 -#: contrib/plugins/form_elements/fields/url/fobi_form_elements.py:23 +#: contrib/plugins/form_elements/fields/url/fobi_form_elements.py:30 msgid "Fields" msgstr "Поля" #: contrib/plugins/form_elements/fields/boolean/forms.py:42 #: contrib/plugins/form_elements/fields/date/forms.py:43 #: contrib/plugins/form_elements/fields/datetime/forms.py:43 -#: contrib/plugins/form_elements/fields/email/forms.py:46 +#: contrib/plugins/form_elements/fields/email/forms.py:47 #: contrib/plugins/form_elements/fields/file/forms.py:44 #: contrib/plugins/form_elements/fields/hidden/forms.py:38 -#: contrib/plugins/form_elements/fields/integer/forms.py:44 -#: contrib/plugins/form_elements/fields/password/forms.py:44 +#: contrib/plugins/form_elements/fields/integer/forms.py:45 +#: contrib/plugins/form_elements/fields/password/forms.py:45 #: contrib/plugins/form_elements/fields/radio/forms.py:64 #: contrib/plugins/form_elements/fields/select/forms.py:64 -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:51 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:52 #: contrib/plugins/form_elements/fields/select_multiple/forms.py:64 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:51 -#: contrib/plugins/form_elements/fields/text/forms.py:44 -#: contrib/plugins/form_elements/fields/textarea/forms.py:42 -#: contrib/plugins/form_elements/fields/url/forms.py:44 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:52 +#: contrib/plugins/form_elements/fields/text/forms.py:45 +#: contrib/plugins/form_elements/fields/textarea/forms.py:43 +#: contrib/plugins/form_elements/fields/url/forms.py:45 msgid "Initial" msgstr "Начальное значение" @@ -621,27 +621,39 @@ msgid "Date" msgstr "Дата" #: contrib/plugins/form_elements/fields/date/forms.py:48 -#: contrib/plugins/form_elements/fields/datetime/forms.py:48 -msgid "Input formats" +msgid "Input formats" msgstr "Форматы ввода" #: contrib/plugins/form_elements/fields/datetime/fobi_form_elements.py:23 msgid "DateTime" msgstr "Дата/время" +#: contrib/plugins/form_elements/fields/datetime/forms.py:48 +msgid "Input formats" +msgstr "Форматы ввода" + #: contrib/plugins/form_elements/fields/email/fobi_form_elements.py:24 msgid "Email" msgstr "Эл. почта" -#: contrib/plugins/form_elements/fields/email/forms.py:51 +#: contrib/plugins/form_elements/fields/email/forms.py:52 #: contrib/plugins/form_elements/fields/file/forms.py:49 #: contrib/plugins/form_elements/fields/hidden/forms.py:43 -#: contrib/plugins/form_elements/fields/password/forms.py:49 -#: contrib/plugins/form_elements/fields/text/forms.py:49 -#: contrib/plugins/form_elements/fields/url/forms.py:49 +#: contrib/plugins/form_elements/fields/password/forms.py:50 +#: contrib/plugins/form_elements/fields/text/forms.py:50 +#: contrib/plugins/form_elements/fields/url/forms.py:50 msgid "Max length" msgstr "Максимальная длина" +#: contrib/plugins/form_elements/fields/email/forms.py:63 +#: contrib/plugins/form_elements/fields/integer/forms.py:65 +#: contrib/plugins/form_elements/fields/password/forms.py:61 +#: contrib/plugins/form_elements/fields/text/forms.py:61 +#: contrib/plugins/form_elements/fields/textarea/forms.py:53 +#: contrib/plugins/form_elements/fields/url/forms.py:61 +msgid "Placeholder" +msgstr "Метка-заполнитель " + #: contrib/plugins/form_elements/fields/file/fobi_form_elements.py:23 msgid "File" msgstr "Файл" @@ -654,11 +666,11 @@ msgstr "Скрытое поле" msgid "Integer" msgstr "Целое число" -#: contrib/plugins/form_elements/fields/integer/forms.py:49 +#: contrib/plugins/form_elements/fields/integer/forms.py:50 msgid "Min value" msgstr "Минимальное значение" -#: contrib/plugins/form_elements/fields/integer/forms.py:54 +#: contrib/plugins/form_elements/fields/integer/forms.py:55 msgid "Max value" msgstr "Максимальное значение" @@ -690,8 +702,8 @@ msgstr "Выпадающий список" msgid "Select model object" msgstr "Выпадающий список объектов моделей" -#: contrib/plugins/form_elements/fields/select_model_object/forms.py:40 -#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:40 +#: contrib/plugins/form_elements/fields/select_model_object/forms.py:41 +#: contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py:41 msgid "Model" msgstr "Модель" @@ -721,11 +733,11 @@ msgstr "Сырое" msgid "Saved form data entry" msgstr "Сохраненная запись формы" -#: contrib/plugins/form_handlers/db_store/fobi_form_handlers.py:25 +#: contrib/plugins/form_handlers/db_store/fobi_form_handlers.py:26 msgid "DB store" msgstr "Сохранить в базе" -#: contrib/plugins/form_handlers/db_store/fobi_form_handlers.py:59 +#: contrib/plugins/form_handlers/db_store/fobi_form_handlers.py:62 #: contrib/plugins/form_handlers/db_store/templates/db_store/plugin_data_repr.html:4 msgid "View entries" msgstr "Просмотреть записи" diff --git a/src/fobi/models.py b/src/fobi/models.py index 14c9db8d8..2ea5bd4da 100644 --- a/src/fobi/models.py +++ b/src/fobi/models.py @@ -7,7 +7,7 @@ __all__ = ( # Plugins 'AbstractPluginModel', 'FormElement', 'FormHandler', - + # Entries 'AbstractPluginEntry', 'FormWizardEntry', 'FormEntry', 'FormElementEntry', 'FormFieldsetEntry', 'FormHandlerEntry', diff --git a/src/fobi/tests/data.py b/src/fobi/tests/data.py index 4442f430e..0c7a70098 100644 --- a/src/fobi/tests/data.py +++ b/src/fobi/tests/data.py @@ -30,13 +30,11 @@ TEST_FORM_ELEMENT_PLUGIN_DATA = { force_text(BooleanSelectPlugin.name): { 'label': "Test boolean", - #'name': "test_boolean", 'help_text': "Lorem ipsum boolean", 'required': False, }, force_text(EmailPlugin.name): { 'label': "Test email input", - #'name': "test_email_input", 'help_text': "Lorem ipsum email", 'required': True, }, @@ -62,14 +60,12 @@ # Add a "Integer" (text input) form elelement force_text(IntegerInputPlugin.name): { 'label': "Test integer", - #'name': "test_integer", 'help_text': "Lorem ipsum text input", 'required': True, }, # Add a "Select Input" (select input) form elelement force_text(SelectInputPlugin.name): { 'label': "Test select", - #'name': "test_select", 'help_text': "Lorem ipsum text input", 'required': False, }, @@ -77,7 +73,6 @@ # Add a "Select model object" (select input) form elelement force_text(SelectModelObjectInputPlugin.name): { 'label': "Test select model object", - #'name': "test_select_model_object", 'help_text': "Lorem ipsum select model object input", 'required': False, }, @@ -85,7 +80,6 @@ # Add a "Select multiple" (select multiple input) form elelement force_text(SelectMultipleInputPlugin.name): { 'label': "Test select multiple input", - #'name': "test_select_multiple_input", 'help_text': "Lorem ipsum select multiple input", 'required': False, }, @@ -93,7 +87,6 @@ # Add a "Text" (text input) form elelement force_text(TextInputPlugin.name): { 'label': "Test text", - #'name': "test_text", 'help_text': "Lorem ipsum text input", 'required': True, }, @@ -101,7 +94,6 @@ # Add a "Textarea" (text area) form elelement force_text(TextareaPlugin.name): { 'label': "Test text area", - #'name': "test_text_area", 'help_text': "Lorem ipsum text area", 'required': True, } diff --git a/src/fobi/tests/helpers.py b/src/fobi/tests/helpers.py index 69ab82f55..c0449312c 100644 --- a/src/fobi/tests/helpers.py +++ b/src/fobi/tests/helpers.py @@ -49,8 +49,8 @@ try: # Django 1.7 check from django.apps import AppConfig - from django.conf import settings - User = settings.AUTH_USER_MODEL + from django.contrib.auth import get_user_model + User = get_user_model() except ImportError: # Django 1.6 check try: diff --git a/test_django17.sh b/test_django17.sh index a6797e454..bb98ab254 100755 --- a/test_django17.sh +++ b/test_django17.sh @@ -1,4 +1,4 @@ reset ./uninstall.sh ./install.sh -python examples/simple/manage.py test fobi --settings=settings_django17 +python examples/simple/manage.py test fobi --settings=settings_django17 --traceback -v 3