From 76972b66c1c491ad48f578b31055746a2a308052 Mon Sep 17 00:00:00 2001 From: zcyuefan Date: Mon, 4 Sep 2017 17:07:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8F=92=E4=BB=B6=E7=AE=80=E4=BD=93=E4=B8=AD?= =?UTF-8?q?=E6=96=87message=E6=B2=A1=E6=9C=89=E7=94=9F=E6=95=88=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xadmin/locale/zh_Hans/LC_MESSAGES/django.mo | Bin 20989 -> 21165 bytes xadmin/locale/zh_Hans/LC_MESSAGES/django.po | 6 ------ 2 files changed, 6 deletions(-) diff --git a/xadmin/locale/zh_Hans/LC_MESSAGES/django.mo b/xadmin/locale/zh_Hans/LC_MESSAGES/django.mo index 2107c5b29056bdda88e8a3b7ea204146dcab864b..c30be597d66e81ff33ce12d9b5f7b8c7570b9dd4 100644 GIT binary patch delta 6587 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 delta 6436 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 RVe7N&_DooRw!_{^e*$58je-CG diff --git a/xadmin/locale/zh_Hans/LC_MESSAGES/django.po b/xadmin/locale/zh_Hans/LC_MESSAGES/django.po index 001fb57f8..cd41423f6 100644 --- a/xadmin/locale/zh_Hans/LC_MESSAGES/django.po +++ b/xadmin/locale/zh_Hans/LC_MESSAGES/django.po @@ -912,20 +912,14 @@ msgid "Close" msgstr "关闭" #: .\templates\xadmin\blocks\model_list.top_toolbar.importexport.export.html:33 -#, fuzzy -#| msgid "Export all data." msgid "Export current page data." msgstr "导出当前页数据" #: .\templates\xadmin\blocks\model_list.top_toolbar.importexport.export.html:34 -#, fuzzy -#| msgid "Export all data." msgid "Export selected data." msgstr "导出所选择数据" #: .\templates\xadmin\blocks\model_list.top_toolbar.importexport.export.html:36 -#, fuzzy -#| msgid "Export with table header." msgid "Export header only." msgstr "仅导出表头" From 38f518a8adced98c7d8d701d73765eb0439eb98d Mon Sep 17 00:00:00 2001 From: zcyuefan Date: Mon, 11 Sep 2017 18:41:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=9Fcontent=E4=B8=AD=E6=98=AF=E6=B2=A1?= =?UTF-8?q?=E6=9C=89has=5Fadd=5Fpermission=E8=BF=99=E4=B8=AAkey=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8C=89=E9=92=AE=E5=A7=8B=E7=BB=88?= =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E5=87=BA=E7=8E=B0=EF=BC=8C=E5=9B=A0=E4=B8=BA?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=96=B0=E5=A2=9E=E6=9D=83=E9=99=90=E6=97=B6?= =?UTF-8?q?formset.formset.max=5Fnum=E5=BF=85=E4=B8=BA0=EF=BC=8C=E6=89=80?= =?UTF-8?q?=E4=BB=A5=E4=BF=AE=E6=94=B9=E4=B8=BAformset.formset.max=5Fnum?= =?UTF-8?q?=E5=8D=B3=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xadmin/templates/xadmin/edit_inline/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xadmin/templates/xadmin/edit_inline/base.html b/xadmin/templates/xadmin/edit_inline/base.html index 343c352d8..cf7e19447 100644 --- a/xadmin/templates/xadmin/edit_inline/base.html +++ b/xadmin/templates/xadmin/edit_inline/base.html @@ -6,7 +6,7 @@ {% block box_title %} {% if not formset.formset.detail_page %} - {% if has_add_permission %} + {% if formset.formset.max_num %} {% endif %} {% endif %}