Day names header is garbled with `Accept-Language: ja`

[Jun Omae]

When browser sends Accept-Language: ja, WikiCalendarMacro renders garbled header in the calendar.

• CentOS 5.9
• Python 2.4
• Trac 0.12.5
• tracd
• WikiCalendarMacro r12844

Request headers:

GET /wiki/SandBox/WikiCalendarMacro HTTP/1.1
Host: localhost:3000
User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:19.0) Gecko/20100101 Firefox/19.0
Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
Accept-Language: ja,en-us;q=0.7,en;q=0.3
Accept-Encoding: gzip, deflate
DNT: 1
Cookie: auth_sess=3bbf3b909d6b22263a27589ac10a5b982694efd3; trac_form_token=af700c16ee5b5954f9430684; trac_auth=826fd3482f6220360de2c655d04e8fda
Authorization: Digest username="foobar", realm="auth", nonce="571817734d427a974703a57ce65da867", uri="/wiki/SandBox/WikiCalendarMacro", response="6f87d9dd77b4351e53f0c96408efc4de", qop=auth, nc=00000152, cnonce="17b7a21e4253ce7a"
Connection: keep-alive

Response headers:

HTTP/1.1 200 OK
Server: tracd/0.12.5 Python/2.4.3
Date: Sun, 31 Mar 2013 06:24:20 GMT
Cache-Control: must-revalidate
Expires: Fri, 01 Jan 1999 00:00:00 GMT
Content-Type: text/html;charset=utf-8
Content-Length: 14444

From trac.log;

...
03:15:43 PM Trac[util] DEBUG: args: ('wiki', u'SandBox/WikiCalendarMacro')
03:15:43 PM Trac[util] DEBUG: prefetch: 0 rows
03:15:43 PM Trac[formatter] DEBUG: Executing Wiki macro WikiCalendar by provider <wikicalendar.macros.WikiCalendarMacros object at 0xa96340c>
15��15ʬ43�� Trac[macros] DEBUG: Locale setting for calendar: ja_JP.eucJP
...

At least, should use ja_JP.UTF8 instead of ja_JP.eucJP.

[Jun Omae]

locale.getlocale() returns language code, encoding as tuple. The encoding is able to use for unicode decoding.

wikicalendar/macros.py

@@ -496 +497 @@
         except AttributeError:
             # Available since in Trac 0.12 .
             loc_req = None
+        loc_prop = loc_encoding = None
         if loc_req:
             loc = locale.getlocale()
             loc_prop = locale.normalize(loc_req)
@@ -508 +510 @@
                     locale.setlocale(locale.LC_TIME, loc_prop)
                 except locale.Error:
                     loc_prop = None
+            loc_encoding = locale.getlocale(locale.LC_TIME)[1]
             self.env.log.debug('Locale setting for calendar: ' + str(loc_prop))
 
         # Finally building the output
@@ -550 +553 @@
         heading = tag.tr()
         heading(align='center')
 
-        for day in calendar.weekheader(2).split()[:-2]:
-            col = tag.th(to_unicode(day))
-            col(class_='workday', scope='col')
+        for idx, day in enumerate(calendar.day_abbr):
+            day = to_unicode(day, charset=loc_encoding)
+            col = tag.th(day[:2])
+            col(class_=('workday', 'weekend')[idx == 6], scope='col')
             heading(col)
-        for day in calendar.weekheader(2).split()[-2:]:
-            col = tag.th(to_unicode(day))
-            col(class_='weekend', scope='col')
-            heading(col)
 
         heading = buff(tag.thead(heading))
 

[Steffen Hoffmann]

Replying to jun66j5:

locale.getlocale() returns language code, encoding as tuple. The encoding is able to use for unicode decoding.

Thanks for the suggestion, even if #10992 suggests it might be only an intermediate solution.

Regarding the calendar header constructor I've felt the old code was sub-optimal, but couldn't do better. Using a test result as index looks much more elegant indeed.

You proposed patch made me think about another possible aspect of customization: number of workdays per week. It must have felt as natural to you to set weekend == Sunday as it does to me to set it according to the two-days-weekend like done by the replaced code. Number of weekdays matters especially for ticket calendar due to different column widths. This is in CSS, hence it's not so flexible.

[Steffen Hoffmann]

(In [12847]) WikiCalendarMacro: Use encoding to get proper weekday headers, refs #10992 and #10993.

Follow-up on [11557], although it might be yet another intermediate step as suggested by #10992. Thanks again to Jun Omae for the patch code and related explainations on the issue.

[Steffen Hoffmann]

(In [12951]) WikiCalendarMacro: Switch from Python core modules calendar and locale towards using Babel by default, refs #10992 and #10993.

This is the bare minimum of changes, that don't break code, but turn Babel into an undeclared, strict requirement so far. I'll fix that later. Starting to remove class attribute variables for becoming thread-safe again.

[Steffen Hoffmann]

(In [12991]) WikiCalendarMacro: Releasing current, tested macro package as final product, closes #7639, #8175, #9718, #10991, #10992 and #10993.

Special thanks to Jun Omae for pushing development by testing and providing valuable hints in our discussion about utilizing Babel for better localization and for making macro execution thread-safe as well.