From 8666990f698c58d3f33de73dea730908db2fc142 Mon Sep 17 00:00:00 2001
From: Brice Gelineau <brice.gelineau@polyconseil.fr>
Date: Thu, 24 Nov 2016 12:55:48 +0100
Subject: [PATCH] Fix translations handling

Fix a missing _lazy.
Fix locale inclusion in the sdist package.
Fix French locale compiling.
---
 MANIFEST.in                                   |   1 +
 oidc_provider/lib/claims.py                   |   2 +-
 oidc_provider/locale/fr/LC_MESSAGES/django.mo | Bin 420 -> 2962 bytes
 oidc_provider/tests/test_claims.py            |  12 ++++++++++--
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index d15eac9..46ebb3a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,3 +3,4 @@ include README.md
 recursive-include oidc_provider/static *
 recursive-include oidc_provider/templates *
 recursive-include oidc_provider/tests/templates *
+recursive-include oidc_provider/locale *
diff --git a/oidc_provider/lib/claims.py b/oidc_provider/lib/claims.py
index 6c80bc8..fe2e716 100644
--- a/oidc_provider/lib/claims.py
+++ b/oidc_provider/lib/claims.py
@@ -1,6 +1,6 @@
 import copy
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 
 from oidc_provider import settings
 
diff --git a/oidc_provider/locale/fr/LC_MESSAGES/django.mo b/oidc_provider/locale/fr/LC_MESSAGES/django.mo
index 1d3f2e81620ffe3ed41d3bed0d554a2023e06fab..43e37026cf093868ed4dbb3204053952c50e97db 100644
GIT binary patch
literal 2962
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
KJQiQaivI!sbsZl7

delta 66
xcmbOvzJ%H0o)F7a1|VPrVi_P-0b*t#)&XJ=umIvLprj>`2C0F8&B<&zi~#Kr1?T_(

diff --git a/oidc_provider/tests/test_claims.py b/oidc_provider/tests/test_claims.py
index 1748f19..c1ac794 100644
--- a/oidc_provider/tests/test_claims.py
+++ b/oidc_provider/tests/test_claims.py
@@ -1,6 +1,10 @@
-from django.test import TestCase
+from __future__ import unicode_literals
 
-from oidc_provider.lib.claims import ScopeClaims, STANDARD_CLAIMS
+from django.test import TestCase
+from django.utils.six import text_type
+from django.utils.translation import override as override_language
+
+from oidc_provider.lib.claims import ScopeClaims, StandardScopeClaims, STANDARD_CLAIMS
 from oidc_provider.tests.app.utils import create_fake_user, create_fake_client, create_fake_token
 
 
@@ -54,3 +58,7 @@ class ClaimsTestCase(TestCase):
                 'email': u'johndoe@example.com'
             }
         )
+
+    def test_locale(self):
+        with override_language('fr'):
+            self.assertEqual(text_type(StandardScopeClaims.info_profile[0]), 'Profil de base')