[Python-modules-commits] [django-recurrence] 02/08: merge patched into master

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository django-recurrence.

commit 2d374ed2cadbf94eab20be78f66c1e019a6a9b11
Merge: 7da7044 4f7cc25
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Jul 13 13:33:01 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...e-properties-in-.po-files-so-babel-can-co.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 recurrence/locale/de/LC_MESSAGES/django.po         |  2 +-
 recurrence/locale/de/LC_MESSAGES/djangojs.po       |  2 +-
 5 files changed, 41 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 836f7f2,0000000..db361a9
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- bad58ef509df287bf4998dab69968750aaf2b4bd
- bad58ef509df287bf4998dab69968750aaf2b4bd
++4f7cc2500be558e5319769bb6d82cc6c14f74d44
++4f7cc2500be558e5319769bb6d82cc6c14f74d44
 +bad58ef509df287bf4998dab69968750aaf2b4bd
 +bad58ef509df287bf4998dab69968750aaf2b4bd
 +django-recurrence_1.4.1.orig.tar.gz
 +bd6a2297eedee9a3c951808bc3c0a81fb11ab02d
 +99182
diff --cc debian/patches/0001-Fix-Language-properties-in-.po-files-so-babel-can-co.patch
index 0000000,0000000..3f54d76
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-Language-properties-in-.po-files-so-babel-can-co.patch
@@@ -1,0 -1,0 +1,36 @@@
++From 4f7cc2500be558e5319769bb6d82cc6c14f74d44 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Thu, 13 Jul 2017 13:32:38 +0200
++Subject: Fix Language properties in .po files so babel can compile them.
++
++---
++ recurrence/locale/de/LC_MESSAGES/django.po   | 2 +-
++ recurrence/locale/de/LC_MESSAGES/djangojs.po | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/recurrence/locale/de/LC_MESSAGES/django.po b/recurrence/locale/de/LC_MESSAGES/django.po
++index 9018a95..4fecd0b 100644
++--- a/recurrence/locale/de/LC_MESSAGES/django.po
+++++ b/recurrence/locale/de/LC_MESSAGES/django.po
++@@ -14,7 +14,7 @@ msgstr ""
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++-"Language: German\n"
+++"Language: de\n"
++ 
++ #: base.py:871
++ msgid "annually"
++diff --git a/recurrence/locale/de/LC_MESSAGES/djangojs.po b/recurrence/locale/de/LC_MESSAGES/djangojs.po
++index fdc5da4..a91e618 100644
++--- a/recurrence/locale/de/LC_MESSAGES/djangojs.po
+++++ b/recurrence/locale/de/LC_MESSAGES/djangojs.po
++@@ -14,7 +14,7 @@ msgstr ""
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++-"Language: German\n"
+++"Language: de\n"
++ 
++ #: recurrence-widget.js:1610
++ msgctxt "date"
diff --cc debian/patches/series
index 0000000,0000000..298d420
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-Language-properties-in-.po-files-so-babel-can-co.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-recurrence.git