1
2
alpha, Alpha
beta, Beta
omega
<select id=\"id_NAME_OF_THE_ELEMENT\" name=\"NAME_OF_THE_ELEMENT\">
<option value=\"1\">1</option>
<option value=\"2\">2</option>
<option value=\"alpha\">Alpha</option>
<option value=\"beta\">Beta</option>
<option value=\"omega\">omega</option>
</select>
1
2
alpha, Alpha
beta, Beta
omega
<select id=\"id_NAME_OF_THE_ELEMENT\" name=\"NAME_OF_THE_ELEMENT\">
<option value=\"1\">1</option>
<option value=\"2\">2</option>
<option value=\"alpha\">Alpha</option>
<option value=\"beta\">Beta</option>
<option value=\"omega\">omega</option>
</select>\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 "" + +#: templates/home/base.html:30 +#: templates/home/foundation5.html:24 +msgid "Learn more" +msgstr "" + +#: templates/home/base.html:40 +#, python-format +msgid "" +"\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" +" \n" +" " +msgstr "" + +#: templates/home/base.html:47 +#: templates/home/foundation5.html:41 +#, fuzzy +msgid "Create a form" msgstr "Formular erstellen" -#: templates/fobi/generic/edit_form_element_entry.html:5 -#: templates/fobi/generic/edit_form_element_entry_ajax.html:6 +#: templates/home/base.html:49 #, python-format -msgid "Edit \"%(plugin_name)s\" element of the form" -msgstr "Bearbeite \"%(plugin_name)s\" Element des Formulars" +msgid "" +"\n" +"Create your first form using awesome user-friendly GUI. Choose what to do with the posted data.
\n" +" \n" +" " +msgstr "" -#: templates/fobi/generic/edit_form_element_entry_ajax.html:9 -#: templates/fobi/generic/edit_form_handler_entry_ajax.html:9 -#: templates/fobi/generic/view_form_entry_ajax.html:9 +#: templates/home/base.html:55 +#: templates/home/foundation5.html:49 +msgid "See the admin part" +msgstr "" + +#: templates/home/base.html:57 +#, python-format +msgid "" +"\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" +" \n" +" " +msgstr "" + +#: 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" +" form handlers), create new forms as well as remove existing ones.
\n" +" \n" +" " +msgstr "" + +#: 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" +" \n" +" " +msgstr "" + +#: 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" +" one or another `Fobi` plugin (form element or form handler).
\n" +" \n" +" " +msgstr "" + +#: templates/registration/activate.html:5 +#: templates/registration/activate.html:12 +#: templates/registration/activation_complete.html:5 +#: templates/registration/activation_complete.html:12 +msgid "Activation complete" +msgstr "" + +#: templates/registration/activate.html:5 +#: templates/registration/activate.html:12 +msgid "Activation problem" +msgstr "" + +#: templates/registration/activate.html:17 +#, python-format +msgid "" +"\n" +" Thanks %(account)s, activation complete!\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." +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" +" " +msgstr "" + +#: templates/registration/activation_email.html:8 +#, python-format +msgid "" +"\n" +"\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"
+"from our records.\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"
+"
\n"
+"Sincerely,
\n"
+"%(sitename)s Management\n"
+"
"
+#~ " 1
2
alpha, "
+#~ "Alpha
beta, Beta
"
+#~ "omega
<select id=\"id_NAME_OF_THE_ELEMENT"
+#~ "\" name=\"NAME_OF_THE_ELEMENT\">
"
+#~ " <option value=\"1\">1</option>
"
+#~ " <option value=\"2\">2</"
+#~ "option>
<option "
+#~ "value=\"alpha\">Alpha</option>
"
+#~ " <option value=\"beta\">Beta</option>
<option value=\"omega"
+#~ "\">omega</option>
</select>"
+#~ msgstr ""
+#~ "Jeweils ein Wert/Paar pro Zeile. Zum Beispiel:
"
+#~ " 1
2
"
+#~ "alpha, Alpha
beta, Beta
"
+#~ " omega
It finally transforms into the following HTML code:"
+#~ "
<select id=\"id_NAME_OF_THE_ELEMENT"
+#~ "\" name=\"NAME_OF_THE_ELEMENT\">
"
+#~ " <option value=\"1\">1</option>
"
+#~ " <option value=\"2\">2</"
+#~ "option>
<option "
+#~ "value=\"alpha\">Alpha</option>
"
+#~ " <option value=\"beta\">Beta</option>
<option value=\"omega"
+#~ "\">omega</option>
</select>"
+
+#~ msgid "Select"
+#~ msgstr "Auswahl"
+
+#~ msgid "Select model object"
+#~ msgstr "Modelobjekt Auswahl"
+
+#~ msgid "Model"
+#~ msgstr "Model"
+
+#~ msgid "Select multiple"
+#~ msgstr "Mehrfachauswahl"
+
+#~ msgid "Select multiple model objects"
+#~ msgstr "Mehrfachauswahl Modelobjekte"
+
+#~ msgid "Textarea"
+#~ msgstr "Textbreich"
+
+#~ msgid "Captcha"
+#~ msgstr "Captcha"
+
+#~ msgid "Security"
+#~ msgstr "Sicherheit"
+
+#~ msgid "Field value was tampered with."
+#~ msgstr "Der Feldinhalt wurde bearbeitet."
+
+#~ msgid "Honeypot"
+#~ msgstr "Honeypot"
+
+#~ msgid "Dummy"
+#~ msgstr "Dummy"
+
+#~ msgid "Dummy content"
+#~ msgstr "Dummyinhalt"
+
+#~ msgid "Raw"
+#~ msgstr "Rohdaten"
+
+#~ msgid "Saved form data entry"
+#~ msgstr "gespeicherte Formulardaten"
+
+#~ msgid "Export data to CSV/XLS"
+#~ msgstr "Daten als CSB/XLS exportieren "
+
+#~ msgid "DB store"
+#~ msgstr "Datenbankspeicher"
+
+#~ msgid "View entries"
+#~ msgstr "Einträge ansehen"
+
+#~ msgid "Export entries"
+#~ msgstr "Einträge exportieren"
+
+#~ msgid "Form data headers"
+#~ msgstr "Formular Daten Header"
+
+#~ msgid "Date created"
+#~ msgstr "Erstelldatum"
+
+#~ msgid "Saved form data entries"
+#~ msgstr "gespeicherte Formulardaten"
+
+#~ msgid "Saved data"
+#~ msgstr "gespeicherte Daten"
+
+#~ msgid "View form data"
+#~ msgstr "Formulardaten ansehen"
+
+#~ msgid "Saved form data"
+#~ msgstr "gespeicherte Formulardaten"
+
+#~ msgid "Filter"
+#~ msgstr "Filter"
+
+#~ msgid "HTTP Repost"
+#~ msgstr "HTTP Antwort"
+
+#~ msgid "Endpoint URL"
+#~ msgstr "URL Endpunkt"
+
+#~ msgid "Mail"
+#~ msgstr "E-Mail"
+
+#~ msgid "From name"
+#~ msgstr "Formular Name"
+
+#~ msgid "From email"
+#~ msgstr "Formular E-Mail"
+
+#~ msgid "To name"
+#~ msgstr "An Name"
+
+#~ msgid "To email"
+#~ msgstr "An E-Mail"
+
+#~ msgid "Subject"
+#~ msgstr "Betreff"
+
+#~ msgid "Body"
+#~ msgstr "Textkörper"
+
+#~ msgid "To"
+#~ msgstr "An"
+
+#~ msgid "MailChimp"
+#~ msgstr "MailChimp"
+
+#~ msgid "Bootstrap 3"
+#~ msgstr "Bootstrap3"
+
+#~ msgid "Error"
+#~ msgstr "Fehler"
+
+#~ msgid "Foundation 5"
+#~ msgstr "Foundation5"
+
+#~ msgid "Your forms"
+#~ msgstr "Ihre Formulare"
+
+#~ msgid "Is public"
+#~ msgstr "Öffentlich"
+
+#~ msgid "Is cloneable"
+#~ msgstr "Kopierbar"
+
+#~ msgid "Edit form"
+#~ msgstr "Formular bearbeiten"
+
+#~ msgid "Elements"
+#~ msgstr "Elemente"
+
+#~ msgid "Handlers"
+#~ msgstr "Formularübergabe"
+
+#~ msgid "Properties"
+#~ msgstr "Eigenschaften"
+
+#~ msgid "Add elements to your form"
+#~ msgstr "Elemente zum Formular hinzufügen"
+
+#~ msgid "Choose form element to add"
+#~ msgstr "Wähle Formularelement zum hinzufügen"
+
+#~ msgid "Save ordering"
+#~ msgstr "Reihenfolge speichern"
+
+#~ msgid "Add handlers to your form"
+#~ msgstr "Formularübergabe zum Formular hinzufügen"
+
+#~ msgid "Choose form handler to add"
+#~ msgstr "Wähle Formularübergabe zum hinzufügen"
+
+#~ msgid "Handler"
+#~ msgstr "Formularübergabe"
+
+#~ msgid "Form properties"
+#~ msgstr "Formulareigenschaften"
+
+#~ msgid "Submit changes"
+#~ msgstr "Änderungen überagen"
+
+#~ msgid ""
+#~ "Fields marked with * are required"
+#~ msgstr ""
+#~ "Felder die mit * sind Pflichtfelder"
+
+#~ msgid "Simple"
+#~ msgstr "Einfach"
+
+#~ msgid "Add \"%(plugin_name)s\" element to the form"
+#~ msgstr "Füge \"%(plugin_name)s\"-Element zum Formular hinzu"
+
+#~ msgid "Add \"%(plugin_name)s\" handler to the form"
+#~ msgstr "Füge \"%(plugin_name)s\"-Formularübergabe zum Formular hinzu"
+
+#~ msgid "Welcome,"
+#~ msgstr "Willkommen"
+
+#~ msgid "Documentation"
+#~ msgstr "Dokumentation"
+
+#~ msgid "Edit \"%(plugin_name)s\" form element"
+#~ msgstr "Bearbeite \"%(plugin_name)s\" Formularelement"
+
+#~ msgid "Change form elements"
+#~ msgstr "Ändere Formularelement"
+
+#~ msgid "Add form element"
+#~ msgstr "Füge Formularelement hinzu"
+
+#~ msgid "Change form handlers"
+#~ msgstr "Ändere Formularübergabe"
+
+#~ msgid "Add form handler"
+#~ msgstr "Füge Formularübergabe hinzu"
+
+#~ msgid "Info"
+#~ msgstr "Info"
+
+#~ msgid "Change form properties"
+#~ msgstr "Ändere Formulareigenschaften"
+
+#~ msgid "Save"
+#~ msgstr "Speichern"
+
+#~ msgid "Edit \"%(plugin_name)s\" form handler"
+#~ msgstr "Bearbeite \"%(plugin_name)s\" Formularübergabe"
+
+#~ msgid "Edit multiple objects"
+#~ msgstr "Bearbeite mehrere Objekte"
+
+#~ msgid "Add"
+#~ msgstr "Hinzufügen"
+
+#~ msgid "Create form entry"
+#~ msgstr "Formular erstellen"
+
+#~ msgid "Edit \"%(plugin_name)s\" element of the form"
+#~ msgstr "Bearbeite \"%(plugin_name)s\" Element des Formulars"
+
+#~ msgid "Edit form entry"
+#~ msgstr "Bearbeite Formulareintrag"
+
+#~ msgid "View"
+#~ msgstr "Ansicht"
+
+#~ msgid "Edit \"%(plugin_name)s\" handler of the form"
+#~ msgstr "Bearbeite \"%(plugin_name)s\" Formularübergabe dieses Formulars"
+
+#~ msgid "Form submitted!"
+#~ msgstr "Formular abgeschickt!"
+
+#~ msgid "Thank you!"
+#~ msgstr "Vielen Dank!"
+
+#~ msgid "Form submitted successfully."
+#~ msgstr "Formular erfolgreich abgeschickt."
+
+#~ msgid "View form"
+#~ msgstr "Formular betrachten"
+
+#~ msgid "Help"
+#~ msgstr "Hilfe"
+
+#~ msgid "Log in"
+#~ msgstr "Einloggen"
diff --git a/examples/simple/locale/hy/LC_MESSAGES/django.po b/examples/simple/locale/hy/LC_MESSAGES/django.po
index 8200ad32..da72757a 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: 2015-02-13 00:52+0100\n"
+"POT-Creation-Date: 2015-02-27 23:38+0100\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.mo b/examples/simple/locale/nl/LC_MESSAGES/django.mo
index 2cc15b6c..4c41ddc0 100644
Binary files a/examples/simple/locale/nl/LC_MESSAGES/django.mo and b/examples/simple/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/examples/simple/locale/nl/LC_MESSAGES/django.po b/examples/simple/locale/nl/LC_MESSAGES/django.po
index 2e298e2a..6c8a923c 100644
--- a/examples/simple/locale/nl/LC_MESSAGES/django.po
+++ b/examples/simple/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: 2015-02-13 00:52+0100\n"
-"PO-Revision-Date: 2014-11-05 02:29+0100\n"
+"POT-Creation-Date: 2015-02-27 23:49+0100\n"
+"PO-Revision-Date: 2015-02-27 23:52+0100\n"
"Last-Translator: Artur Barseghyan \n"
"Language-Team: LANGUAGE \n"
"Language: Dutch\n"
@@ -37,19 +37,23 @@ msgstr ""
msgid "German"
msgstr ""
-#: settings.py:306 settings.py:320
+#: settings.py:306
+#: settings.py:320
msgid "Custom bootstrap3 embed form view template"
msgstr ""
-#: settings.py:312 settings.py:326
+#: settings.py:312
+#: settings.py:326
msgid "Custom bootstrap3 embed form entry submitted template"
msgstr ""
-#: settings.py:342 settings.py:356
+#: settings.py:342
+#: settings.py:356
msgid "Custom foundation5 embed form view template"
msgstr ""
-#: settings.py:348 settings.py:362
+#: settings.py:348
+#: settings.py:362
msgid "Custom foundation5 embed form entry submitted template"
msgstr ""
@@ -57,43 +61,53 @@ msgstr ""
msgid "© django-fobi example site 2014"
msgstr ""
-#: admin_tools_dashboard/__init__.py:29 admin_tools_dashboard/menu.py:28
+#: admin_tools_dashboard/__init__.py:29
+#: admin_tools_dashboard/menu.py:28
msgid "Foo"
msgstr ""
-#: admin_tools_dashboard/__init__.py:37 admin_tools_dashboard/menu.py:34
+#: admin_tools_dashboard/__init__.py:37
+#: admin_tools_dashboard/menu.py:34
msgid "Fobi"
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 "Plugins"
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 "Forms"
msgstr ""
-#: admin_tools_dashboard/__init__.py:42 admin_tools_dashboard/menu.py:38
+#: admin_tools_dashboard/__init__.py:42
+#: admin_tools_dashboard/menu.py:38
msgid "Data"
msgstr ""
-#: admin_tools_dashboard/__init__.py:49 admin_tools_dashboard/menu.py:45
+#: admin_tools_dashboard/__init__.py:49
+#: admin_tools_dashboard/menu.py:45
msgid "FeinCMS Pages"
msgstr ""
-#: admin_tools_dashboard/__init__.py:58 admin_tools_dashboard/menu.py:52
+#: admin_tools_dashboard/__init__.py:58
+#: admin_tools_dashboard/menu.py:52
msgid "DjangoCMS Pages"
msgstr ""
-#: admin_tools_dashboard/__init__.py:66 admin_tools_dashboard/menu.py:58
+#: admin_tools_dashboard/__init__.py:66
+#: admin_tools_dashboard/menu.py:58
msgid "Administration"
msgstr ""
-#: admin_tools_dashboard/__init__.py:73 admin_tools_dashboard/__init__.py:87
+#: admin_tools_dashboard/__init__.py:73
+#: admin_tools_dashboard/__init__.py:87
msgid "Recent Actions"
msgstr ""
-#: admin_tools_dashboard/menu.py:24 templates/home/base.html:38
+#: admin_tools_dashboard/menu.py:24
+#: templates/home/base.html:38
#: templates/home/foundation5.html:32
msgid "Dashboard"
msgstr ""
@@ -137,7 +151,8 @@ msgstr ""
msgid "DjangoCMS Foundation 5 example"
msgstr ""
-#: templates/cms_page/foundation5/base.html:99 templates/home/base.html:12
+#: templates/cms_page/foundation5/base.html:99
+#: templates/home/base.html:12
msgid "Home"
msgstr ""
@@ -155,26 +170,26 @@ msgid ""
" template for rendering the form for the theme %(fobi_theme_uid)s given."
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 ""
-#: templates/home/base.html:30 templates/home/foundation5.html:24
+#: templates/home/base.html:30
+#: templates/home/foundation5.html:24
msgid "Learn more"
msgstr ""
@@ -182,15 +197,14 @@ 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"
-" \n"
+" \n"
" "
msgstr ""
-#: 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 ""
@@ -198,14 +212,13 @@ msgstr ""
#, python-format
msgid ""
"\n"
-" Create your first form using awesome user-friendly GUI. Choose what "
-"to do with the posted data.
\n"
-" \n"
+" Create your first form using awesome user-friendly GUI. Choose what to do with the posted data.
\n"
+" \n"
" "
msgstr ""
-#: 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 ""
@@ -213,11 +226,9 @@ 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"
-" \n"
+" \n"
" "
msgstr ""
@@ -225,11 +236,9 @@ 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"
-" \n"
+" \n"
" "
msgstr ""
@@ -237,10 +246,8 @@ msgstr ""
#, python-format
msgid ""
"\n"
-" Create your first form using awesome user-friendly GUI. Choose what "
-"to do with the posted data.
\n"
-" \n"
+" Create your first form using awesome user-friendly GUI. Choose what to do with the posted data.
\n"
+" \n"
" "
msgstr ""
@@ -248,11 +255,9 @@ 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"
-" \n"
+" \n"
" "
msgstr ""
@@ -273,23 +278,19 @@ 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 ""
@@ -301,15 +302,13 @@ 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"
@@ -356,7 +355,8 @@ 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 ""
@@ -432,12 +432,10 @@ 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 ""
@@ -460,8 +458,7 @@ 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 ""
@@ -487,3 +484,4 @@ msgstr ""
#: templates/registration/registration_form_ajax.html:12
msgid "Send activation email"
msgstr ""
+
diff --git a/examples/simple/locale/ru/LC_MESSAGES/django.mo b/examples/simple/locale/ru/LC_MESSAGES/django.mo
index ce74f528..57ba03f0 100644
Binary files a/examples/simple/locale/ru/LC_MESSAGES/django.mo and b/examples/simple/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/examples/simple/locale/ru/LC_MESSAGES/django.po b/examples/simple/locale/ru/LC_MESSAGES/django.po
index 3c56c45b..9868fdf7 100644
--- a/examples/simple/locale/ru/LC_MESSAGES/django.po
+++ b/examples/simple/locale/ru/LC_MESSAGES/django.po
@@ -7,16 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-13 00:52+0100\n"
-"PO-Revision-Date: 2014-11-05 02:28+0100\n"
+"POT-Creation-Date: 2015-02-27 23:49+0100\n"
+"PO-Revision-Date: 2015-02-27 23:52+0100\n"
"Last-Translator: Artur Barseghyan \n"
"Language-Team: LANGUAGE \n"
"Language: Russian\n"
"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"
@@ -38,19 +37,23 @@ msgstr ""
msgid "German"
msgstr ""
-#: settings.py:306 settings.py:320
+#: settings.py:306
+#: settings.py:320
msgid "Custom bootstrap3 embed form view template"
msgstr ""
-#: settings.py:312 settings.py:326
+#: settings.py:312
+#: settings.py:326
msgid "Custom bootstrap3 embed form entry submitted template"
msgstr ""
-#: settings.py:342 settings.py:356
+#: settings.py:342
+#: settings.py:356
msgid "Custom foundation5 embed form view template"
msgstr ""
-#: settings.py:348 settings.py:362
+#: settings.py:348
+#: settings.py:362
msgid "Custom foundation5 embed form entry submitted template"
msgstr ""
@@ -58,43 +61,53 @@ msgstr ""
msgid "© django-fobi example site 2014"
msgstr "© пример django-fobi сайта 2014"
-#: admin_tools_dashboard/__init__.py:29 admin_tools_dashboard/menu.py:28
+#: admin_tools_dashboard/__init__.py:29
+#: admin_tools_dashboard/menu.py:28
msgid "Foo"
msgstr ""
-#: admin_tools_dashboard/__init__.py:37 admin_tools_dashboard/menu.py:34
+#: admin_tools_dashboard/__init__.py:37
+#: admin_tools_dashboard/menu.py:34
msgid "Fobi"
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 "Plugins"
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 "Forms"
msgstr ""
-#: admin_tools_dashboard/__init__.py:42 admin_tools_dashboard/menu.py:38
+#: admin_tools_dashboard/__init__.py:42
+#: admin_tools_dashboard/menu.py:38
msgid "Data"
msgstr ""
-#: admin_tools_dashboard/__init__.py:49 admin_tools_dashboard/menu.py:45
+#: admin_tools_dashboard/__init__.py:49
+#: admin_tools_dashboard/menu.py:45
msgid "FeinCMS Pages"
msgstr ""
-#: admin_tools_dashboard/__init__.py:58 admin_tools_dashboard/menu.py:52
+#: admin_tools_dashboard/__init__.py:58
+#: admin_tools_dashboard/menu.py:52
msgid "DjangoCMS Pages"
msgstr ""
-#: admin_tools_dashboard/__init__.py:66 admin_tools_dashboard/menu.py:58
+#: admin_tools_dashboard/__init__.py:66
+#: admin_tools_dashboard/menu.py:58
msgid "Administration"
msgstr ""
-#: admin_tools_dashboard/__init__.py:73 admin_tools_dashboard/__init__.py:87
+#: admin_tools_dashboard/__init__.py:73
+#: admin_tools_dashboard/__init__.py:87
msgid "Recent Actions"
msgstr ""
-#: admin_tools_dashboard/menu.py:24 templates/home/base.html:38
+#: admin_tools_dashboard/menu.py:24
+#: templates/home/base.html:38
#: templates/home/foundation5.html:32
msgid "Dashboard"
msgstr ""
@@ -138,7 +151,8 @@ msgstr ""
msgid "DjangoCMS Foundation 5 example"
msgstr ""
-#: templates/cms_page/foundation5/base.html:99 templates/home/base.html:12
+#: templates/cms_page/foundation5/base.html:99
+#: templates/home/base.html:12
msgid "Home"
msgstr ""
@@ -156,37 +170,34 @@ msgid ""
" template for rendering the form for the theme %(fobi_theme_uid)s given."
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 "Узнать подробнее"
@@ -194,22 +205,19 @@ 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"
-" \n"
+" \n"
" "
msgstr ""
"\n"
-" Приборная панель `Fobi`, в которой вы можете просмотреть ранее "
-"созданные формы изменить их (добавить/удалить элементы,\n"
+"
Приборная панель `Fobi`, в которой вы можете просмотреть ранее созданные формы изменить их (добавить/удалить элементы,\n"
" обработчики), создать новые формы или удалить существующие.
\n"
-" \n"
+" \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 "Создать форму"
@@ -217,20 +225,17 @@ msgstr "Создать форму"
#, python-format
msgid ""
"\n"
-" Create your first form using awesome user-friendly GUI. Choose what "
-"to do with the posted data.
\n"
-" \n"
+" Create your first form using awesome user-friendly GUI. Choose what to do with the posted data.
\n"
+" \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 "Перейти к административной части"
@@ -238,67 +243,52 @@ 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"
-" \n"
+" \n"
" "
msgstr ""
"\n"
-" Используйте Django-admin для просмотра сохраненных данных, а также "
-"для распределения доступа \n"
-" к тому или иному `Fobi` плагину (элемента- или обработчика- формы).\n"
-"
\n"
+" Используйте Django-admin для просмотра сохраненных данных, а также для распределения доступа \n"
+" к тому или иному `Fobi` плагину (элемента- или обработчика- формы).
\n"
+" \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"
-" \n"
+" \n"
" "
msgstr ""
"\n"
-" Приборная панель `Fobi`, в которой вы можете просмотреть ранее "
-"созданные формы изменить их (добавить/удалить элементы,\n"
+"
Приборная панель `Fobi`, в которой вы можете просмотреть ранее созданные формы изменить их (добавить/удалить элементы,\n"
" обработчики), создать новые формы или удалить существующие.
\n"
-" \n"
+" \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"
-" \n"
+" Create your first form using awesome user-friendly GUI. Choose what to do with the posted data.
\n"
+" \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"
-" \n"
+" \n"
" "
msgstr ""
@@ -319,23 +309,19 @@ 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 ""
@@ -347,15 +333,13 @@ 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"
@@ -402,7 +386,8 @@ 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 ""
@@ -478,12 +463,10 @@ 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 ""
@@ -506,8 +489,7 @@ 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 ""
@@ -533,3 +515,4 @@ msgstr ""
#: templates/registration/registration_form_ajax.html:12
msgid "Send activation email"
msgstr ""
+
diff --git a/examples/simple/settings.py b/examples/simple/settings.py
index a20a890c..87daa0e3 100644
--- a/examples/simple/settings.py
+++ b/examples/simple/settings.py
@@ -220,7 +220,7 @@ INSTALLED_APPS = (
'fobi.contrib.plugins.form_elements.fields.select',
'fobi.contrib.plugins.form_elements.fields.select_model_object',
'fobi.contrib.plugins.form_elements.fields.select_multiple',
- #'fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects',
+ 'fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects',
'fobi.contrib.plugins.form_elements.fields.text',
'fobi.contrib.plugins.form_elements.fields.textarea',
'fobi.contrib.plugins.form_elements.fields.url',
diff --git a/scripts/compile_messages.sh b/scripts/compile_messages.sh
new file mode 100755
index 00000000..064f3662
--- /dev/null
+++ b/scripts/compile_messages.sh
@@ -0,0 +1,16 @@
+#cd ..
+echo 'Compiling messages for django-fobi...'
+cd src/fobi/
+#django-admin.py compilemessages -l hy
+django-admin.py compilemessages -l de
+django-admin.py compilemessages -l nl
+django-admin.py compilemessages -l ru
+
+echo 'Compiling messages for example projects...'
+cd ../../examples/simple/
+#django-admin.py compilemessages -l hy
+django-admin.py compilemessages -l de
+django-admin.py compilemessages -l nl
+django-admin.py compilemessages -l ru
+
+#cd ../../scripts
\ No newline at end of file
diff --git a/scripts/install_django16.sh b/scripts/install_django16.sh
new file mode 100755
index 00000000..73e77dd9
--- /dev/null
+++ b/scripts/install_django16.sh
@@ -0,0 +1,11 @@
+#pip install -r examples/requirements.txt --allow-all-external --allow-unverified django-admin-tools
+#cd ..
+pip install -r examples/requirements_django16.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 --traceback -v 3
+python examples/simple/manage.py syncdb --noinput --traceback -v 3
+python examples/simple/manage.py migrate --noinput --traceback -v 3
+python examples/simple/manage.py fobi_create_test_data --traceback -v 3
+#cd scripts
\ No newline at end of file
diff --git a/scripts/make_messages.sh b/scripts/make_messages.sh
index fae70e30..f6b7fb7b 100755
--- a/scripts/make_messages.sh
+++ b/scripts/make_messages.sh
@@ -1,13 +1,15 @@
#cd ..
echo 'Making messages for django-fobi...'
cd src/fobi/
-django-admin.py makemessages -l hy
+#django-admin.py makemessages -l hy
+django-admin.py makemessages -l de
django-admin.py makemessages -l nl
django-admin.py makemessages -l ru
echo 'Making messages for example projects...'
cd ../../examples/simple/
-django-admin.py makemessages -l hy
+#django-admin.py makemessages -l hy
+django-admin.py makemessages -l de
django-admin.py makemessages -l nl
django-admin.py makemessages -l ru
diff --git a/scripts/reinstall_django16.sh b/scripts/reinstall_django16.sh
new file mode 100755
index 00000000..4376355c
--- /dev/null
+++ b/scripts/reinstall_django16.sh
@@ -0,0 +1,3 @@
+reset
+./scripts/uninstall.sh
+./scripts/install_django16.sh
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 982cf658..47eb830a 100644
--- a/setup.py
+++ b/setup.py
@@ -63,7 +63,7 @@ for static_dir in static_dirs:
for locale_dir in locale_dirs:
locale_files += [os.path.join(locale_dir, f) for f in os.listdir(locale_dir)]
-version = '0.4.20'
+version = '0.4.21'
install_requires = [
'Pillow>=2.0.0',
diff --git a/src/fobi/__init__.py b/src/fobi/__init__.py
index e5c18c05..c8b9055c 100644
--- a/src/fobi/__init__.py
+++ b/src/fobi/__init__.py
@@ -1,6 +1,6 @@
__title__ = 'django-fobi'
-__version__ = '0.4.20'
-__build__ = 0x000023
+__version__ = '0.4.21'
+__build__ = 0x000024
__author__ = 'Artur Barseghyan '
__copyright__ = '2014-2015 Artur Barseghyan'
__license__ = 'GPL 2.0/LGPL 2.1'
diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/README.rst b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/README.rst
index e0a1d5f0..481b64d1 100644
--- a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/README.rst
+++ b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/README.rst
@@ -26,7 +26,8 @@ Installation
3. Assign appropriate permissions to the target users/groups to be using
the plugin if ``FOBI_RESTRICT_PLUGIN_ACCESS`` is set to True.
-4. Make sure to take a look at ``fobi.contrib.plugins.form_elements.fields.select_model_object.defaults.IGNORED_MODELS``.
+4. Make sure to take a look at
+ ``fobi.contrib.plugins.form_elements.fields.select_model_object.defaults.IGNORED_MODELS``.
If necessary, override it in your `settings` as shown in the example below:
.. code-block:: python
diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/conf.py b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/conf.py
index 88fa3d35..8ba07709 100644
--- a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/conf.py
+++ b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/conf.py
@@ -10,13 +10,15 @@ from fobi.contrib.plugins.form_elements.fields.select_model_object import defaul
def get_setting(setting, override=None):
"""
- Get a setting from `fobi.contrib.plugins.form_elements.fields.select_model_object`
- conf module, falling back to the default.
+ Get a setting from
+ `fobi.contrib.plugins.form_elements.fields.select_model_object` conf
+ module, falling back to the default.
If override is not None, it will be used instead of the setting.
:param setting: String with setting name
- :param override: Value to use when no setting is available. Defaults to None.
+ :param override: Value to use when no setting is available. Defaults
+ to None.
:return: Setting value.
"""
if override is not None:
diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/fobi_form_elements.py
index 7c7bf994..2f521d5b 100644
--- a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/fobi_form_elements.py
+++ b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/fobi_form_elements.py
@@ -1,6 +1,6 @@
__title__ = 'fobi.contrib.plugins.form_elements.fields.select_model_object.fobi_form_elements'
__author__ = 'Artur Barseghyan '
-__copyright__ = 'Copyright (c) 2014 Artur Barseghyan'
+__copyright__ = 'Copyright (c) 2014-2015 Artur Barseghyan'
__license__ = 'GPL 2.0/LGPL 2.1'
__all__ = ('SelectModelObjectInputPlugin',)
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 7601f85e..f53c8bca 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
@@ -1,6 +1,6 @@
__title__ = 'fobi.contrib.plugins.form_elements.fields.select_model_object.forms'
__author__ = 'Artur Barseghyan '
-__copyright__ = 'Copyright (c) 2014 Artur Barseghyan'
+__copyright__ = 'Copyright (c) 2014-2015 Artur Barseghyan'
__license__ = 'GPL 2.0/LGPL 2.1'
__all__ = ('SelectModelObjectInputForm',)
diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/README.rst b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/README.rst
index e69de29b..5e6c98cc 100644
--- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/README.rst
+++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/README.rst
@@ -0,0 +1,40 @@
+=======================================================================
+fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects
+=======================================================================
+A ``Fobi`` Select Model Object form field plugin. Makes use of the
+``django.forms.models.ModelMultipleChoiceField`` and
+``django.forms.widgets.SelectMultiple``.
+
+Installation
+===============================================
+1. Add
+ ``fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects``
+ to the ``INSTALLED_APPS`` in your ``settings.py``.
+
+.. code-block:: python
+
+ INSTALLED_APPS = (
+ # ...
+ 'fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects',
+ # ...
+ )
+
+2. In the terminal type:
+
+.. code-block:: none
+
+ $ ./manage.py fobi_sync_plugins
+
+3. Assign appropriate permissions to the target users/groups to be using
+ the plugin if ``FOBI_RESTRICT_PLUGIN_ACCESS`` is set to True.
+
+4. Make sure to take a look at
+ ``fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects.defaults.IGNORED_MODELS``.
+ If necessary, override it in your `settings` as shown in the example below:
+
+.. code-block:: python
+
+ FOBI_FORM_ELEMENT_SELECT_MULTIPLE_MODEL_OBJECTS_IGNORED_MODELS = [
+ 'auth.User',
+ 'auth.Group',
+ ]
diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/__init__.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/__init__.py
index 9fde8b09..69dcc1e2 100644
--- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/__init__.py
+++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/__init__.py
@@ -1,6 +1,6 @@
__title__ = 'fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects'
__author__ = 'Artur Barseghyan '
-__copyright__ = 'Copyright (c) 2014 Artur Barseghyan'
+__copyright__ = 'Copyright (c) 2014-2015 Artur Barseghyan'
__license__ = 'GPL 2.0/LGPL 2.1'
__all__ = ('default_app_config', 'UID',)
diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/conf.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/conf.py
index 6b72a3ef..45401829 100644
--- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/conf.py
+++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/conf.py
@@ -1,6 +1,6 @@
__title__ = 'fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects.conf'
__author__ = 'Artur Barseghyan '
-__copyright__ = 'Copyright (c) 2014 Artur Barseghyan'
+__copyright__ = 'Copyright (c) 2014-2015 Artur Barseghyan'
__license__ = 'GPL 2.0/LGPL 2.1'
__all__ = ('get_setting',)
@@ -10,13 +10,15 @@ from fobi.contrib.plugins.form_elements.fields.select_model_object import defaul
def get_setting(setting, override=None):
"""
- Get a setting from `fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects`
+ Get a setting from
+ `fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects`
conf module, falling back to the default.
If override is not None, it will be used instead of the setting.
:param setting: String with setting name
- :param override: Value to use when no setting is available. Defaults to None.
+ :param override: Value to use when no setting is available. Defaults
+ to None.
:return: Setting value.
"""
if override is not None:
diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/defaults.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/defaults.py
index 3a16eb50..063e7776 100644
--- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/defaults.py
+++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/defaults.py
@@ -1,6 +1,6 @@
__title__ = 'fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects.default'
__author__ = 'Artur Barseghyan '
-__copyright__ = 'Copyright (c) 2014 Artur Barseghyan'
+__copyright__ = 'Copyright (c) 2014-2015 Artur Barseghyan'
__license__ = 'GPL 2.0/LGPL 2.1'
__all__ = ('IGNORED_MODELS',)
diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py
index 0643a78e..7c7e0770 100644
--- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py
+++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py
@@ -1,16 +1,18 @@
__title__ = 'fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects.fobi_form_elements'
__author__ = 'Artur Barseghyan '
-__copyright__ = 'Copyright (c) 2014 Artur Barseghyan'
+__copyright__ = 'Copyright (c) 2014-2015 Artur Barseghyan'
__license__ = 'GPL 2.0/LGPL 2.1'
__all__ = ('SelectMultipleModelObjectsInputPlugin',)
+import json
+
from django.db import models
-from django.forms.models import ModelChoiceField
+from django.forms.models import ModelMultipleChoiceField
from django.forms.widgets import SelectMultiple
from django.utils.translation import ugettext_lazy as _
from fobi.base import FormFieldPlugin, form_element_plugin_registry, get_theme
-from fobi.helpers import admin_change_url
+from fobi.helpers import safe_text #, admin_change_url
from fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects \
import UID
from fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects.forms import (
@@ -45,9 +47,9 @@ class SelectMultipleModelObjectsInputPlugin(FormFieldPlugin):
'widget': SelectMultiple(attrs={'class': theme.form_element_html_class}),
}
- return [(self.data.name, ModelChoiceField, kwargs)]
+ return [(self.data.name, ModelMultipleChoiceField, kwargs)]
- def __submit_plugin_form_data(self, form_entry, request, form):
+ def submit_plugin_form_data(self, form_entry, request, form):
"""
Submit plugin form data/process.
@@ -56,21 +58,26 @@ class SelectMultipleModelObjectsInputPlugin(FormFieldPlugin):
:param django.forms.Form form:
"""
# Get the object
- obj = form.cleaned_data.get(self.data.name, None)
+ objs = form.cleaned_data.get(self.data.name, [])
- if obj:
- # Handle the upload
- admin_url = admin_change_url(
- app_label = obj._meta.app_label,
- module_name = obj._meta.module_name,
- object_id = obj.pk
- )
- repr = '{1}'.format(admin_url, str(obj))
+ values = []
- # Overwrite ``cleaned_data`` of the ``form`` with object qualifier.
- form.cleaned_data[self.data.name] = repr
+ for obj in objs:
+ if objs:
+ # Handle the submitted form value
+ value = '{0}.{1}.{2}.{3}'.format(
+ obj._meta.app_label,
+ obj._meta.module_name,
+ obj.pk,
+ safe_text(obj)
+ )
+ values.append(value)
- # It's critically important to return the ``form`` with updated ``cleaned_data``
+ # Overwrite ``cleaned_data`` of the ``form`` with object qualifier.
+ form.cleaned_data[self.data.name] = json.dumps(values)
+
+ # It's critically important to return the ``form`` with updated
+ # ``cleaned_data``
return form
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 5d9c1326..de161645 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
@@ -1,6 +1,6 @@
__title__ = 'fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects.forms'
__author__ = 'Artur Barseghyan '
-__copyright__ = 'Copyright (c) 2014 Artur Barseghyan'
+__copyright__ = 'Copyright (c) 2014-2015 Artur Barseghyan'
__license__ = 'GPL 2.0/LGPL 2.1'
__all__ = ('SelectMultipleModelObjectsInputForm',)
@@ -66,4 +66,4 @@ class SelectMultipleModelObjectsInputForm(forms.Form, BaseFormFieldPluginForm):
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/select_multiple_model_objects/settings.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/settings.py
index 82aafdad..7291e6ed 100644
--- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/settings.py
+++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/settings.py
@@ -1,9 +1,10 @@
__title__ = 'fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects.settings'
__author__ = 'Artur Barseghyan '
-__copyright__ = 'Copyright (c) 2014 Artur Barseghyan'
+__copyright__ = 'Copyright (c) 2014-2015 Artur Barseghyan'
__license__ = 'GPL 2.0/LGPL 2.1'
__all__ = ('IGNORED_MODELS',)
-from fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects.conf import get_setting
+from fobi.contrib.plugins.form_elements.fields.select_multiple_model_objects.conf \
+ import get_setting
IGNORED_MODELS = get_setting('IGNORED_MODELS')
diff --git a/src/fobi/integration/processors.py b/src/fobi/integration/processors.py
index e113e8d4..64d628ab 100644
--- a/src/fobi/integration/processors.py
+++ b/src/fobi/integration/processors.py
@@ -176,6 +176,9 @@ class IntegrationProcessor(object):
)
else:
+ # Providing initial form data by feeding entire GET dictionary
+ # to the form, if ``GET_PARAM_INITIAL_DATA`` is present in the
+ # GET.
kwargs = {}
if GET_PARAM_INITIAL_DATA in request.GET:
kwargs = {'initial': request.GET}
diff --git a/src/fobi/locale/de/LC_MESSAGES/django.mo b/src/fobi/locale/de/LC_MESSAGES/django.mo
index 98228485..9c3be68d 100644
Binary files a/src/fobi/locale/de/LC_MESSAGES/django.mo and b/src/fobi/locale/de/LC_MESSAGES/django.mo differ
diff --git a/src/fobi/locale/de/LC_MESSAGES/django.po b/src/fobi/locale/de/LC_MESSAGES/django.po
index 5b926390..a35b5d66 100644
--- a/src/fobi/locale/de/LC_MESSAGES/django.po
+++ b/src/fobi/locale/de/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 22:48+0100\n"
-"PO-Revision-Date: 2015-01-26 14:46+0100\n"
-"Last-Translator: Maximilian Kindshofer \n"
+"POT-Creation-Date: 2015-02-27 23:49+0100\n"
+"PO-Revision-Date: 2015-02-27 23:51+0100\n"
+"Last-Translator: Artur Barseghyan \n"
"Language-Team: Maximilian Kindshofer \n"
"Language: de\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,15 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.7.3\n"
-#: admin.py:124 admin.py:193 admin.py:226 models.py:323 models.py:351
+#: admin.py:124
+#: admin.py:193
+#: admin.py:226
+#: models.py:316
+#: models.py:344
#: contrib/apps/djangocms_integration/models.py:26
-#: contrib/apps/feincms_integration/widgets.py:40
-#: contrib/plugins/form_handlers/db_store/models.py:56
+#: contrib/apps/feincms_integration/widgets.py:30
+#: contrib/apps/mezzanine_integration/models.py:24
+#: contrib/plugins/form_handlers/db_store/models.py:47
#: contrib/plugins/form_handlers/db_store/templates/db_store/view_saved_form_data_entries.html:39
#: contrib/themes/foundation5/templates/foundation5/dashboard.html:29
#: contrib/themes/foundation5/widgets/form_handlers/db_store_foundation5_widget/templates/db_store_foundation5_widget/view_saved_form_data_entries.html:40
@@ -33,8 +38,11 @@ msgstr "Formular"
msgid "Custom"
msgstr "Angepasst"
-#: admin.py:135 models.py:85 models.py:223 models.py:271
-#: contrib/plugins/form_handlers/db_store/models.py:58
+#: admin.py:135
+#: models.py:78
+#: models.py:216
+#: models.py:264
+#: contrib/plugins/form_handlers/db_store/models.py:49
msgid "User"
msgstr "Benutzer"
@@ -42,16 +50,23 @@ msgstr "Benutzer"
msgid "Additional"
msgstr "Zusätzlich"
-#: admin.py:147 admin.py:171 admin.py:199 admin.py:266
+#: admin.py:147
+#: admin.py:171
+#: admin.py:199
+#: admin.py:266
+#: contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/base_edit.html:84
#: contrib/themes/simple/templates/simple/base_edit.html:76
msgid "Fobi"
msgstr "Fobi"
-#: admin.py:190 admin.py:223 models.py:128
+#: admin.py:190
+#: admin.py:223
+#: models.py:121
msgid "Plugin"
msgstr "Plugin"
-#: admin.py:232 models.py:479
+#: admin.py:232
+#: models.py:472
msgid "Form handler entry"
msgstr "Formularübergabe Einträge"
@@ -63,11 +78,14 @@ msgstr "{0} Plugins wurden erflgreich geändert"
msgid "POST required when changing in bulk!"
msgstr "POST benötigt bei Massenänderungen"
-#: base.py:102
+#: base.py:108
msgid "Build your forms"
msgstr "Erstelle dein Forular"
-#: base.py:515 models.py:224 models.py:272 models.py:325
+#: base.py:521
+#: models.py:217
+#: models.py:265
+#: models.py:318
#: contrib/plugins/form_elements/fields/boolean/forms.py:32
#: contrib/plugins/form_elements/fields/date/forms.py:33
#: contrib/plugins/form_elements/fields/date_drop_down/forms.py:42
@@ -88,11 +106,14 @@ msgstr "Erstelle dein Forular"
#: contrib/plugins/form_elements/fields/url/forms.py:35
#: contrib/plugins/form_elements/security/captcha/forms.py:35
#: contrib/plugins/form_elements/security/honeypot/forms.py:35
+#: contrib/plugins/form_elements/security/recaptcha/forms.py:35
+#: contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/dashboard.html:43
#: contrib/themes/simple/templates/simple/dashboard.html:42
msgid "Name"
msgstr "Name"
-#: base.py:520 contrib/plugins/form_elements/fields/boolean/forms.py:27
+#: base.py:526
+#: contrib/plugins/form_elements/fields/boolean/forms.py:27
#: contrib/plugins/form_elements/fields/date/forms.py:28
#: contrib/plugins/form_elements/fields/date_drop_down/forms.py:37
#: contrib/plugins/form_elements/fields/datetime/forms.py:28
@@ -112,10 +133,12 @@ msgstr "Name"
#: contrib/plugins/form_elements/fields/url/forms.py:30
#: contrib/plugins/form_elements/security/captcha/forms.py:30
#: contrib/plugins/form_elements/security/honeypot/forms.py:30
+#: contrib/plugins/form_elements/security/recaptcha/forms.py:30
msgid "Label"
msgstr "Label"
-#: base.py:525 contrib/plugins/form_elements/fields/boolean/forms.py:37
+#: base.py:531
+#: contrib/plugins/form_elements/fields/boolean/forms.py:37
#: contrib/plugins/form_elements/fields/date/forms.py:38
#: contrib/plugins/form_elements/fields/date_drop_down/forms.py:47
#: contrib/plugins/form_elements/fields/datetime/forms.py:38
@@ -133,10 +156,12 @@ msgstr "Label"
#: contrib/plugins/form_elements/fields/textarea/forms.py:38
#: contrib/plugins/form_elements/fields/url/forms.py:40
#: contrib/plugins/form_elements/security/captcha/forms.py:40
+#: contrib/plugins/form_elements/security/recaptcha/forms.py:40
msgid "Help text"
msgstr "Hilfetext"
-#: base.py:530 contrib/plugins/form_elements/fields/boolean/forms.py:47
+#: base.py:536
+#: contrib/plugins/form_elements/fields/boolean/forms.py:47
#: contrib/plugins/form_elements/fields/date/forms.py:53
#: contrib/plugins/form_elements/fields/date_drop_down/forms.py:72
#: contrib/plugins/form_elements/fields/datetime/forms.py:53
@@ -156,213 +181,225 @@ msgstr "Hilfetext"
#: contrib/plugins/form_elements/fields/url/forms.py:56
#: contrib/plugins/form_elements/security/captcha/forms.py:56
#: contrib/plugins/form_elements/security/honeypot/forms.py:56
+#: contrib/plugins/form_elements/security/recaptcha/forms.py:56
msgid "Required"
msgstr "Pflichtfeld"
-#: base.py:552
+#: base.py:558
msgid "Duplicate field name!"
msgstr "Feldname bereits vorhanden!"
-#: base.py:557
+#: base.py:563
msgid "Duplicate label name!"
msgstr "Labelname bereits vorhanden!"
-#: base.py:636
+#: base.py:642
msgid "General"
msgstr "Allgemein"
-#: base.py:2097
+#: base.py:2134
msgid "Theme `{0}` does not exist!"
msgstr "Theme `{0}` nicht vorhanden!"
-#: constants.py:17
+#: constants.py:18
msgid "Append"
msgstr "Hinzufügen"
-#: constants.py:18
+#: constants.py:19
msgid "Replace"
msgstr "Ersetzen"
-#: forms.py:101
+#: forms.py:108
msgid "Selected plugins"
msgstr "Plugin auswählen"
-#: forms.py:105
+#: forms.py:113
msgid "Users action"
msgstr "Benutzeraktion"
-#: forms.py:107 forms.py:113
+#: forms.py:115
+#: forms.py:122
msgid "If set to ``replace``, the groups are replaced; otherwise - appended."
msgstr "Wenn \"Ersetzen\" gewählt wurde wird die Gruppe ersetzt; Wähle anderenfalls - Hinzufügen."
-#: forms.py:111
+#: forms.py:120
msgid "Groups action"
msgstr "Gruppenaktion"
-#: models.py:87
+#: models.py:80
msgid "Group"
msgstr "Gruppe"
-#: models.py:120 models.py:421
+#: models.py:113
+#: models.py:414
msgid "UID"
msgstr "UID"
-#: models.py:139
+#: models.py:132
msgid "Groups"
msgstr "Gruppe"
-#: models.py:150
+#: models.py:143
msgid "Users"
msgstr "Benutzer"
-#: models.py:167 models.py:198
+#: models.py:160
+#: models.py:191
msgid "Plugin UID"
msgstr "Plugin UID"
-#: models.py:174
+#: models.py:167
msgid "Form element plugin"
msgstr "Formelementplugin"
-#: models.py:175
+#: models.py:168
msgid "Form element plugins"
msgstr "Formelementplugins"
-#: models.py:205
+#: models.py:198
msgid "Form handler plugin"
msgstr "Formularübergabeplugin"
-#: models.py:206
+#: models.py:199
msgid "Form handler plugins"
msgstr "Formularübergabeplugins"
-#: models.py:225 models.py:274
+#: models.py:218
+#: models.py:267
msgid "Slug"
msgstr "Slug"
-#: models.py:228
+#: models.py:221
msgid "Is public?"
msgstr "Öffentlich?"
-#: models.py:229
+#: models.py:222
msgid "Makes your form wizard visible to the public."
msgstr "Denn Formular-Wizard öffentlich machen."
-#: models.py:232
+#: models.py:225
msgid "Is cloneable?"
msgstr "Kopierbar?"
-#: models.py:233
+#: models.py:226
msgid "Makes your form wizard cloneable by other users."
msgstr "Mache den Formular-Wizard für andere Nutzer kopierbar."
-#: models.py:237
+#: models.py:230
msgid "Form wizard entry"
msgstr "Formular-Witard-Eintrag"
-#: models.py:238
+#: models.py:231
msgid "Form wizard entries"
msgstr "Formular-Wizard-Einträge"
-#: models.py:269
+#: models.py:262
msgid "Form wizard"
msgstr "Formular-Wizard"
-#: models.py:277 contrib/themes/simple/templates/simple/dashboard.html:48
+#: models.py:270
+#: contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/dashboard.html:49
+#: contrib/themes/simple/templates/simple/dashboard.html:48
msgid "Public?"
msgstr "Öffentlich?"
-#: models.py:278
+#: models.py:271
msgid "Makes your form visible to the public."
msgstr "Veröffentlicht das Formular"
-#: models.py:281 contrib/themes/simple/templates/simple/dashboard.html:54
+#: models.py:274
msgid "Cloneable?"
msgstr "Kopierbar"
-#: models.py:282
+#: models.py:275
msgid "Makes your form cloneable by other users."
msgstr "Macht das Formular durch Nutzer kopierbar."
-#: models.py:285 models.py:445
+#: models.py:278
+#: models.py:438
msgid "Position"
msgstr "Position"
-#: models.py:288
+#: models.py:281
msgid "Success page title"
msgstr "Erfolgsseiten Titel"
-#: models.py:289
+#: models.py:282
msgid "Custom message title to display after valid form is submitted"
msgstr "Benutzerdefinierter Titel, welcher nach erfolgreicher Eingabe angezeigt wird"
-#: models.py:293
+#: models.py:286
msgid "Success page body"
msgstr "Erfolgsseiten Textkörper"
-#: models.py:294
+#: models.py:287
msgid "Custom message text to display after valid form is submitted"
msgstr "Benutzerdefinierter Text, der nach erfolgreicher Eingabe angezeigt wird"
-#: models.py:298
+#: models.py:291
msgid "Action"
msgstr "Aktion"
-#: models.py:299
+#: models.py:292
msgid "Custom form action"
msgstr "Benutzerdefinierte Formular Aktion"
-#: models.py:303
+#: models.py:296
msgid "Form entry"
msgstr "Formular"
-#: models.py:304
+#: models.py:297
msgid "Form entries"
msgstr "Formulare"
-#: models.py:327
+#: models.py:320
msgid "Is repeatable?"
msgstr "Ist Anhängbar?"
-#: models.py:328
+#: models.py:321
msgid "Makes your form fieldset repeatable."
msgstr "Macht das Formular Feldset anhängbar"
-#: models.py:332
+#: models.py:325
msgid "Form fieldset entry"
msgstr "Formular Fieldset"
-#: models.py:333
+#: models.py:326
msgid "Form fieldset entries"
msgstr "Formular Fieldsets"
-#: models.py:352 contrib/plugins/form_handlers/db_store/models.py:62
+#: models.py:345
+#: contrib/plugins/form_handlers/db_store/models.py:53
msgid "Plugin data"
msgstr "Plugindaten"
-#: models.py:440 models.py:474
+#: models.py:433
+#: models.py:467
msgid "Plugin name"
msgstr "Pluginname"
-#: models.py:443
+#: models.py:436
msgid "Form fieldset"
msgstr "Formular Fieldset"
-#: models.py:449
+#: models.py:442
msgid "Form element entry"
msgstr "Formularelement"
-#: models.py:450
+#: models.py:443
msgid "Form element entries"
msgstr "Formularelemente"
-#: models.py:480
+#: models.py:473
msgid "Form handler entries"
msgstr "Formularübegabe"
#: utils.py:329
+#: contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/dashboard.html:78
+#: contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/edit_form_entry_ajax.html:125
#: contrib/themes/foundation5/templates/foundation5/dashboard.html:43
#: contrib/themes/foundation5/templates/foundation5/edit_form_entry_ajax.html:117
-#: contrib/themes/simple/templates/simple/dashboard.html:76
+#: contrib/themes/simple/templates/simple/dashboard.html:77
#: contrib/themes/simple/templates/simple/edit_form_entry_ajax.html:124
#: templates/fobi/generic/dashboard.html:46
#: templates/fobi/generic/edit_form_entry.html:8
@@ -372,94 +409,101 @@ msgid "Edit"
msgstr "Bearbeiten"
#: utils.py:334
+#: contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/dashboard.html:83
+#: contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/edit_form_entry_ajax.html:127
#: contrib/themes/foundation5/templates/foundation5/dashboard.html:44
#: contrib/themes/foundation5/templates/foundation5/edit_form_entry_ajax.html:123
-#: contrib/themes/simple/templates/simple/dashboard.html:81
+#: contrib/themes/simple/templates/simple/dashboard.html:82
#: contrib/themes/simple/templates/simple/edit_form_entry_ajax.html:126
#: templates/fobi/generic/dashboard.html:51
#: templates/fobi/generic/edit_form_entry_ajax.html:121
msgid "Delete"
msgstr "Löschen"
-#: views.py:74
+#: views.py:75
msgid "{0} not found."
msgstr "{0} nicht gefunden."
-#: views.py:164
+#: views.py:165
msgid "Form {0} was created successfully."
msgstr "Formular {0} erfolgreich erstellt."
-#: views.py:172 views.py:279
+#: views.py:173
+#: views.py:280
msgid "Errors occured while saving the form: {0}."
msgstr "Beim speichern des Formulars {0} ist ein Fehler aufgetreten"
-#: views.py:223 views.py:357 views.py:595 views.py:815 views.py:908
-#: views.py:950
+#: views.py:224
+#: views.py:365
+#: views.py:603
+#: views.py:823
+#: views.py:934
+#: views.py:976
msgid "Form entry not found."
msgstr "Formular nicht gefunden."
-#: views.py:245
+#: views.py:246
msgid "Elements ordering edited successfully."
msgstr "Element Reihenfolge erfolgreich bearbeitet"
-#: views.py:253
+#: views.py:254
msgid "Errors occured while trying to change the elements ordering!"
msgstr "Während der Änderung der Reihenfolge ist ein Fehler aufgetreten!"
-#: views.py:271
+#: views.py:272
msgid "Form {0} was edited successfully."
msgstr "Fomular {0} erfolgreich bearbeitet."
-#: views.py:429
+#: views.py:437
msgid "The form element plugin \"{0}\" was added successfully."
msgstr "Das Fomularelementplugin \"{0}\" erfolgreich hinzuefügt."
-#: views.py:477
+#: views.py:485
msgid "Form element entry not found."
msgstr "Fomularelement nicht gefunden."
-#: views.py:489
+#: views.py:497
msgid "The form element plugin \"{0}\" is not configurable!"
msgstr "Formularelementplugin \"{0}\" ist nicht konfigurierbar!"
-#: views.py:521
+#: views.py:529
msgid "The form element plugin \"{0}\" was edited successfully."
msgstr "Formularelementplugin \"{0}\" wurde erfolgreich bearbeitet."
-#: views.py:571
+#: views.py:579
msgid "The form element plugin \"{0}\" was deleted successfully."
msgstr "Formularelementplugin \"{0}\" wurde erfolgreich gelöscht."
-#: views.py:602
+#: views.py:610
msgid "Plugin does not exist or you are not allowed to use this plugin!"
msgstr "Plugin exisitiert nicht oder keine Berechtigung zur Nutzung des Plugins!"
-#: views.py:647
+#: views.py:655
msgid "The form handler plugin \"{0}\" was added successfully."
msgstr "Das Formularübergabeplugin \"{0}\" wurde erfolgreich hinzugefügt."
-#: views.py:700
+#: views.py:708
msgid "Form handler entry not found."
msgstr "Formularübergabe nicht gefunden"
-#: views.py:713
+#: views.py:721
msgid "The form handler plugin \"{0}\" is not configurable!"
msgstr "Das Formularübergabeplugin \"{0}\" ist nicht Bearbeitbar!"
-#: views.py:736
+#: views.py:744
msgid "The form handler plugin \"{0}\" was edited successfully."
msgstr "Das Formularübergabeplugin \"{0}\" erfolgreich bearbeitet."
-#: views.py:785
+#: views.py:793
msgid "The form handler plugin \"{0}\" was deleted successfully."
msgstr "Das Formularübergabeplugin \"{0}\" erfolgreich gelöscht."
-#: views.py:863 contrib/apps/djangocms_integration/cms_plugins.py:129
-#: contrib/apps/feincms_integration/widgets.py:180
+#: views.py:876
+#: integration/processors.py:156
msgid "Form {0} was submitted successfully."
msgstr "Formular {0} wurde erfolgreich übertragen."
-#: views.py:956
+#: views.py:982
msgid "The form \"{0}\" was deleted successfully."
msgstr "Das Formular \"{0}\" wurde erfolgreich gelöscht."
@@ -471,92 +515,111 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
-#: contrib/apps/djangocms_integration/cms_plugins.py:35
-#: contrib/apps/feincms_integration/widgets.py:89
+#: contrib/apps/djangocms_integration/cms_plugins.py:27
+#: contrib/apps/feincms_integration/widgets.py:79
+#: contrib/apps/mezzanine_integration/models.py:70
+#: contrib/apps/mezzanine_integration/models.py:74
msgid "Fobi form"
msgstr "Fobi Formular"
#: contrib/apps/djangocms_integration/models.py:29
-#: contrib/apps/feincms_integration/widgets.py:43
+#: contrib/apps/feincms_integration/widgets.py:33
+#: contrib/apps/mezzanine_integration/models.py:27
msgid "Form template name"
msgstr "Formularvorlagenname"
#: contrib/apps/djangocms_integration/models.py:31
-#: contrib/apps/feincms_integration/widgets.py:45
+#: contrib/apps/feincms_integration/widgets.py:35
+#: contrib/apps/mezzanine_integration/models.py:29
msgid "Template to render the form with."
msgstr "Vorlage zur Erstellung von Formularen"
#: contrib/apps/djangocms_integration/models.py:35
-#: contrib/apps/feincms_integration/widgets.py:49
+#: contrib/apps/feincms_integration/widgets.py:39
+#: contrib/apps/mezzanine_integration/models.py:33
msgid "Hide form title"
msgstr "Titel verbergen"
#: contrib/apps/djangocms_integration/models.py:36
-#: contrib/apps/feincms_integration/widgets.py:50
+#: contrib/apps/feincms_integration/widgets.py:40
+#: contrib/apps/mezzanine_integration/models.py:34
msgid "If checked, no form title is shown."
msgstr "Wenn gewählt wird kein Formulartitel angezeigt"
#: contrib/apps/djangocms_integration/models.py:40
-#: contrib/apps/feincms_integration/widgets.py:54
+#: contrib/apps/feincms_integration/widgets.py:44
+#: contrib/apps/mezzanine_integration/models.py:38
msgid "Form title"
msgstr "Formulartitel"
#: contrib/apps/djangocms_integration/models.py:41
-#: contrib/apps/feincms_integration/widgets.py:55
+#: contrib/apps/feincms_integration/widgets.py:45
+#: contrib/apps/mezzanine_integration/models.py:39
msgid "Overrides the default form title."
msgstr "Überschreibt den Standartformulartitel"
#: contrib/apps/djangocms_integration/models.py:45
-#: contrib/apps/feincms_integration/widgets.py:59
+#: contrib/apps/feincms_integration/widgets.py:49
+#: contrib/apps/mezzanine_integration/models.py:43
msgid "Submit button text"
msgstr "Bestätigungsbutton Text"
#: contrib/apps/djangocms_integration/models.py:46
-#: contrib/apps/feincms_integration/widgets.py:60
+#: contrib/apps/feincms_integration/widgets.py:50
+#: contrib/apps/mezzanine_integration/models.py:44
msgid "Overrides the default form submit button text."
msgstr "Überschreibt den Standarttext des Besttigungsbuttons"
#: contrib/apps/djangocms_integration/models.py:50
-#: contrib/apps/feincms_integration/widgets.py:64
+#: contrib/apps/feincms_integration/widgets.py:54
+#: contrib/apps/mezzanine_integration/models.py:48
msgid "Success page template name"
msgstr "Erfolgsseitevorlagenname"
#: contrib/apps/djangocms_integration/models.py:52
-#: contrib/apps/feincms_integration/widgets.py:66
+#: contrib/apps/feincms_integration/widgets.py:56
+#: contrib/apps/mezzanine_integration/models.py:50
msgid "Template to render the success page with."
msgstr "Vorlage zur Darstellung der Erfolgsseite."
#: contrib/apps/djangocms_integration/models.py:56
-#: contrib/apps/feincms_integration/widgets.py:70
+#: contrib/apps/feincms_integration/widgets.py:60
+#: contrib/apps/mezzanine_integration/models.py:54
msgid "Hide success page title"
msgstr "Erfolgsseite verbergen"
#: contrib/apps/djangocms_integration/models.py:57
-#: contrib/apps/feincms_integration/widgets.py:71
+#: contrib/apps/feincms_integration/widgets.py:61
+#: contrib/apps/mezzanine_integration/models.py:55
msgid "If checked, no success page title is shown."
msgstr "Wenn aktiviert wird keine Erfolgsseitentitel angezeigt"
#: contrib/apps/djangocms_integration/models.py:61
-#: contrib/apps/feincms_integration/widgets.py:75
+#: contrib/apps/feincms_integration/widgets.py:65
+#: contrib/apps/mezzanine_integration/models.py:59
msgid "Succes page title"
msgstr "Erfolgsseitentitel"
#: contrib/apps/djangocms_integration/models.py:62
-#: contrib/apps/feincms_integration/widgets.py:76
+#: contrib/apps/feincms_integration/widgets.py:66
+#: contrib/apps/mezzanine_integration/models.py:60
msgid "Overrides the default success page title."
msgstr "Überschreibt den Standarterfolgsseitentitel"
#: contrib/apps/djangocms_integration/models.py:66
-#: contrib/apps/feincms_integration/widgets.py:80
+#: contrib/apps/feincms_integration/widgets.py:70
+#: contrib/apps/mezzanine_integration/models.py:64
msgid "Succes page text"
msgstr "Erfolgsseitentext"
#: contrib/apps/djangocms_integration/models.py:67
-#: contrib/apps/feincms_integration/widgets.py:81
+#: contrib/apps/feincms_integration/widgets.py:71
+#: contrib/apps/mezzanine_integration/models.py:65
msgid "Overrides the default success page text."
msgstr "Überschrebt den Standarterfolgsseitentext"
#: contrib/apps/djangocms_integration/templates/djangocms_integration/login_required.html:3
+#: templates/fobi/integration/login_required.html:3
#, python-format
msgid ""
"\n"
@@ -567,6 +630,27 @@ msgstr ""
"Sie müssen sich anmelden um den Inhalt zu sehen.\n"
"Einloggen\n"
+#: contrib/apps/mezzanine_integration/models.py:71
+#, fuzzy
+msgid "Fobi forms"
+msgstr "Fobi Formular"
+
+#: contrib/apps/mezzanine_integration/templates/mezzanine_integration/admin/change_form.html:8
+#: contrib/plugins/form_handlers/db_store/fobi_form_handlers.py:74
+#: contrib/plugins/form_handlers/db_store/templates/db_store/plugin_data_repr.html:4
+#: contrib/themes/foundation5/widgets/form_handlers/db_store_foundation5_widget/templates/db_store_foundation5_widget/plugin_data_repr.html:4
+msgid "View entries"
+msgstr "Einträge ansehen"
+
+#: contrib/apps/mezzanine_integration/templates/mezzanine_integration/admin/change_form.html:9
+msgid "History"
+msgstr ""
+
+#: contrib/apps/mezzanine_integration/templates/mezzanine_integration/admin/change_form.html:10
+#, fuzzy
+msgid "View on site"
+msgstr "Einträge ansehen"
+
#: contrib/plugins/form_elements/content/content_image/defaults.py:24
msgid "Smart crop"
msgstr "Geschicktes Zuschneiden"
@@ -654,11 +738,11 @@ msgstr "Wahr/Falsch-Schalter"
#: contrib/plugins/form_elements/fields/input/fobi_form_elements.py:23
#: contrib/plugins/form_elements/fields/integer/fobi_form_elements.py:30
#: contrib/plugins/form_elements/fields/password/fobi_form_elements.py:24
-#: contrib/plugins/form_elements/fields/radio/fobi_form_elements.py:23
-#: contrib/plugins/form_elements/fields/select/fobi_form_elements.py:23
+#: contrib/plugins/form_elements/fields/radio/fobi_form_elements.py:24
+#: contrib/plugins/form_elements/fields/select/fobi_form_elements.py:24
#: contrib/plugins/form_elements/fields/select_model_object/fobi_form_elements.py:26
-#: contrib/plugins/form_elements/fields/select_multiple/fobi_form_elements.py:25
-#: contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py:28
+#: contrib/plugins/form_elements/fields/select_multiple/fobi_form_elements.py:26
+#: contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py:30
#: 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:30
@@ -815,7 +899,7 @@ msgstr "maxima Wert"
msgid "Password"
msgstr "Passwort"
-#: contrib/plugins/form_elements/fields/radio/fobi_form_elements.py:22
+#: contrib/plugins/form_elements/fields/radio/fobi_form_elements.py:23
msgid "Radio"
msgstr "Radio-Button"
@@ -831,7 +915,7 @@ msgstr "Auswahl"
msgid "Enter single values/pairs per line. Example:
1
2
alpha, Alpha
beta, Beta
omega
It finally transforms into the following HTML code:
<select id=\"id_NAME_OF_THE_ELEMENT\" name=\"NAME_OF_THE_ELEMENT\">
<option value=\"1\">1</option>
<option value=\"2\">2</option>
<option value=\"alpha\">Alpha</option>
<option value=\"beta\">Beta</option>
<option value=\"omega\">omega</option>
</select>
1
2
alpha, Alpha
beta, Beta
omega
It finally transforms into the following HTML code:
<select id=\"id_NAME_OF_THE_ELEMENT\" name=\"NAME_OF_THE_ELEMENT\">
<option value=\"1\">1</option>
<option value=\"2\">2</option>
<option value=\"alpha\">Alpha</option>
<option value=\"beta\">Beta</option>
<option value=\"omega\">omega</option>
</select>\\d+)/$"
+msgstr ""
+
+#: urls/edit.py:29
+msgid "^forms/delete/(?P\\d+)/$"
+msgstr ""
+
+#: urls/edit.py:34
+msgid "^forms/elements/add/(?P\\d+)/(?P[\\w_\\-]+)/$"
+msgstr ""
+
+#: urls/edit.py:39
+msgid "^forms/elements/edit/(?P\\d+)/$"
+msgstr ""
+
+#: urls/edit.py:44
+msgid "^forms/elements/delete/(?P\\d+)/$"
+msgstr ""
+
+#: urls/edit.py:49
+msgid "^forms/handlers/add/(?P\\d+)/(?P[\\w_\\-]+)/$"
+msgstr ""
+
+#: urls/edit.py:54
+msgid "^forms/handlers/edit/(?P\\d+)/$"
+msgstr ""
+
+#: urls/edit.py:59
+msgid "^forms/handlers/delete/(?P\\d+)/$"
+msgstr ""
+
+#: urls/edit.py:64
+msgid "^$"
+msgstr ""
+
+#: urls/view.py:16
+msgid "^view/submitted/$"
+msgstr ""
+
+#: urls/view.py:21
+msgid "^view/(?P[\\w_\\-]+)/$"
+msgstr ""
+
+#: urls/view.py:26
+msgid "^view/(?P[\\w_\\-]+)/submitted/$"
+msgstr ""
+
+#~ msgid "Is cloneable"
+#~ msgstr "Kopierbar"
diff --git a/src/fobi/locale/hy/LC_MESSAGES/django.po b/src/fobi/locale/hy/LC_MESSAGES/django.po
index 64579e32..a0715c6a 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: 2015-02-13 00:52+0100\n"
+"POT-Creation-Date: 2015-02-27 23:37+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -64,11 +64,11 @@ msgstr ""
msgid "POST required when changing in bulk!"
msgstr ""
-#: base.py:102
+#: base.py:108
msgid "Build your forms"
msgstr ""
-#: base.py:515 models.py:217 models.py:265 models.py:318
+#: base.py:521 models.py:217 models.py:265 models.py:318
#: contrib/plugins/form_elements/fields/boolean/forms.py:32
#: contrib/plugins/form_elements/fields/date/forms.py:33
#: contrib/plugins/form_elements/fields/date_drop_down/forms.py:42
@@ -95,7 +95,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: base.py:520 contrib/plugins/form_elements/fields/boolean/forms.py:27
+#: base.py:526 contrib/plugins/form_elements/fields/boolean/forms.py:27
#: contrib/plugins/form_elements/fields/date/forms.py:28
#: contrib/plugins/form_elements/fields/date_drop_down/forms.py:37
#: contrib/plugins/form_elements/fields/datetime/forms.py:28
@@ -119,7 +119,7 @@ msgstr ""
msgid "Label"
msgstr ""
-#: base.py:525 contrib/plugins/form_elements/fields/boolean/forms.py:37
+#: base.py:531 contrib/plugins/form_elements/fields/boolean/forms.py:37
#: contrib/plugins/form_elements/fields/date/forms.py:38
#: contrib/plugins/form_elements/fields/date_drop_down/forms.py:47
#: contrib/plugins/form_elements/fields/datetime/forms.py:38
@@ -141,7 +141,7 @@ msgstr ""
msgid "Help text"
msgstr ""
-#: base.py:530 contrib/plugins/form_elements/fields/boolean/forms.py:47
+#: base.py:536 contrib/plugins/form_elements/fields/boolean/forms.py:47
#: contrib/plugins/form_elements/fields/date/forms.py:53
#: contrib/plugins/form_elements/fields/date_drop_down/forms.py:72
#: contrib/plugins/form_elements/fields/datetime/forms.py:53
@@ -165,27 +165,27 @@ msgstr ""
msgid "Required"
msgstr ""
-#: base.py:552
+#: base.py:558
msgid "Duplicate field name!"
msgstr ""
-#: base.py:557
+#: base.py:563
msgid "Duplicate label name!"
msgstr ""
-#: base.py:636
+#: base.py:642
msgid "General"
msgstr ""
-#: base.py:2128
+#: base.py:2134
msgid "Theme `{0}` does not exist!"
msgstr ""
-#: constants.py:17
+#: constants.py:18
msgid "Append"
msgstr ""
-#: constants.py:18
+#: constants.py:19
msgid "Replace"
msgstr ""
@@ -405,8 +405,8 @@ msgstr ""
msgid "Errors occured while saving the form: {0}."
msgstr ""
-#: views.py:224 views.py:365 views.py:603 views.py:823 views.py:928
-#: views.py:970
+#: views.py:224 views.py:365 views.py:603 views.py:823 views.py:934
+#: views.py:976
msgid "Form entry not found."
msgstr ""
@@ -466,11 +466,11 @@ msgstr ""
msgid "The form handler plugin \"{0}\" was deleted successfully."
msgstr ""
-#: views.py:876 integration/processors.py:155
+#: views.py:876 integration/processors.py:156
msgid "Form {0} was submitted successfully."
msgstr ""
-#: views.py:976
+#: views.py:982
msgid "The form \"{0}\" was deleted successfully."
msgstr ""
@@ -704,7 +704,7 @@ msgstr ""
#: contrib/plugins/form_elements/fields/select/fobi_form_elements.py:24
#: contrib/plugins/form_elements/fields/select_model_object/fobi_form_elements.py:26
#: contrib/plugins/form_elements/fields/select_multiple/fobi_form_elements.py:26
-#: contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py:28
+#: contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py:30
#: 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:30
@@ -907,7 +907,7 @@ msgstr ""
msgid "Select multiple"
msgstr ""
-#: contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py:27
+#: contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py:29
msgid "Select multiple model objects"
msgstr ""
diff --git a/src/fobi/locale/nl/LC_MESSAGES/django.mo b/src/fobi/locale/nl/LC_MESSAGES/django.mo
index a2fe8b96..119fa553 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 b2a29afa..c619f9ed 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: 2015-02-13 00:52+0100\n"
-"PO-Revision-Date: 2015-02-13 01:07+0100\n"
+"POT-Creation-Date: 2015-02-27 23:49+0100\n"
+"PO-Revision-Date: 2015-02-27 23:51+0100\n"
"Last-Translator: Artur Barseghyan \n"
"Language-Team: LANGUAGE \n"
"Language: Dutch\n"
@@ -77,11 +77,11 @@ msgstr "{0} plugins zijn succesvol bijgewerkt."
msgid "POST required when changing in bulk!"
msgstr "POST vereist bij het veranderen in bulk!"
-#: base.py:102
+#: base.py:108
msgid "Build your forms"
msgstr "Bouw je formulieren"
-#: base.py:515
+#: base.py:521
#: models.py:217
#: models.py:265
#: models.py:318
@@ -111,7 +111,7 @@ msgstr "Bouw je formulieren"
msgid "Name"
msgstr "Naam"
-#: base.py:520
+#: base.py:526
#: contrib/plugins/form_elements/fields/boolean/forms.py:27
#: contrib/plugins/form_elements/fields/date/forms.py:28
#: contrib/plugins/form_elements/fields/date_drop_down/forms.py:37
@@ -136,7 +136,7 @@ msgstr "Naam"
msgid "Label"
msgstr "Label"
-#: base.py:525
+#: base.py:531
#: contrib/plugins/form_elements/fields/boolean/forms.py:37
#: contrib/plugins/form_elements/fields/date/forms.py:38
#: contrib/plugins/form_elements/fields/date_drop_down/forms.py:47
@@ -159,7 +159,7 @@ msgstr "Label"
msgid "Help text"
msgstr "Helptekst"
-#: base.py:530
+#: base.py:536
#: contrib/plugins/form_elements/fields/boolean/forms.py:47
#: contrib/plugins/form_elements/fields/date/forms.py:53
#: contrib/plugins/form_elements/fields/date_drop_down/forms.py:72
@@ -184,27 +184,27 @@ msgstr "Helptekst"
msgid "Required"
msgstr "Verplicht"
-#: base.py:552
+#: base.py:558
msgid "Duplicate field name!"
msgstr "Veldnaam is al in gebruik!"
-#: base.py:557
+#: base.py:563
msgid "Duplicate label name!"
msgstr "Labelnaam is al in gebruik!"
-#: base.py:636
+#: base.py:642
msgid "General"
msgstr "Algemeen"
-#: base.py:2128
+#: base.py:2134
msgid "Theme `{0}` does not exist!"
msgstr "Theme `{0}` niet gevonden!"
-#: constants.py:17
+#: constants.py:18
msgid "Append"
msgstr "Toevoegen"
-#: constants.py:18
+#: constants.py:19
msgid "Replace"
msgstr "Vervangen"
@@ -436,8 +436,8 @@ msgstr "Er zijn fouten opgetreden tijdens het opslaan van het formulier: {0}."
#: views.py:365
#: views.py:603
#: views.py:823
-#: views.py:928
-#: views.py:970
+#: views.py:934
+#: views.py:976
msgid "Form entry not found."
msgstr "Formulier niet gevonden."
@@ -498,11 +498,11 @@ msgid "The form handler plugin \"{0}\" was deleted successfully."
msgstr "Het formulier afhandelaar \"{0}\" is met succes verwijdert."
#: views.py:876
-#: integration/processors.py:155
+#: integration/processors.py:156
msgid "Form {0} was submitted successfully."
msgstr "Formulier {0} is met succes verstuurd."
-#: views.py:976
+#: views.py:982
msgid "The form \"{0}\" was deleted successfully."
msgstr "Het formulier \"{0}\" is met succes verwijdert."
@@ -739,7 +739,7 @@ msgstr "Selectievakje"
#: contrib/plugins/form_elements/fields/select/fobi_form_elements.py:24
#: contrib/plugins/form_elements/fields/select_model_object/fobi_form_elements.py:26
#: contrib/plugins/form_elements/fields/select_multiple/fobi_form_elements.py:26
-#: contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py:28
+#: contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py:30
#: 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:30
@@ -929,7 +929,7 @@ msgstr "Model"
msgid "Select multiple"
msgstr "Keuzelijst meerkeuze"
-#: contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py:27
+#: contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py:29
msgid "Select multiple model objects"
msgstr "Keuzelijst meerkeuze model objecten"
diff --git a/src/fobi/locale/ru/LC_MESSAGES/django.mo b/src/fobi/locale/ru/LC_MESSAGES/django.mo
index d39fe29c..aae5d8fe 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 33312836..fc888e57 100644
--- a/src/fobi/locale/ru/LC_MESSAGES/django.po
+++ b/src/fobi/locale/ru/LC_MESSAGES/django.po
@@ -7,18 +7,21 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-13 00:52+0100\n"
-"PO-Revision-Date: 2014-12-05 22:57+0100\n"
+"POT-Creation-Date: 2015-02-27 23:49+0100\n"
+"PO-Revision-Date: 2015-02-27 23:51+0100\n"
"Last-Translator: Artur Barseghyan \n"
"Language-Team: LANGUAGE \n"
"Language: Russian\n"
"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"
-#: admin.py:124 admin.py:193 admin.py:226 models.py:316 models.py:344
+#: admin.py:124
+#: admin.py:193
+#: admin.py:226
+#: models.py:316
+#: models.py:344
#: contrib/apps/djangocms_integration/models.py:26
#: contrib/apps/feincms_integration/widgets.py:30
#: contrib/apps/mezzanine_integration/models.py:24
@@ -34,7 +37,10 @@ msgstr "Форма"
msgid "Custom"
msgstr "Дополнительно"
-#: admin.py:135 models.py:78 models.py:216 models.py:264
+#: admin.py:135
+#: models.py:78
+#: models.py:216
+#: models.py:264
#: contrib/plugins/form_handlers/db_store/models.py:49
msgid "User"
msgstr "Пользователь"
@@ -43,17 +49,23 @@ msgstr "Пользователь"
msgid "Additional"
msgstr "Дополнительно"
-#: admin.py:147 admin.py:171 admin.py:199 admin.py:266
+#: admin.py:147
+#: admin.py:171
+#: admin.py:199
+#: admin.py:266
#: contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/base_edit.html:84
#: contrib/themes/simple/templates/simple/base_edit.html:76
msgid "Fobi"
msgstr ""
-#: admin.py:190 admin.py:223 models.py:121
+#: admin.py:190
+#: admin.py:223
+#: models.py:121
msgid "Plugin"
msgstr "Плагин"
-#: admin.py:232 models.py:472
+#: admin.py:232
+#: models.py:472
msgid "Form handler entry"
msgstr "Обработчик формы"
@@ -65,11 +77,14 @@ msgstr "{0} плагинов были изменены успешно."
msgid "POST required when changing in bulk!"
msgstr "Для множественных изменений необходим POST!"
-#: base.py:102
+#: base.py:108
msgid "Build your forms"
msgstr "Разработчик форм"
-#: base.py:515 models.py:217 models.py:265 models.py:318
+#: base.py:521
+#: models.py:217
+#: models.py:265
+#: models.py:318
#: contrib/plugins/form_elements/fields/boolean/forms.py:32
#: contrib/plugins/form_elements/fields/date/forms.py:33
#: contrib/plugins/form_elements/fields/date_drop_down/forms.py:42
@@ -96,7 +111,8 @@ msgstr "Разработчик форм"
msgid "Name"
msgstr "Название"
-#: base.py:520 contrib/plugins/form_elements/fields/boolean/forms.py:27
+#: base.py:526
+#: contrib/plugins/form_elements/fields/boolean/forms.py:27
#: contrib/plugins/form_elements/fields/date/forms.py:28
#: contrib/plugins/form_elements/fields/date_drop_down/forms.py:37
#: contrib/plugins/form_elements/fields/datetime/forms.py:28
@@ -120,7 +136,8 @@ msgstr "Название"
msgid "Label"
msgstr "Ярлык"
-#: base.py:525 contrib/plugins/form_elements/fields/boolean/forms.py:37
+#: base.py:531
+#: contrib/plugins/form_elements/fields/boolean/forms.py:37
#: contrib/plugins/form_elements/fields/date/forms.py:38
#: contrib/plugins/form_elements/fields/date_drop_down/forms.py:47
#: contrib/plugins/form_elements/fields/datetime/forms.py:38
@@ -142,7 +159,8 @@ msgstr "Ярлык"
msgid "Help text"
msgstr "Помощь"
-#: base.py:530 contrib/plugins/form_elements/fields/boolean/forms.py:47
+#: base.py:536
+#: contrib/plugins/form_elements/fields/boolean/forms.py:47
#: contrib/plugins/form_elements/fields/date/forms.py:53
#: contrib/plugins/form_elements/fields/date_drop_down/forms.py:72
#: contrib/plugins/form_elements/fields/datetime/forms.py:53
@@ -166,27 +184,27 @@ msgstr "Помощь"
msgid "Required"
msgstr "Обязательно"
-#: base.py:552
+#: base.py:558
msgid "Duplicate field name!"
msgstr "Название поля должно быть уникальным!"
-#: base.py:557
+#: base.py:563
msgid "Duplicate label name!"
msgstr "Ярлык поля должен быть уникальым!"
-#: base.py:636
+#: base.py:642
msgid "General"
msgstr "Основное"
-#: base.py:2128
+#: base.py:2134
msgid "Theme `{0}` does not exist!"
msgstr "Темы `{0}` не существует!"
-#: constants.py:17
+#: constants.py:18
msgid "Append"
msgstr "Добавить"
-#: constants.py:18
+#: constants.py:19
msgid "Replace"
msgstr "Заменить"
@@ -198,11 +216,10 @@ msgstr "Выбранные плагины"
msgid "Users action"
msgstr "Действие над пользователями"
-#: forms.py:115 forms.py:122
+#: forms.py:115
+#: forms.py:122
msgid "If set to ``replace``, the groups are replaced; otherwise - appended."
-msgstr ""
-"Если вы выберете ``заменить``, группы будут перезаписаны; в обратном случае "
-"- добавлены."
+msgstr "Если вы выберете ``заменить``, группы будут перезаписаны; в обратном случае - добавлены."
#: forms.py:120
msgid "Groups action"
@@ -212,7 +229,8 @@ msgstr "Действие над группами"
msgid "Group"
msgstr "Группа"
-#: models.py:113 models.py:414
+#: models.py:113
+#: models.py:414
msgid "UID"
msgstr ""
@@ -224,7 +242,8 @@ msgstr "Группы"
msgid "Users"
msgstr "Пользователи"
-#: models.py:160 models.py:191
+#: models.py:160
+#: models.py:191
msgid "Plugin UID"
msgstr "UID плагина"
@@ -244,7 +263,8 @@ msgstr "Плагин обработчика формы"
msgid "Form handler plugins"
msgstr "Плагины обработчиков формы"
-#: models.py:218 models.py:267
+#: models.py:218
+#: models.py:267
msgid "Slug"
msgstr "Слаг"
@@ -294,7 +314,8 @@ msgstr "Можно клонировать?"
msgid "Makes your form cloneable by other users."
msgstr "Другие пользователи смогут клонировать вашу форму."
-#: models.py:278 models.py:438
+#: models.py:278
+#: models.py:438
msgid "Position"
msgstr "Порядок"
@@ -346,11 +367,13 @@ msgstr ""
msgid "Form fieldset entries"
msgstr ""
-#: models.py:345 contrib/plugins/form_handlers/db_store/models.py:53
+#: models.py:345
+#: contrib/plugins/form_handlers/db_store/models.py:53
msgid "Plugin data"
msgstr "Данные плагина"
-#: models.py:433 models.py:467
+#: models.py:433
+#: models.py:467
msgid "Plugin name"
msgstr "Название плагина"
@@ -404,12 +427,17 @@ msgstr "{0} не найдено."
msgid "Form {0} was created successfully."
msgstr "Форма {0} успешно создана."
-#: views.py:173 views.py:280
+#: views.py:173
+#: views.py:280
msgid "Errors occured while saving the form: {0}."
msgstr "Во время сохранения данных формы произошли следующие ошибки: {0}."
-#: views.py:224 views.py:365 views.py:603 views.py:823 views.py:928
-#: views.py:970
+#: views.py:224
+#: views.py:365
+#: views.py:603
+#: views.py:823
+#: views.py:934
+#: views.py:976
msgid "Form entry not found."
msgstr "Форма не найдена"
@@ -469,11 +497,12 @@ msgstr "Обработчик формы \"{0}\" успешно изменен."
msgid "The form handler plugin \"{0}\" was deleted successfully."
msgstr "Oработчик формы \"{0}\" успешно удален."
-#: views.py:876 integration/processors.py:155
+#: views.py:876
+#: integration/processors.py:156
msgid "Form {0} was submitted successfully."
msgstr "Форма {0} успешно отправлена."
-#: views.py:976
+#: views.py:982
msgid "The form \"{0}\" was deleted successfully."
msgstr "Форма \"{0}\" успешно удалена."
@@ -601,9 +630,8 @@ msgstr ""
"Авторизируйтесь здесь.\n"
#: contrib/apps/mezzanine_integration/models.py:71
-#, fuzzy
msgid "Fobi forms"
-msgstr "Форма"
+msgstr "Формы fobi"
#: contrib/apps/mezzanine_integration/templates/mezzanine_integration/admin/change_form.html:8
#: contrib/plugins/form_handlers/db_store/fobi_form_handlers.py:74
@@ -617,9 +645,8 @@ msgid "History"
msgstr ""
#: contrib/apps/mezzanine_integration/templates/mezzanine_integration/admin/change_form.html:10
-#, fuzzy
msgid "View on site"
-msgstr "Просмотреть записи"
+msgstr "Посмотреть на сайте"
#: contrib/plugins/form_elements/content/content_image/defaults.py:24
msgid "Smart crop"
@@ -712,7 +739,7 @@ msgstr "Галочка"
#: contrib/plugins/form_elements/fields/select/fobi_form_elements.py:24
#: contrib/plugins/form_elements/fields/select_model_object/fobi_form_elements.py:26
#: contrib/plugins/form_elements/fields/select_multiple/fobi_form_elements.py:26
-#: contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py:28
+#: contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py:30
#: 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:30
@@ -882,35 +909,8 @@ msgstr "Варианы"
#: contrib/plugins/form_elements/fields/radio/forms.py:40
#: contrib/plugins/form_elements/fields/select/forms.py:40
#: contrib/plugins/form_elements/fields/select_multiple/forms.py:40
-msgid ""
-"Enter single values/pairs per line. Example:
"
-" 1
2
alpha, "
-"Alpha
beta, Beta
"
-"omega
It finally transforms into the following HTML code:"
-"
<select id=\"id_NAME_OF_THE_ELEMENT\" "
-"name=\"NAME_OF_THE_ELEMENT\">
"
-" <option value=\"1\">1</option>
"
-" <option value=\"2\">2</option>
<option value=\"alpha"
-"\">Alpha</option>
"
-" <option value=\"beta\">Beta</option>
"
-" <option value=\"omega\">omega</"
-"option>
</select>
1
2
"
-" alpha, Alpha
beta, Beta
omega
В результате получится следующий "
-"HTML код:
<select id="
-"\"id_NAME_OF_THE_ELEMENT\" name=\"NAME_OF_THE_ELEMENT\">
"
-" <option value=\"1\">1</"
-"option>
<option "
-"value=\"2\">2</option>
"
-" <option value=\"alpha\">Alpha</option>
"
-" <option value=\"beta\">"
-"Beta</option>
<"
-"option value=\"omega\">omega</option>
"
-"</select>
1
2
alpha, Alpha
beta, Beta
omega
It finally transforms into the following HTML code:
<select id=\"id_NAME_OF_THE_ELEMENT\" name=\"NAME_OF_THE_ELEMENT\">
<option value=\"1\">1</option>
<option value=\"2\">2</option>
<option value=\"alpha\">Alpha</option>
<option value=\"beta\">Beta</option>
<option value=\"omega\">omega</option>
</select>
1
2
alpha, Alpha
beta, Beta
omega
В результате получится следующий HTML код:
<select id=\"id_NAME_OF_THE_ELEMENT\" name=\"NAME_OF_THE_ELEMENT\">
<option value=\"1\">1</option>
<option value=\"2\">2</option>
<option value=\"alpha\">Alpha</option>
<option value=\"beta\">Beta</option>
<option value=\"omega\">omega</option>
</select>\\d+)/$"
msgstr ""
#: urls/edit.py:34
-msgid ""
-"^forms/elements/add/(?P\\d+)/(?P[\\w_"
-"\\-]+)/$"
+msgid "^forms/elements/add/(?P\\d+)/(?P[\\w_\\-]+)/$"
msgstr ""
#: urls/edit.py:39
@@ -1414,9 +1410,7 @@ msgid "^forms/elements/delete/(?P\\d+)/$"
msgstr ""
#: urls/edit.py:49
-msgid ""
-"^forms/handlers/add/(?P\\d+)/(?P[\\w_"
-"\\-]+)/$"
+msgid "^forms/handlers/add/(?P\\d+)/(?P[\\w_\\-]+)/$"
msgstr ""
#: urls/edit.py:54
diff --git a/src/fobi/views.py b/src/fobi/views.py
index f72e3c00..ba946c24 100644
--- a/src/fobi/views.py
+++ b/src/fobi/views.py
@@ -884,6 +884,9 @@ def view_form_entry(request, form_entry_slug, theme=None, template_name=None):
form=form, stage=CALLBACK_FORM_INVALID)
else:
+ # Providing initial form data by feeding entire GET dictionary
+ # to the form, if ``GET_PARAM_INITIAL_DATA`` is present in the
+ # GET.
kwargs = {}
if GET_PARAM_INITIAL_DATA in request.GET:
kwargs = {'initial': request.GET}