From c1acda6d8f276dda9a962186e028c396a5a2e53c Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Fri, 10 Feb 2012 01:13:29 +0000
Subject: [PATCH] Updated a few localization formats to stop the changes done
 in r17473 from breaking the tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/conf/locale/ca/LC_MESSAGES/django.mo   | Bin 16447 -> 16453 bytes
 django/conf/locale/ca/LC_MESSAGES/django.po   |   8 ++++----
 django/conf/locale/ca/formats.py              |   8 ++++----
 django/conf/locale/es/LC_MESSAGES/django.mo   | Bin 15162 -> 15163 bytes
 django/conf/locale/es/LC_MESSAGES/django.po   |   2 +-
 django/conf/locale/es/formats.py              |   8 ++++----
 .../conf/locale/es_AR/LC_MESSAGES/django.mo   | Bin 16630 -> 16631 bytes
 .../conf/locale/es_AR/LC_MESSAGES/django.po   |   2 +-
 django/conf/locale/es_AR/formats.py           |   2 +-
 .../conf/locale/es_MX/LC_MESSAGES/django.mo   | Bin 16604 -> 16605 bytes
 .../conf/locale/es_MX/LC_MESSAGES/django.po   |   2 +-
 django/conf/locale/es_MX/formats.py           |  15 +++++++--------
 django/conf/locale/es_NI/formats.py           |   8 ++++----
 django/conf/locale/pt/formats.py              |   8 ++++----
 .../conf/locale/pt_BR/LC_MESSAGES/django.mo   | Bin 16454 -> 16460 bytes
 .../conf/locale/pt_BR/LC_MESSAGES/django.po   |   8 ++++----
 django/conf/locale/pt_BR/formats.py           |   8 ++++----
 django/utils/dateformat.py                    |   2 +-
 tests/regressiontests/defaultfilters/tests.py |   2 +-
 tests/regressiontests/i18n/tests.py           |   2 +-
 tests/regressiontests/utils/dateformat.py     |   2 +-
 21 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/django/conf/locale/ca/LC_MESSAGES/django.mo b/django/conf/locale/ca/LC_MESSAGES/django.mo
