summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvain Viollon <sviollon@minddistrict.com>2018-10-24 08:41:50 +0200
committerSylvain Viollon <sviollon@minddistrict.com>2018-10-24 08:41:50 +0200
commitd46570d3b05bf9ea0b99f69cc6ec10a58ce18db1 (patch)
treeb42e7f2b8e9f94f668072dcea1b611041a9b106a
parentbbd6adf9048fc7231eff076228595d4bdea554c6 (diff)
parent1ac9750446d179284a45d13c34996c9224a3782e (diff)
downloadzope-i18n-d46570d3b05bf9ea0b99f69cc6ec10a58ce18db1.tar.gz
Merge remote-tracking branch 'origin/master' into fix-default-plural
-rw-r--r--CHANGES.rst10
-rw-r--r--setup.py2
2 files changed, 9 insertions, 3 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 423ca47..4e0a8d0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,8 +2,14 @@
CHANGES
=========
-4.6 (unreleased)
-================
+4.6.1 (unreleased)
+==================
+
+- Nothing changed yet.
+
+
+4.6.0 (2018-10-22)
+==================
- Use ``msgid_plural`` as ``default_plural`` if not provided in
``translate()``.
diff --git a/setup.py b/setup.py
index 75b2ddf..5fce188 100644
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,7 @@ TESTS_REQUIRE = COMPILE_REQUIRES + ZCML_REQUIRES + [
setup(
name='zope.i18n',
- version='4.6.dev0',
+ version='4.6.1.dev0',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
description='Zope Internationalization Support',