[Python-modules-commits] r11161 - in packages/python-django/trunk/debian (3 files)

[lamby at users.alioth.debian.org]

    Date: Friday, January 15, 2010 @ 00:26:56
  Author: lamby
Revision: 11161

Apply patch from upstream VCS to fix to_locale not working with sr_Latn: to_locale('sr-latn') should return 'sr_Latn', not 'sr_LATN'. (Closes: #556603)

Added:
  packages/python-django/trunk/debian/patches/07-to_locale-sr_latn.diff
Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/patches/series

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2010-01-14 22:45:17 UTC (rev 11160)
+++ packages/python-django/trunk/debian/changelog	2010-01-15 00:26:56 UTC (rev 11161)
@@ -1,3 +1,11 @@
+python-django (1.1.1-3) UNRELEASED; urgency=low
+
+  * Apply patch from upstream VCS to fix to_locale not working with sr_Latn:
+    to_locale('sr-latn') should return 'sr_Latn', not 'sr_LATN'.
+    (Closes: #556603)
+
+ -- Chris Lamb <lamby at debian.org>  Thu, 14 Jan 2010 23:50:56 +0000
+
 python-django (1.1.1-2) unstable; urgency=low
 
   * Remove embedded "decimal" code copy and use system version instead. The

Added: packages/python-django/trunk/debian/patches/07-to_locale-sr_latn.diff
===================================================================
--- packages/python-django/trunk/debian/patches/07-to_locale-sr_latn.diff	                        (rev 0)
+++ packages/python-django/trunk/debian/patches/07-to_locale-sr_latn.diff	2010-01-15 00:26:56 UTC (rev 11161)
@@ -0,0 +1,14 @@
+Forwarded-Upstream: Not needed
+Author: Janos Guljas
+Source: http://code.djangoproject.com/changeset/12056
+
+--- a/django/utils/translation/trans_real.py (revision 11964)
++++ b/django/utils/translation/trans_real.py (revision 12056)
+@@ -42,4 +42,7 @@
+             return language[:p].lower()+'_'+language[p+1:].lower()
+         else:
++            # Get correct locale for sr-latn
++            if len(language[p+1:]) > 2:
++                return language[:p].lower()+'_'+language[p+1].upper()+language[p+2:].lower()
+             return language[:p].lower()+'_'+language[p+1:].upper()
+     else:

Modified: packages/python-django/trunk/debian/patches/series
===================================================================
--- packages/python-django/trunk/debian/patches/series	2010-01-14 22:45:17 UTC (rev 11160)
+++ packages/python-django/trunk/debian/patches/series	2010-01-15 00:26:56 UTC (rev 11161)
@@ -4,3 +4,4 @@
 04_hyphen-manpage.diff
 05_ftbfs_in_november.diff
 06_python_2.6.3_regression.diff
+07-to_locale-sr_latn.diff