index 0edbebab0777454d54320ea4305a6929215cb433..77a4d9d3d143e10f40eabd66549b4c512a54365c 100644
GIT binary patch
delta 1826
zcmXZbYiQ147{~GZahf^I#*FarV8b+<*_>w+H5*3Eh;1yP5XQ<O=1(~!r#Evbhwz5>
z!l5Z8TB}VC5%uJdEm;T)&5-5z{q29fc|P}b-KXom@8@5=D^Ry9a5X*Bi*?Q|8Rc9L
z+<=|Xvv?oI5Ff|Rc**kDEUv*w^7k=_VH}HJF#<;<JC}l^aXgloCo!M+akBH=avJfB
zlKU|mKjJJ*9qrr<EXNSmVI0200{nyVn4jugf82^`Sb+oZF6QD}9D*rhoJ+*{I0bi%
z@%(`|Noav*sFSoHhj1~hrjuu(ZYBo@;#};3>#+;&#6EZcnd;7?=7q66HlS|mHFm@%
zEW~Dyh8E6C_a`hsU0pGDz?G=}HK>UjaXxOrwyQ@K5VrUgYU2;6@n3N|{=}Y`!TSuw
zxv2SG84Yb%j+(F+wZK8t#ucbSPN628LyfDn{;L+>u=qA=ey#ZsyAnS|JxL>K{y$`0
z&vhK<SJnkH=m?^&YzeBcrKmzyVLM!hI#DSO!|SN4e~JCD1!rRv|2X9fQBPZD@ln)z
z7qL70yUR49NZdkI{s6Uc7~`-WRdEZdfL5G{zb!v*f^+kTGmw-!g4^&8^1pLa8C-yy
zQ0w1CJ=qhCV1HL{9dA%4|712>{yWYj{}*-g+)4h1hfxc@LKXNPyWwZlTmM2GBx<s6
z9BTYP9E`)!(}ua$k%xNgg{XWX>Z+ERtE_(=>I9oG3Cl47D^VwYjQQA(_tcv&#F1Er
z`V7xvf2_&i{?%x(0j<bf7thBT!V=VXx|<&@T#YKM8CBSKRKdSdCk|x#{jsQ%_eJ%G
zET4cXJkd<g<o=6EWZA$os6W*O8*mS`VHkCF&#~=0wz$dsh8p(=wP7I3x0Bh`j5d3l
z{XA<7GULreGucctCzw-EZ$8b;K@~U$bu)`BztrLtsKVA-zSLrGGYw7Lj=Hiv79YX@
z@iElI6Xt2_KW}lRc?ET~*DbC#Yt4J8f*)BNM)qCqUeM6Lwh>kN7t|I1u-HxY3y3hg
zp$dz!xR==%qsa$R2TI27IKC<}x*!-VS{cd?6|I29NuiuctKAwuYD-pa8I{*LP*hbr
MHYE~TGG_<=1B3U`BLDyZ

delta 1818
zcmXZbdrZw?9LMqJAUZfAhNK+CLP?3J#Au1!(rR+sG8tL1VH4)K%=I6anak)O!)9~a
z&c>KqD~)MnZE~GqZX4;3rscAEe>&fP&g=O;*YERv&hNnv&%GU<YpLEqq;qa@qH{hh
z$F8^)BXAe?!J`<C=dAy-#dpw4e;vkP15UtZ?1ph;olC+5Ov9z-F)SdiAL{~c1r0y5
z<ZjHt&zOga<D8p`mFUN6?2jL?5Zf^h=O;TCjT>=19>&2~i?i@O4#P1i&W*x(I0ZMS
z1VR(9)1eI-Q8)RCT*CR-O*hX#RVEu_F%KiK47=kN9DsX}rLGFKt^qsaOH`%aVi<nG
zCHNyiLmSUZ4J}xJDqS&l!4lN?D%8SqT!<U6qx7f*8Z3T|I`|W6elyO%R*b|+yw7mV
zL#+?2qoD&UQ44mWHrR(c_%JGw6Q~7eQ1dR>_$7;j7T-kecOSLSL+pXiP*3s}wf;A<
zFZG`o$}9{s85oEvSs`{*0+mP!cEZ)D8?D8WcokLp=Qs$PaSnR<$Em*v^|TchA4KhU
z7JWMZB8^^j+(2bqhdTHv_QxjdC?zU^R-BA&)}K7dxqRX@q{|(^N~}iycP@j;g;<W-
zzXtVW_1KN`U6T#GL*4wV`Q7?ka5nwzsGDb}hYsA2+VB-B!H?JzzoFjx7wRJ3jF5d$
z^P_Mm4#R*B%(j7C)LZAH`ioGdT5Ois_-fP*$}s^q;|M&Dy76Nyz<;PW&*xo7V+HCn
zJcZGCJCpjW@xmswB5T|bK2AR_L4Bv&_|e9<P>Fp<CDwvUxD9pVzcwC`6}oX>)Oa*%
zogbBWoSBqG{g=^^ZWB+U{!~>qp%%69DXMghsITCS#h+0n{)w8`hC1+%>86I_FtfWE
zVfG7HBg%|5hnw+cqM2f*q24^xoQ_H`7gd>j>tAH?a#Uia)?a3EU_A{j+=RNxc8m9-
zhxia`;Suw=ji0vooOuyd+A9{{H1C=<sDvL{`~*37g=?gtf9)Go=HE~yZn5|`Dgn>5
zkX=!U^|07yMq+RJ2cRw#k3LKedV3efM3wq;{7YAs`im3%x#??MSx2C*;MT;s;lW1}
LlDxt8tT~?lHJr}T

diff --git a/django/conf/locale/ca/LC_MESSAGES/django.po b/django/conf/locale/ca/LC_MESSAGES/django.po
index b0446fd81c..243135f419 100644
--- a/django/conf/locale/ca/LC_MESSAGES/django.po
+++ b/django/conf/locale/ca/LC_MESSAGES/django.po
@@ -1064,11 +1064,11 @@ msgstr ", %(number)d %(type)s"
 
 #: utils/translation/trans_real.py:568
 msgid "DATE_FORMAT"
-msgstr "j \\de F \\de Y"
+msgstr "j \\d\\e F \\d\\e Y"
 
 #: utils/translation/trans_real.py:569
 msgid "DATETIME_FORMAT"
-msgstr "j \\de F \\de Y, H:i"
+msgstr "j \\d\\e F \\d\\e Y, H:i"
 
 #: utils/translation/trans_real.py:570
 msgid "TIME_FORMAT"
@@ -1076,11 +1076,11 @@ msgstr "H:i"
 
 #: utils/translation/trans_real.py:591
 msgid "YEAR_MONTH_FORMAT"
-msgstr "F \\de Y"
+msgstr "F \\d\\e Y"
 
 #: utils/translation/trans_real.py:592
 msgid "MONTH_DAY_FORMAT"
-msgstr "j \\de F"
+msgstr "j \\d\\e F"
 
 #: views/generic/create_update.py:121
 #, python-format
diff --git a/django/conf/locale/ca/formats.py b/django/conf/locale/ca/formats.py
index 71ea7e9325..9a0054d0fb 100644
--- a/django/conf/locale/ca/formats.py
+++ b/django/conf/locale/ca/formats.py
@@ -4,11 +4,11 @@
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-DATE_FORMAT = r'j \de F \de Y'
+DATE_FORMAT = r'j \d\e F \d\e Y'
 TIME_FORMAT = 'G:i:s'
-DATETIME_FORMAT = r'j \de F \de Y \a \le\s G:i'
-YEAR_MONTH_FORMAT = r'F \de\l Y'
-MONTH_DAY_FORMAT = r'j \de F'
+DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\e\s G:i'
+YEAR_MONTH_FORMAT = r'F \d\e\l Y'
+MONTH_DAY_FORMAT = r'j \d\e F'
 SHORT_DATE_FORMAT = 'd/m/Y'
 SHORT_DATETIME_FORMAT = 'd/m/Y G:i'
 FIRST_DAY_OF_WEEK = 1 # Monday
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index b05c07da6357a460cbba4851f17a89d61285ac9c..81e473f200523bf820d4fc35ec32ce15c3a8d5b8 100644
GIT binary patch
delta 1113
zcmXZaO-NKx7{>84qovny#2NY;uu-98LaAn)vM*{QQWOz_wXl^`Ohr(U)#|pXO|=M;
zhzNpOL=Xi-1sS+#AwjfhQHzLZQ4td)7=?@M|9GF(@0|CX^S<vn_r4gP9Dh=8iJL<R
z%Ss_cSg=K0$-In<a4$CEFz&>I*nqdZeg_vbzlUjjh@JQdNAN8+;p%c?pRJTbyij<%
z14Ec&<33d3F;v2;=O=Iv^V8UmQ+O6<aXlU*xEpVy8v2SY_!D)}zmBIW$%UFLaWZHn
zpboRB0(l(5qxLZ>(H~Ue^u`ccF~Te^M-^CW%XS+Uh!3J(>@ccM6?MT=F@qF?a}HcU
z6;NCoE~5%x#SM59d+;^(;S3IAVN>$tXRwR;4g1V~z&!CeT!l*ql6-ML0|k!YI=qBy
z@F}X}kEn(|qyB+!*p79t|MPl!bJB2xI@gB!r*gOiJMcIbQTZp3i^bt310|kL0^tp+
z;CobpPpE|7Z5_4$m;G($?7VH<lI)9Y#^&sb1^NCR4s_cd)YJFc5~`sAR6{#Z-*A`L
z_uB*ZkR3xcT1A~Zi8^;4^+_*ciu&OS1KseNz3vSYp5L|i9e?0?%|5r2cFMj&J^eIh
z@ExjwFQ|ro;GjC0WuOM;ZNt{&r))yqAVRHYP>Hgrb6uYI){1R2-Ko)9zSJ502YLN)
AdH?_b

delta 1111
zcmXZaUuex?9LMqJY;3=cGo3@zSjU+(TO)SPW|-u{zqGWdxpB47(NZXfE593VaG@+o
zN^v12$#AjNE?g`nH!ir4<N|3cG|?_B@6Vpk)$93wpXc}eexKj(H&Gq0KACAu>q7|5
zr4SmhU^}pdxP*&w02kpQ+=WN57H@g~4%QLh!y0^uMSO%q_y*NyT{*hJ_LM`q(0GRv
zdvQ4j526|mqY73WkKh3D8SKGHJcqNm8BdZtfVWWteZfYY!36(0A9~}3>U-0;SV}?@
z=1>h<a37wqk5PsGpbBTUgpkDq^Vp1P&}mDyAJ>rIje29pP<<+>3!Y9{WLQ+4xPWSK
z(eY(e<Ez+>H*r0_!j1S74`ZP(zVfr!Mts9Qx9@Qk`8h1$imkC;T4tfdaomKLupOVF
zCjNjL=o9K6_=-84_WnQbXST%~C8+0`Q2$gOmtZT7U<a!HC~~nhOt4Vlsh9|_Q4Qar
z3VcKr{AQ<7=YQDWcFxY*+U@aNVzV}HS1!o+Z*`*0wxhmHm+eLk)Q1{qC+ZvS_x_+A
zvPbPOYS0Smxl^d;&Z9nQiW&NcD=c)wYxcSij5@w+?>qm%@l*T4j@wE567}k*unFIy
w2KbB`=sWJwB(p3uz`U*Lk3VG{>IMmFKZ`1qLp@h?+%?v@?AO|{)um#?e{$7tmH+?%

diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index 7d624d0158..e2c2b786eb 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -1084,7 +1084,7 @@ msgstr "F Y"
 
 #: utils/translation/trans_real.py:602
 msgid "MONTH_DAY_FORMAT"
-msgstr "j \\de F"
+msgstr "j \\d\\e F"
 
 #: views/generic/create_update.py:121
 #, python-format
diff --git a/django/conf/locale/es/formats.py b/django/conf/locale/es/formats.py
index 85070eaa5a..f10351c649 100644
--- a/django/conf/locale/es/formats.py
+++ b/django/conf/locale/es/formats.py
@@ -4,11 +4,11 @@
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-DATE_FORMAT = r'j \de F \de Y'
+DATE_FORMAT = r'j \d\e F \d\e Y'
 TIME_FORMAT = 'H:i:s'
-DATETIME_FORMAT = r'j \de F \de Y \a \l\a\s H:i'
-YEAR_MONTH_FORMAT = r'F \de Y'
-MONTH_DAY_FORMAT = r'j \de F'
+DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i'
+YEAR_MONTH_FORMAT = r'F \d\e Y'
+MONTH_DAY_FORMAT = r'j \d\e F'
 SHORT_DATE_FORMAT = 'd/m/Y'
 SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
 FIRST_DAY_OF_WEEK = 1 # Monday
diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.mo b/django/conf/locale/es_AR/LC_MESSAGES/django.mo
index 3ba97f5fdd15450b1abefd3a6651f0f582c3b444..6b6c59e4183e670ae0f63b7ebbb60b9ea91eb5da 100644
GIT binary patch
delta 1188
zcmXZaOGwmF6vy#1We>-Y$y$`y%O-=_NQ<1Nhv^VO#Yh&q$wi9_-P9sd=yef$Nt6*o
zErc*CN=v3`Hf;<V2sZ{nM77CH5e7X#G-lWL*PPYop8GoIp8tQoKk~Of^88X&SZZd6
zn#?Nkh<hAY6Q9CGIEWQEgex$MJMjrF#BZp5Gq@Ok;{u$=Jy^m7HYd$CVh^st8%Yb6
zVepiRdMx24tlL)Jn8qc<C)|^6FRI{+9$!NhcFW_3r~;nhF3h0{{E2Nii`y}s3TAx_
zE~LzM;~ehAt*q)L=P`-{s7~GV`Mao&+(UKX0jki)co1{A4{e882kb``Jc7D+3}cuN
z3~Cq@Q3*b{U)=Awj`=^RL^1lVL@QA*s>2A@dmKk4NO-&j^?)R*vuRZ8yHTGcTw&0~
zAdl;@ntpA-MvP-S>Oe2nViq@J4%7G%8?d&yJl~2s--9anI;x-{RLAb%avUzN2OIYd
zdDM$umKW?5s%1s2!YMq1pHLUI@x7GzFzSV8Q3)@5Jcvr1Mcp&(>yO+~tl<B%aRy5K
z;{OB%xD#&C*C*Y#?tAw$s-S82t2^WVLft=$DyW1i$XfW60iz7Gp~hY1u65(61PRo^
zM$|u$^0*cC4;(;sAmg^9I@96tQTLe7cVp0j)4tH>o^yjcfV$`^R^x3{0ryb_jk*QY
oeG~3$RAFyW512%)PoeI4*8;kDnu%rjqfi;kG(@@zolPUrf3_Wl?f?J)

delta 1186
zcmXZaPe@cz6vy#9rP=r=H5XwbrBjA2q(zKcX)_Ul(!?N15J3wI-PA%DqrVTuN}`My
zY9T~YVWu)nxp1T4K)5joBC3sUiZI9m$(o&hf4;N&+;jh(bI*JKdjtP^1L^((FV8vG
z7IrR(XUz*(PJ9`2aR7605X&%$NAMMH#_y<oOSlDp<0f3i<Cw+$*i`Ra2)nQn@7Fue
z#Tbk+QH@#Lixmz2#we=5i{>RWfhzc>#dlGKJ+$}*s(^89!W62&Uw8^v@DN5DJ?E}4
zxY6j`QT&T1@F1&t$#u-fKHQ2AZ2k$VBTrEsc#bM`1ml>(7F@%2Y&q-~{0w#PYb?RE
z$6z~y3@X7VbHV(9yO{rjN>ohWm8cB$q6!RPmBk@cf?A6YpdJuLbvBA>eJARZc()mx
zW01z(SVX_7unzZN9CaXpJ28p-FonnPGuB{vvp*j}o$o>wd=FL7AgW`Ju@r~=b<a)M
zhBWF$Q~rXRL4D&47T`Q4@C)jq7~e~Y+fXmOib~jT@c=4u5_Qjzt-mx!F^B)pO)ya6
zHyaZaU{0GETc0!En;*@usDc*FZ|0J@jJkgXRZtdH&>H4>41y7VL#esLtTaQY1huGx
zb*O)!!Qu!8h+9z|IBCXFojGmsd9%ajJJHjDZd>RvubH>ZKGa2ba2q~C6)=n{Xw-a*
nx^LQ?MHTiA^?*6l`aJ5M4-wGCi%b;a&&gm(tY-2|csPF@uOx^6

diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.po b/django/conf/locale/es_AR/LC_MESSAGES/django.po
index 8476981b3e..bb2e8b3ca3 100644
--- a/django/conf/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_AR/LC_MESSAGES/django.po
@@ -1082,7 +1082,7 @@ msgstr "F Y"
 
 #: utils/translation/trans_real.py:592
 msgid "MONTH_DAY_FORMAT"
-msgstr "j \\de F"
+msgstr "j \\d\\e F"
 
 #: views/generic/create_update.py:121
 #, python-format
diff --git a/django/conf/locale/es_AR/formats.py b/django/conf/locale/es_AR/formats.py
index 81d9e53fc1..e28841f90a 100644
--- a/django/conf/locale/es_AR/formats.py
+++ b/django/conf/locale/es_AR/formats.py
@@ -8,7 +8,7 @@ DATE_FORMAT = r'j N Y'
 TIME_FORMAT = r'H:i:s'
 DATETIME_FORMAT = r'j N Y H:i:s'
 YEAR_MONTH_FORMAT = r'F Y'
-MONTH_DAY_FORMAT = r'j \de F'
+MONTH_DAY_FORMAT = r'j \d\e F'
 SHORT_DATE_FORMAT = r'd/m/Y'
 SHORT_DATETIME_FORMAT = r'd/m/Y H:i'
 FIRST_DAY_OF_WEEK = 0 # 0: Sunday, 1: Monday
diff --git a/django/conf/locale/es_MX/LC_MESSAGES/django.mo b/django/conf/locale/es_MX/LC_MESSAGES/django.mo
index 0b5bc978ad4bfead37bfd4838b0e8560e9730406..ac79e93b46e21948d2800f2aab9c66dd7e3d1340 100644
GIT binary patch
delta 1188
zcmXZbOGwmF6vy%NH`7tete{X5qleO97#8aE8f%CUDuM`;%oa&a5rKvjL-A)q!(xbn
zNQ4S(A%z8rgsUF7$jxj-DG+NH1uY7KB5Kk1*Z*whbM8I&aqhkUS;z(-vcdEIvM^?5
z4NYbx*y8TRO4<i-F`mXkJdZ1}2Y2ECF2X6)xVKn@c`U$LOyN6>V^y=+I^2iVm~OVv
z4ia4V#2jv<{R`J)b&FXs?!j_w!)163RdCw#y{N)6-oAw@;2v(rVN`*0cnIgce^Vkf
zyF^EK!Yqjks0nNM(Mj5|6uVG`ob~=5)Qwz5-N04PXYnxY8`y^PcoaA6h}OxV)*Zkl
zm<tJ35DcT9;;H+>eT6mjPop;aj4I?S>O?;<z~A2fgW4eAeUy)(4p5G|*-F&aCs9ul
zo*?KX7{s;s2^+C!7gb{dHK7Zu@Cw%95H{dzti^9wkE?b^?G&oubEtwYpl+-Wmt!W%
zhnDjJw^0=jMG1R=dgBo+!!hi`Nz_7{c`t3;h&o{hYQt`Cr%@YUM6HwYe7`%0g?xXO
zBhbco{&!G-d*2;#M^WR(+;Ml(^Do^gciPRP=FOlAdXFmTBNm4QUkEhdyZh7q>lU;|
zCyt>eE=7F<t5GMfL45;p)D6_TTTuCJ-cGtH)Q#@PP!o<2$aeR*d(u6HTIdYw@7Iee
y;2Nr+o9<oIIuG4PsKQ23Pxcs<e}?)ykGFy<c|%79<|j%j;<Z8N#MY)KrT+kFoq<aL

delta 1186
zcmXZbOGwmF6vy#1rA@xdiXwYhWLcRo^uW;`(_|4v6cMBn+9IhbBG4#gDEK!tVKGEO
zBtizZ5Xo8$7_NHYA~&;%q(I7D6tpl1im*-JU;ne2&$;*9$GP|ZXF3!4oQdSKWkJ-;
zVhv^`7<cz!740KfjAyY3FX9sH!rhp~xj2p*_ZH`20q5X*+>aly4y)p3>+k@s##Gz_
zJ4$fN6O*`s_HV4gRgGpUFo_HB5H7@4RKY3FccThRd;2b`fQPsf`%wi>;xU}^{!LAR
zSq~kZO=f%X6KcXresq!+EX58~A?Lln3w0wss2jNM`5Sng_H8_jQ+N_<c7^MtQR`;0
z9CHD|VuF60kI&o}?kikF{{(8Iuc$)4qfYb_BlySLv#1U9KFUW?2dF^Z>~hrACs0ok
zv=g)w^x|6lg4?iokJ)-`L`~?x6?hFdVjsrvHP+$`*5lGd*ltD@d;wL^CDe^w!9|!3
z^MU1jz&%vOePO}|P;WelWjKOYaSXLkJ@2KBx1vtihT5>x+bPt>mr?7aJ%7{f#Uj2x
z%Mobf`~N#Az<uNnx<jaOBW~Uu^ZZM9+?{X>sCn;D1${&nG>y@K;2VJk{BVD{f89tj
zJaH5?u^jacEJK~V8ublqM%};`H-^e@_jbZ<M&0N^3^d^cfoyS4xu@MTsD;j<{(jx4
w0y3zA?zj(7>pXU!pb8s8J=riS{~Yyq&L=^YyrH8K3!^2Kb+w~A8lIN^0~yeOUH||9

diff --git a/django/conf/locale/es_MX/LC_MESSAGES/django.po b/django/conf/locale/es_MX/LC_MESSAGES/django.po
index a1a44d04e7..885866a9f2 100644
--- a/django/conf/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_MX/LC_MESSAGES/django.po
@@ -1082,7 +1082,7 @@ msgstr "F Y"
 
 #: utils/translation/trans_real.py:592
 msgid "MONTH_DAY_FORMAT"
-msgstr "j \\de F"
+msgstr "j \\d\\e F"
 
 #: views/generic/create_update.py:121
 #, python-format
diff --git a/django/conf/locale/es_MX/formats.py b/django/conf/locale/es_MX/formats.py
index 7f14b976bd..20a30f4cb9 100644
--- a/django/conf/locale/es_MX/formats.py
+++ b/django/conf/locale/es_MX/formats.py
@@ -2,18 +2,17 @@
 # This file is distributed under the same license as the Django package.
 #
 
-DATE_FORMAT = r'j \de F \de Y'
+DATE_FORMAT = r'j \d\e F \d\e Y'
 TIME_FORMAT = 'H:i:s'
-DATETIME_FORMAT = r'j \de F \de Y \a \l\a\s H:i'
-YEAR_MONTH_FORMAT = r'F \de Y'
-MONTH_DAY_FORMAT = r'j \de F'
+DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i'
+YEAR_MONTH_FORMAT = r'F \d\e Y'
+MONTH_DAY_FORMAT = r'j \d\e F'
 SHORT_DATE_FORMAT = 'd/m/Y'
 SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
-FIRST_DAY_OF_WEEK = 1 			# Monday: ISO 8601 
+FIRST_DAY_OF_WEEK = 1  # Monday: ISO 8601
 DATE_INPUT_FORMATS = (
-    '%d/%m/%Y', '%d/%m/%y',            	# '25/10/2006', '25/10/06'
-    '%Y%m%d',                          	# '20061025'
-
+    '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06'
+    '%Y%m%d',                           # '20061025'
 )
 TIME_INPUT_FORMATS = (
     '%H:%M:%S', '%H:%M',		# '14:30:59', '14:30'
diff --git a/django/conf/locale/es_NI/formats.py b/django/conf/locale/es_NI/formats.py
index b91d7f8dbd..fd5cc9a925 100644
--- a/django/conf/locale/es_NI/formats.py
+++ b/django/conf/locale/es_NI/formats.py
@@ -2,11 +2,11 @@
 # This file is distributed under the same license as the Django package.
 #
 
-DATE_FORMAT = r'j \de F \de Y'
+DATE_FORMAT = r'j \d\e F \d\e Y'
 TIME_FORMAT = 'H:i:s'
-DATETIME_FORMAT = r'j \de F \de Y \a \l\a\s H:i'
-YEAR_MONTH_FORMAT = r'F \de Y'
-MONTH_DAY_FORMAT = r'j \de F'
+DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i'
+YEAR_MONTH_FORMAT = r'F \d\e Y'
+MONTH_DAY_FORMAT = r'j \d\e F'
 SHORT_DATE_FORMAT = 'd/m/Y'
 SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
 FIRST_DAY_OF_WEEK = 1 			# Monday: ISO 8601 
diff --git a/django/conf/locale/pt/formats.py b/django/conf/locale/pt/formats.py
index dc02132846..a6ce2c08de 100644
--- a/django/conf/locale/pt/formats.py
+++ b/django/conf/locale/pt/formats.py
@@ -4,11 +4,11 @@
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-DATE_FORMAT = r'j \de F \de Y'
+DATE_FORMAT = r'j \d\e F \d\e Y'
 TIME_FORMAT = 'H:i:s'
-DATETIME_FORMAT = r'j \de F \de Y à\s H:i'
-YEAR_MONTH_FORMAT = r'F \de Y'
-MONTH_DAY_FORMAT = r'j \de F'
+DATETIME_FORMAT = r'j \d\e F \d\e Y à\s H:i'
+YEAR_MONTH_FORMAT = r'F \d\e Y'
+MONTH_DAY_FORMAT = r'j \d\e F'
 SHORT_DATE_FORMAT = 'd/m/Y'
 SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
 FIRST_DAY_OF_WEEK = 0  # Sunday
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index 5d2cdfbadf230c6cd68b767308a328ea3dd7f24b..bbaf4444040da6fcaca532a0df2753d9d07e0a51 100644
GIT binary patch
delta 1830
zcmXZdduYy49LMqVxNXC1GndVbXJ#&AV;5|XZLG28w&uFVBbQ7lib)~;SW))J6e5b2
zMC^|(Q;0uk^$^RgNNbanKc*yei&nfp`+fg<o$oo{bI$ji-+8vk(Ll%1Kx=-Cm*kwg
zp5<H|KE&bp5{F^8_4i;j@gIu^WIH#6cqA$>851!B^RW=4a1R#Z0bGWySd4wR0YkH#
z=W1!3o8|iL!wTZ9vz;r$X7eki66fXk8?D5(#I-mH@1qX#9$CWu#$=qD>#tXe6Nnpd
z3f{m1e3|R{i7|P;>6pSmF|wzt!5C~X&!P&sj3e;@4#gKZ4m)u^{zTna4%aadL#Uf7
zLEX$!4C5+~hBjz1?^!}S4yOMZYN1yacVZ3k2kQ^b@jqD^YMm-nLF-W))nYmBMiqP;
zGw?Ag-}^#C8~jF1aC7}Q8dX4oIoA49EuMnPpNV=4`4-PdtyhLBWVyxFm`1!Am0yp8
z*x#L`kw8Zy&ci0umA%7Q>_ScWj7)IfFoeG_6LXj}8p9aGeYgbA;27*iy^SBJyjVWG
z3QNa0_IKI+4ZaPk@=Dans!@+<6Y3@o;sEqekF(zTBdFKifqWI0#FMYX6{t7#2uraS
zwSGR;tAJvRVt-dbLno|4ZB&iAfsIPQEm(v*k+0;g;UerpEttlOQ(h*Hz+4=KrKs_B
z<|cCoj;DVwdfKRwh88%DD&QijzX?^?RkPW~Z=p_b7c;OOwO|iU$01a^24|ywcE@ol
zUPa}1SbuL3_n$&X0)G{hkY%pLiNr^68eT&E&LgP8dQg9;zM$U3UrfY*HlA4GkB>zi
zXfkSEChFB^+jv0<_rIEs#dK()3#dXaqfQt>O?-vg@D1ulKB5-tL0$28R9+uy9k;;W
zcrYp+X2zSN&2b(LRXEYiKy5I?5^~LXW|3Knnpcj>UydqdHL9>M>XU9q<?S)|qw)`-
z3iFQ9(8Lp{38ySRj{)K))XA=x*KGWz#ck#t)Q#P@IAT6EpPR4Ew@Ch0*GWUK_7kdr
zAO3*rLlqXa&@Uj~9EJKBCZSG{f+{eGT4yq9ULNY7T2Wg}{FT(SaBZ+M7~Tdo!S<$b
eU9cjw)9vzm`Ul#cWF3wUgxkvIwus)6HG%(Zxyg|L

delta 1822
zcmXZceQ3>59LMo<F}ATg_8?;qcQiI!vyF>wwrQGah}k?Yd0MgXhxtR+y8A<Fe-NTP
zm4`h1flN2?hsGjPu3FJNME==|JSEXu!uzw|_pjIap7TBDe9!rvd!uc>CvCotIdS3f
z&bezr=Mu0J$6ypk;~PxGevHLm7XQVO#Qs@cUMeONXX6~4i=(g!7vNs3!5g>`2XG^X
z@?F?9(m0;)h8)0Z;!U%itHf*OXUrhZFYq>6j`hS_a5CP-3HTOS!u`ZFoKonmw-7Ul
z58+h2g7Yz281@oliafJ$5(5j6JzYJ<;UV)Vs*p37g!eEWpW#I8#S;91y0IYFF&smv
z8!blNOcgfZiZBgraNWFP2@f!a{%+Jl&n@o7^~CS2KQ!0-WaX%JmZ1t-gW6~dR^d)m
z!5x@`k5KvHPc*c_Pt=4z7LN#d1tgfssJt|bC!_LnQEy?k#q-Q^R3S@H^J+00H=^=e
zaRmFjgEYp`(T?-*Eb7W$U;@5EP3T7^xGz|YKX5wEWKt@w#Q^TcrFaC#<7?F0_>Rhp
z<-@D6OiW~dmp9blo1-dSiaJ>>>Je=~eTscJ3=g0lXRGyhp<Z`4@>N_iPrezeQE%uz
zF2b*<_4BD-1<c1$?C&aR=!7+>jcQRhuucisfTg${`8w_*F2+}=1=D$P%F97N1~COo
zQRA!34dymXr+*iQwNX0_EpQlBz)4j9SyW-?&8s$k6Lo?J>M?bq7VN`3^igdc&OrU_
z+He}4N9A{0|JPFPe-a&I_*YOuuDKGki1%YIo<jZ3yHJJoq5h~oqTa+WOvXVQ_m_F&
zNvH#5q2}eFUVWa87nO1UtLdnqLkpci6>=JN!Y<UrC~CtV)Q!AHE!2m)xo@bv->7v4
zQ5*lWIHug|k2e#|lrRk?rkPo&4RS1DrdeQy%o5bR3RHd->RT^I6}ARd*k)AT4s#DG
ze;=yQa0?AhY(q_GxA++Ph|i!-cFw$D<CiVIY2HTN*d2=>nvcz=X4LFK^0&H|H1uje
z;Lufi1MWAfFkgjNK)mTk{S1>(CrCvVI1#l@CTd;~6EPHt8+$1uqcN}|(6GHRus-nU
fLPK+)x_GB+8tPDYBpPgqjZ}wj#YP6o>U{qJejLX?

diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
index dde815ed04..3b36b12f35 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
@@ -1059,11 +1059,11 @@ msgstr ", %(number)d %(type)s"
 
 #: utils/translation/trans_real.py:568
 msgid "DATE_FORMAT"
-msgstr "j \\de N \\de Y"
+msgstr "j \\d\\e N \\d\\e Y"
 
 #: utils/translation/trans_real.py:569
 msgid "DATETIME_FORMAT"
-msgstr "j \\de N \\de Y à\\s H:i"
+msgstr "j \\d\\e N \\d\\e Y à\\s H:i"
 
 #: utils/translation/trans_real.py:570
 msgid "TIME_FORMAT"
@@ -1071,11 +1071,11 @@ msgstr "H:i"
 
 #: utils/translation/trans_real.py:591
 msgid "YEAR_MONTH_FORMAT"
-msgstr "F \\de Y"
+msgstr "F \\d\\e Y"
 
 #: utils/translation/trans_real.py:592
 msgid "MONTH_DAY_FORMAT"
-msgstr "j \\de F"
+msgstr "j \\d\\e F"
 
 #: views/generic/create_update.py:121
 #, python-format
diff --git a/django/conf/locale/pt_BR/formats.py b/django/conf/locale/pt_BR/formats.py
index 7645346999..6a44d38651 100644
--- a/django/conf/locale/pt_BR/formats.py
+++ b/django/conf/locale/pt_BR/formats.py
@@ -4,11 +4,11 @@
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-DATE_FORMAT = r'j \de F \de Y'
+DATE_FORMAT = r'j \d\e F \d\e Y'
 TIME_FORMAT = 'H:i'
-DATETIME_FORMAT = r'j \de F \de Y à\s H:i'
-YEAR_MONTH_FORMAT = r'F \de Y'
-MONTH_DAY_FORMAT = r'j \de F'
+DATETIME_FORMAT = r'j \d\e F \d\e Y à\s H:i'
+YEAR_MONTH_FORMAT = r'F \d\e Y'
+MONTH_DAY_FORMAT = r'j \d\e F'
 SHORT_DATE_FORMAT = 'd/m/Y'
 SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
 FIRST_DAY_OF_WEEK = 0  # Sunday
diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py
index 81c2d87f91..1b2dd57fe7 100644
--- a/django/utils/dateformat.py
+++ b/django/utils/dateformat.py
@@ -147,7 +147,7 @@ class DateFormat(TimeFormat):
     def e(self):
         "Timezone name if available"
         try:
-            if self.data.tzinfo:
+            if hasattr(self.data, 'tzinfo') and self.data.tzinfo:
                 # Have to use tzinfo.tzname and not datetime.tzname
                 # because datatime.tzname does not expect Unicode
                 return self.data.tzinfo.tzname(self.data) or ""
diff --git a/tests/regressiontests/defaultfilters/tests.py b/tests/regressiontests/defaultfilters/tests.py
index 36f8f5851c..1660a75e9c 100644
--- a/tests/regressiontests/defaultfilters/tests.py
+++ b/tests/regressiontests/defaultfilters/tests.py
@@ -487,7 +487,7 @@ class DefaultFiltersTests(TestCase):
         # real testing of date() is in dateformat.py
         self.assertEqual(date(datetime.datetime(2005, 12, 29), u"d F Y"),
                           u'29 December 2005')
-        self.assertEqual(date(datetime.datetime(2005, 12, 29), ur'jS o\f F'),
+        self.assertEqual(date(datetime.datetime(2005, 12, 29), ur'jS \o\f F'),
                           u'29th of December')
 
     def test_time(self):
diff --git a/tests/regressiontests/i18n/tests.py b/tests/regressiontests/i18n/tests.py
index 27b25468d4..4b543d2bbf 100644
--- a/tests/regressiontests/i18n/tests.py
+++ b/tests/regressiontests/i18n/tests.py
@@ -439,7 +439,7 @@ class FormattingTests(TestCase):
         settings.USE_L10N = True
         # Catalan locale
         with translation.override('ca', deactivate=True):
-            self.assertEqual('j \de F \de Y', get_format('DATE_FORMAT'))
+            self.assertEqual('j \d\e F \d\e Y', get_format('DATE_FORMAT'))
             self.assertEqual(1, get_format('FIRST_DAY_OF_WEEK'))
             self.assertEqual(',', get_format('DECIMAL_SEPARATOR'))
             self.assertEqual(u'10:15:48', time_format(self.t))
diff --git a/tests/regressiontests/utils/dateformat.py b/tests/regressiontests/utils/dateformat.py
index 313a76ba4b..c1910b0f33 100644
--- a/tests/regressiontests/utils/dateformat.py
+++ b/tests/regressiontests/utils/dateformat.py
@@ -104,7 +104,7 @@ class DateFormatTests(unittest.TestCase):
 
         self.assertEqual(dateformat.format(my_birthday, r'Y z \C\E\T'), u'1979 189 CET')
 
-        self.assertEqual(dateformat.format(my_birthday, r'jS o\f F'), u'8th of July')
+        self.assertEqual(dateformat.format(my_birthday, r'jS \o\f F'), u'8th of July')
 
     def test_futuredates(self):
         the_future = datetime(2100, 10, 25, 0, 00)