Merge branch 'master' into master

This commit is contained in:
Reece Dunham 2019-01-11 10:03:50 -05:00 committed by GitHub
commit 1c7947b5e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 94 additions and 45 deletions

View file

@ -1,45 +1,52 @@
ad-m <github.com/ad-m>
Alejandro Varas <alej0varas@gmail.com>
Alex Orange <crazycasta@gmail.com>
Alexey Evseev <myhappydo@gmail.com>
Andy Freeland <andy@andyfreeland.net>
Artis Avotins <artis.avotins@gmail.com>
Bram Boogaard <b.boogaard@auto-interactive.nl>
Carl Meyer <carl@dirtcircle.com>
Curtis Maloney <curtis@tinbrain.net>
Den Lesnov
Dmytro Kyrychuk <dmytro.kyrychuck@gmail.com>
Donald Stufft <donald.stufft@gmail.com>
Douglas Meehan <dmeehan@gmail.com>
Facundo Gaich <facugaich@gmail.com>
Felipe Prenholato <philipe.rp@gmail.com>
Filipe Ximenes <filipeximenes@gmail.com>
Germano Massullo <germano.massullo@gmail.com>
Gregor Müllegger <gregor@muellegger.de>
ivirabyan
James Oakley <jfunk@funktronics.ca>
Jannis Leidel <jannis@leidel.info>
Jarek Glowacki <github.com/jarekwg>
Javier García Sogo <jgsogo@gmail.com>
Jeff Elmore <jeffelmore.org>
Keryn Knight <kerynknight.com>
Matthew Schinckel <matt@schinckel.net>
Michael van Tellingen <michaelvantellingen@gmail.com>
Mike Bryant <mike@mikebryant.me.uk>
Mikhail Silonov <silonov.pro>
Patryk Zawadzki <patrys@room-303.com>
Paul McLanahan <paul@mclanahan.net>
Philipp Steinhardt <steinhardt@myvision.de>
Rinat Shigapov <rinatshigapov@gmail.com>
Rodney Folz <rodney@rodneyfolz.com>
Romain Garrigues <github.com/romgar>
rsenkbeil <github.com/rsenkbeil>
Ryan Kaskel <dev@ryankaskel.com>
Simon Meers <simon@simonmeers.com>
sayane
Tony Aldridge <zaragopha@hotmail.com>
Travis Swicegood <travis@domain51.com>
Trey Hunner <trey@treyhunner.com>
Karl Wan Nan Wo <karl.wnw@gmail.com>
zyegfryed
Radosław Jan Ganczarek <radoslaw@ganczarek.in>
| ad-m <github.com/ad-m>
| Alejandro Varas <alej0varas@gmail.com>
| Alex Orange <crazycasta@gmail.com>
| Alexey Evseev <myhappydo@gmail.com>
| Andy Freeland <andy@andyfreeland.net>
| Artis Avotins <artis.avotins@gmail.com>
| Bram Boogaard <b.boogaard@auto-interactive.nl>
| Carl Meyer <carl@dirtcircle.com>
| Curtis Maloney <curtis@tinbrain.net>
| Den Lesnov
| Dmytro Kyrychuk <dmytro.kyrychuck@gmail.com>
| Donald Stufft <donald.stufft@gmail.com>
| Douglas Meehan <dmeehan@gmail.com>
| Facundo Gaich <facugaich@gmail.com>
| Felipe Prenholato <philipe.rp@gmail.com>
| Filipe Ximenes <filipeximenes@gmail.com>
| Gregor Müllegger <gregor@muellegger.de>
| Hanley Hansen <hanleyhansen@gmail.com>
| ivirabyan
| James Oakley <jfunk@funktronics.ca>
| Jannis Leidel <jannis@leidel.info>
| Jarek Glowacki <github.com/jarekwg>
| Javier García Sogo <jgsogo@gmail.com>
| Jeff Elmore <jeffelmore.org>
| Jonathan Sundqvist <jonathan@argpar.se>
| Keryn Knight <kerynknight.com>
| Martey Dodoo <martey+django-model-utils@mobolic.com>
| Matthew Schinckel <matt@schinckel.net>
| Michael van Tellingen <michaelvantellingen@gmail.com>
| Mike Bryant <mike@mikebryant.me.uk>
| Mikhail Silonov <silonov.pro>
| Patryk Zawadzki <patrys@room-303.com>
| Paul McLanahan <paul@mclanahan.net>
| Philipp Steinhardt <steinhardt@myvision.de>
| Rinat Shigapov <rinatshigapov@gmail.com>
| Rodney Folz <rodney@rodneyfolz.com>
| Romain Garrigues <github.com/romgar>
| rsenkbeil <github.com/rsenkbeil>
| Ryan Kaskel <dev@ryankaskel.com>
| Simon Meers <simon@simonmeers.com>
| sayane
| Tony Aldridge <zaragopha@hotmail.com>
| Travis Swicegood <travis@domain51.com>
| Trey Hunner <trey@treyhunner.com>
| Karl Wan Nan Wo <karl.wnw@gmail.com>
| zyegfryed
| Radosław Jan Ganczarek <radoslaw@ganczarek.in>
| Lucas Wiman <lucas.wiman@gmail.com>
| Jack Cushman <jcushman@law.harvard.edu>
| Zach Cheung <kuroro.zhang@gmail.com>
| Daniel Andrlik <daniel@andrlik.org>

View file

@ -6,6 +6,7 @@ master (unreleased)
- Fix handling of deferred attributes on Django 1.10+, fixes GH-278
- Fix `FieldTracker.has_changed()` and `FieldTracker.previous()` to return
correct responses for deferred fields.
- Add Simplified Chinese translations.
- Update AutoLastModifiedField so that at instance creation it will
always be set equal to created to make querying easier. Fixes GH-254
- Support `reversed` for all kinds of `Choices` objects, fixes GH-309

Binary file not shown.

View file

@ -0,0 +1,41 @@
# This file is distributed under the same license as the django-model-utils package.
#
# Translators:
# Zach Cheung <kuroro.zhang@gmail.com>, 2018.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-23 15:12+0800\n"
"PO-Revision-Date: 2018-10-23 15:26+0800\n"
"Last-Translator: Zach Cheung <kuroro.zhang@gmail.com>\n"
"Language-Team: \n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: models.py:24
msgid "created"
msgstr "创建时间"
#: models.py:25
msgid "modified"
msgstr "修改时间"
#: models.py:37
msgid "start"
msgstr "开始时间"
#: models.py:38
msgid "end"
msgstr "结束时间"
#: models.py:53
msgid "status"
msgstr "状态"
#: models.py:54
msgid "status changed"
msgstr "状态修改时间"