diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-01 18:20:28 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-01 18:20:28 +0100 |
| commit | e00a447e2ca277697bd3e3cae5196e8177d3e867 (patch) | |
| tree | c8580e47f101f75ceccd6ba19f9649b575f99177 /addons/website_blog | |
| parent | cde120058aa4edd259b7d7e1624465af313710fe (diff) | |
| parent | 7e469eb77aae1f7e05a3ce0f6575b5149fed3ca1 (diff) | |
[MERGE] forward port branch saas-11.1 up to 7e469eb77aa
Diffstat (limited to 'addons/website_blog')
| -rw-r--r-- | addons/website_blog/i18n/zh_CN.po | 11 | ||||
| -rw-r--r-- | addons/website_blog/models/website_blog.py | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/addons/website_blog/i18n/zh_CN.po b/addons/website_blog/i18n/zh_CN.po index cce05abcd7c..9bb211d3142 100644 --- a/addons/website_blog/i18n/zh_CN.po +++ b/addons/website_blog/i18n/zh_CN.po @@ -3,10 +3,10 @@ # * website_blog # # Translators: -# Jeffery CHEN <jeffery9@gmail.com>, 2016 +# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016 # liAnGjiA <liangjia@qq.com>, 2016 -# Martin Trigaux <mat@odoo.com>, 2016 -# fausthuang <faust_huang@hotmail.com>, 2016 +# Martin Trigaux, 2016 +# fausthuang, 2016 # Talway <9010446@qq.com>, 2016 # Eddie Lim <bhweelim@yahoo.com>, 2016 # waveyeung <waveyeung@qq.com>, 2016 @@ -16,13 +16,14 @@ # n37r06u3 <n37r06u3@gmail.com>, 2016 # 苏州远鼎 <tiexinliu@126.com>, 2016 # THL <wt39181819@gmail.com>, 2017 +# 老窦 北京 <2662059195@qq.com>, 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-10-24 09:00+0000\n" "PO-Revision-Date: 2017-10-24 09:00+0000\n" -"Last-Translator: THL <wt39181819@gmail.com>, 2017\n" +"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -725,7 +726,7 @@ msgstr "发布选项" #. module: website_blog #: model:ir.model.fields,field_description:website_blog.field_blog_post_post_date msgid "Publishing date" -msgstr "" +msgstr "发布日期" #. module: website_blog #: model:ir.ui.view,arch_db:website_blog.website_blog diff --git a/addons/website_blog/models/website_blog.py b/addons/website_blog/models/website_blog.py index 25d7d363ef8..ade0212e0da 100644 --- a/addons/website_blog/models/website_blog.py +++ b/addons/website_blog/models/website_blog.py @@ -209,7 +209,7 @@ class BlogPost(models.Model): def write(self, vals): result = True for post in self: - copy_vals = vals + copy_vals = dict(vals) if 'website_published' in vals and 'published_date' not in vals and (post.published_date or '') <= fields.Datetime.now(): copy_vals['published_date'] = vals['website_published'] and fields.Datetime.now() or False result &= super(BlogPost, self).write(copy_vals) |