[Python-modules-commits] [django-recurrence] 07/08: Squash and extend patches to fix Language properties in .po files.
Michael Fladischer
fladi at moszumanska.debian.org
Tue Oct 31 08:04:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch debian/master
in repository django-recurrence.
commit c2aa6a70a1924bc2dfbf3d72a41b883c292b6b18
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Tue Oct 31 08:53:26 2017 +0100
Squash and extend patches to fix Language properties in .po files.
---
debian/changelog | 1 +
...e-properties-in-.po-files-so-babel-can-co.patch | 134 ++++++++++++++++++++-
...f-Language-fields-for-django.po-and-djang.patch | 56 ---------
debian/patches/series | 1 -
4 files changed, 134 insertions(+), 58 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 604af78..2fb8686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ django-recurrence (1.5.0-1) UNRELEASED; urgency=low
* Refresh patches after git-dpm to gbp pq conversion
* Refresh patches for 1.5.0.
* Bump Standards-Version to 4.1.1.
+ * Squash and extend patches to fix Language properties in .po files.
-- Michael Fladischer <fladi at debian.org> Tue, 31 Oct 2017 08:25:12 +0100
diff --git a/debian/patches/0001-Fix-Language-properties-in-.po-files-so-babel-can-co.patch b/debian/patches/0001-Fix-Language-properties-in-.po-files-so-babel-can-co.patch
index 49bc3b8..29a2e92 100644
--- a/debian/patches/0001-Fix-Language-properties-in-.po-files-so-babel-can-co.patch
+++ b/debian/patches/0001-Fix-Language-properties-in-.po-files-so-babel-can-co.patch
@@ -5,7 +5,16 @@ Subject: Fix Language properties in .po files so babel can compile them.
---
recurrence/locale/de/LC_MESSAGES/django.po | 1 +
recurrence/locale/de/LC_MESSAGES/djangojs.po | 1 +
- 2 files changed, 2 insertions(+)
+ recurrence/locale/en/LC_MESSAGES/django.po | 2 +-
+ recurrence/locale/en/LC_MESSAGES/djangojs.po | 2 +-
+ recurrence/locale/es/LC_MESSAGES/django.po | 2 +-
+ recurrence/locale/es/LC_MESSAGES/djangojs.po | 2 +-
+ recurrence/locale/eu/LC_MESSAGES/djangojs.po | 3 +--
+ recurrence/locale/fr/LC_MESSAGES/django.po | 2 +-
+ recurrence/locale/fr/LC_MESSAGES/djangojs.po | 2 +-
+ recurrence/locale/nl/LC_MESSAGES/django.po | 1 +
+ recurrence/locale/nl/LC_MESSAGES/djangojs.po | 1 +
+ 11 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/recurrence/locale/de/LC_MESSAGES/django.po b/recurrence/locale/de/LC_MESSAGES/django.po
index 8e73816..5953db9 100644
@@ -31,3 +40,126 @@ index 6a73735..76879ec 100644
#: static/recurrence/js/recurrence-widget.js:1609
msgctxt "date"
+diff --git a/recurrence/locale/en/LC_MESSAGES/django.po b/recurrence/locale/en/LC_MESSAGES/django.po
+index d139a0b..29c0910 100644
+--- a/recurrence/locale/en/LC_MESSAGES/django.po
++++ b/recurrence/locale/en/LC_MESSAGES/django.po
+@@ -12,7 +12,7 @@ msgstr ""
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+-"Language: \n"
++"Language: en\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff --git a/recurrence/locale/en/LC_MESSAGES/djangojs.po b/recurrence/locale/en/LC_MESSAGES/djangojs.po
+index e01cf58..2afd9a4 100644
+--- a/recurrence/locale/en/LC_MESSAGES/djangojs.po
++++ b/recurrence/locale/en/LC_MESSAGES/djangojs.po
+@@ -12,7 +12,7 @@ msgstr ""
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+-"Language: \n"
++"Language: en\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff --git a/recurrence/locale/es/LC_MESSAGES/django.po b/recurrence/locale/es/LC_MESSAGES/django.po
+index cd7496b..7bf9b79 100644
+--- a/recurrence/locale/es/LC_MESSAGES/django.po
++++ b/recurrence/locale/es/LC_MESSAGES/django.po
+@@ -12,7 +12,7 @@ msgstr ""
+ "PO-Revision-Date: 2017-02-24 23:22+0100\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+-"Language: \n"
++"Language: es\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff --git a/recurrence/locale/es/LC_MESSAGES/djangojs.po b/recurrence/locale/es/LC_MESSAGES/djangojs.po
+index 8db9e49..71c81e0 100644
+--- a/recurrence/locale/es/LC_MESSAGES/djangojs.po
++++ b/recurrence/locale/es/LC_MESSAGES/djangojs.po
+@@ -12,7 +12,7 @@ msgstr ""
+ "PO-Revision-Date: 2017-02-24 23:15+0100\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+-"Language: \n"
++"Language: es\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff --git a/recurrence/locale/eu/LC_MESSAGES/djangojs.po b/recurrence/locale/eu/LC_MESSAGES/djangojs.po
+index ce1237f..cf168e1 100644
+--- a/recurrence/locale/eu/LC_MESSAGES/djangojs.po
++++ b/recurrence/locale/eu/LC_MESSAGES/djangojs.po
+@@ -3,7 +3,6 @@
+ # This file is distributed under the same license as the PACKAGE package.
+ # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+ #
+-#, fuzzy
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+@@ -12,7 +11,7 @@ msgstr ""
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+-"Language: \n"
++"Language: eu\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff --git a/recurrence/locale/fr/LC_MESSAGES/django.po b/recurrence/locale/fr/LC_MESSAGES/django.po
+index 8f9ab6a..378d556 100644
+--- a/recurrence/locale/fr/LC_MESSAGES/django.po
++++ b/recurrence/locale/fr/LC_MESSAGES/django.po
+@@ -11,7 +11,7 @@ msgstr ""
+ "PO-Revision-Date: 2017-02-24 23:23+0100\n"
+ "Last-Translator: Olivier Le Brouster <olivier.le-brouster at webu.coop>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+-"Language: \n"
++"Language: fr\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff --git a/recurrence/locale/fr/LC_MESSAGES/djangojs.po b/recurrence/locale/fr/LC_MESSAGES/djangojs.po
+index 4f9a980..3cd4b39 100644
+--- a/recurrence/locale/fr/LC_MESSAGES/djangojs.po
++++ b/recurrence/locale/fr/LC_MESSAGES/djangojs.po
+@@ -11,7 +11,7 @@ msgstr ""
+ "PO-Revision-Date: 2017-02-24 23:19+0100\n"
+ "Last-Translator: Olivier Le Brouster <olivier.le-brouster at webu.coop>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+-"Language: \n"
++"Language: fr\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff --git a/recurrence/locale/nl/LC_MESSAGES/django.po b/recurrence/locale/nl/LC_MESSAGES/django.po
+index 20a8785..e7dbe75 100644
+--- a/recurrence/locale/nl/LC_MESSAGES/django.po
++++ b/recurrence/locale/nl/LC_MESSAGES/django.po
+@@ -16,6 +16,7 @@ msgstr ""
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Generator: Poedit 1.5.7\n"
++"Language: nl\n"
+ "X-Poedit-SourceCharset: UTF-8\n"
+
+ #: base.py:1087
+diff --git a/recurrence/locale/nl/LC_MESSAGES/djangojs.po b/recurrence/locale/nl/LC_MESSAGES/djangojs.po
+index d64dd0c..15cc8e4 100644
+--- a/recurrence/locale/nl/LC_MESSAGES/djangojs.po
++++ b/recurrence/locale/nl/LC_MESSAGES/djangojs.po
+@@ -15,6 +15,7 @@ msgstr ""
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
++"Language: nl\n"
+ "X-Generator: Poedit 1.5.7\n"
+ "X-Poedit-SourceCharset: UTF-8\n"
+
diff --git a/debian/patches/0002-Fix-value-of-Language-fields-for-django.po-and-djang.patch b/debian/patches/0002-Fix-value-of-Language-fields-for-django.po-and-djang.patch
deleted file mode 100644
index a418809..0000000
--- a/debian/patches/0002-Fix-value-of-Language-fields-for-django.po-and-djang.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Michael Fladischer <FladischerMichael at fladi.at>
-Date: Thu, 13 Jul 2017 13:53:21 +0200
-Subject: Fix value of Language fields for django.po and djangojs.po files and
- unfuzzy them.
-
----
- recurrence/locale/eu/LC_MESSAGES/djangojs.po | 3 +--
- recurrence/locale/nl/LC_MESSAGES/django.po | 1 +
- recurrence/locale/nl/LC_MESSAGES/djangojs.po | 1 +
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/recurrence/locale/eu/LC_MESSAGES/djangojs.po b/recurrence/locale/eu/LC_MESSAGES/djangojs.po
-index ce1237f..cf168e1 100644
---- a/recurrence/locale/eu/LC_MESSAGES/djangojs.po
-+++ b/recurrence/locale/eu/LC_MESSAGES/djangojs.po
-@@ -3,7 +3,6 @@
- # This file is distributed under the same license as the PACKAGE package.
- # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
-@@ -12,7 +11,7 @@ msgstr ""
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
- "Language-Team: LANGUAGE <LL at li.org>\n"
--"Language: \n"
-+"Language: eu\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/recurrence/locale/nl/LC_MESSAGES/django.po b/recurrence/locale/nl/LC_MESSAGES/django.po
-index 20a8785..e7dbe75 100644
---- a/recurrence/locale/nl/LC_MESSAGES/django.po
-+++ b/recurrence/locale/nl/LC_MESSAGES/django.po
-@@ -16,6 +16,7 @@ msgstr ""
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "X-Generator: Poedit 1.5.7\n"
-+"Language: nl\n"
- "X-Poedit-SourceCharset: UTF-8\n"
-
- #: base.py:1087
-diff --git a/recurrence/locale/nl/LC_MESSAGES/djangojs.po b/recurrence/locale/nl/LC_MESSAGES/djangojs.po
-index d64dd0c..15cc8e4 100644
---- a/recurrence/locale/nl/LC_MESSAGES/djangojs.po
-+++ b/recurrence/locale/nl/LC_MESSAGES/djangojs.po
-@@ -15,6 +15,7 @@ msgstr ""
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-+"Language: nl\n"
- "X-Generator: Poedit 1.5.7\n"
- "X-Poedit-SourceCharset: UTF-8\n"
-
diff --git a/debian/patches/series b/debian/patches/series
index 7ff8ba4..298d420 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
0001-Fix-Language-properties-in-.po-files-so-babel-can-co.patch
-0002-Fix-value-of-Language-fields-for-django.po-and-djang.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-recurrence.git
More information about the Python-modules-commits
mailing list