Fix export in XML of dates when timezone is negative.
--- a/src/cm/templates/site/export.xml Mon Sep 24 01:12:12 2012 -0700
+++ b/src/cm/templates/site/export.xml Mon Sep 24 12:11:49 2012 +0200
@@ -1,10 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
{% load com %}
{% autoescape off %}
-<?xml version="1.0" encoding="UTF-8"?>
<co_ment_text>
<title>{{ title }}</title>
- <created>{{ created|date:"c" }}+{{ tz|leading_zeros:"2" }}</created>
- <modified>{{ modified|date:"c" }}+{{ tz|leading_zeros:"2" }}</modified>
+ <created>{{ created|date:"c" }}{{ tz|leading_zeros:"2" }}</created>
+ <modified>{{ modified|date:"c" }}{{ tz|leading_zeros:"2" }}</modified>
<name>{{ name }}</name>
<email>{{ email }}</email>
<format>{{ format }}</format>
@@ -23,8 +23,8 @@
<title>{{ c.title }}</title>
<state>{{ c.state }}</state>
<deleted>{{ c.deleted }}</deleted>
- <created>{{ c.created|date:"c" }}+{{ tz|leading_zeros:"2" }}</created>
- <modified>{{ c.modified|date:"c" }}+{{ tz|leading_zeros:"2" }}</modified>
+ <created>{{ c.created|date:"c" }}{{ tz|leading_zeros:"2" }}</created>
+ <modified>{{ c.modified|date:"c" }}{{ tz|leading_zeros:"2" }}</modified>
<name>{{ c.name }}</name>
<email>{{ c.email }}</email>
<format>{{ c.format }}</format>
--- a/src/cm/templatetags/com.py Mon Sep 24 01:12:12 2012 -0700
+++ b/src/cm/templatetags/com.py Mon Sep 24 12:11:49 2012 +0200
@@ -322,10 +322,15 @@
"""
Given an integer, returns a string representation, padded with [desired_digits] zeros.
"""
- num_zeros = int(desired_digits) - len(str(value))
+ int_val = int(value)
+ if (int_val > 0):
+ sign = '+'
+ else:
+ sign = '-'
+ num_zeros = int(desired_digits) - len(str(abs(int_val)))
padded_value = []
while num_zeros >= 1:
padded_value.append("0")
num_zeros = num_zeros - 1
- padded_value.append(str(value))
- return "".join(padded_value)
+ padded_value.append(str(abs(int_val)))
+ return sign + "".join(padded_value)