Merge branch 'master' of github.com:mrjoes/flask-admin

babel/admin.pot

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Flask-Admin VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-11-02 11:48+0200\n"
+"POT-Creation-Date: 2012-11-09 03:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -269,6 +269,14 @@ msgstr ""
 msgid "Save and Add"
 msgstr ""
 
+#: ../flask_admin/templates/admin/model/inline_form_list.html:24
+msgid "Delete?"
+msgstr ""
+
+#: ../flask_admin/templates/admin/model/inline_form_list.html:32
+msgid "Add"
+msgstr ""
+
 #: ../flask_admin/templates/admin/model/list.html:24
 msgid "Add Filter"
 msgstr ""

flask_admin/form.py

@@ -6,7 +6,7 @@ from flask.globals import _request_ctx_stack
 from flask.ext import wtf
 from wtforms import fields, widgets
 
-from flask.ext.admin.babel import gettext
+from flask.ext.admin.babel import gettext, ngettext
 
 
 class BaseForm(wtf.Form):
@@ -150,6 +150,11 @@ class RenderTemplateWidget(object):
 
         kwargs['field'] = field
 
+        # Provide i18n support even if flask-babel is not installed
+        # or enabled.
+        kwargs['_gettext'] = gettext
+        kwargs['_ngettext'] = ngettext
+
         template = jinja_env.get_template(self.template)
         return template.render(kwargs)
 

flask_admin/templates/admin/model/inline_form_list.html

@@ -21,7 +21,7 @@
         {%- if pk %}
         <div class="fa-inline-form-control">
             <input type="checkbox" name="del-{{ subfield.id }}" id="del-{{ subfield.id }}" />
-            <label for="del-{{ subfield.id }}" style="display: inline">Delete?</a>
+            <label for="del-{{ subfield.id }}" style="display: inline">{{ _gettext('Delete?') }}</label>
         </div>
         {%- endif -%}
         {{ lib.render_form_fields(subfield, True) }}
@@ -29,5 +29,5 @@
     </div>
     {% endfor %}
     </div>
-    <a href="#" class="btn" onclick="faForm.addInlineModel('{{ field.id }}', '#{{ field.id }}-forms', {{ render_template(template)|tojson }});">Add {{ field.label.text }}</a>
+    <a href="#" class="btn" onclick="faForm.addInlineModel('{{ field.id }}', '#{{ field.id }}-forms', {{ render_template(template)|tojson }});">{{ _gettext('Add') }} {{ field.label.text }}</a>
 </div>

flask_admin/translations/ru/LC_MESSAGES/admin.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Flask-Admin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-11-02 11:48+0200\n"
+"POT-Creation-Date: 2012-11-09 03:54+0200\n"
 "PO-Revision-Date: 2012-04-11 18:48+0200\n"
 "Last-Translator: Serge S. Koval <serge.koval+github@gmail.com>\n"
 "Language-Team: \n"
@@ -254,6 +254,14 @@ msgstr "Создать"
 msgid "Save and Add"
 msgstr "Сохранить и Добавить"
 
+#: ../flask_admin/templates/admin/model/inline_form_list.html:24
+msgid "Delete?"
+msgstr "Удалить?"
+
+#: ../flask_admin/templates/admin/model/inline_form_list.html:32
+msgid "Add"
+msgstr "Добавить"
+
 #: ../flask_admin/templates/admin/model/list.html:24
 msgid "Add Filter"
 msgstr "Добавить Фильтр"