Merge lp:~behrooz/gwibber/rtl-support into lp:gwibber

[Behrooz]

added right to left direction support in core instead of themes

[Ken VanDine (ken-vandine)]

Sorry this took so long to get reviewed, this no longer applies to trunk.

Thanks for your submission.

review: Disapprove

Unmerged revisions

669. By Behrooz on 2010-03-12

RTL support in core

=== modified file 'gwibber/microblog/dispatcher.py'
--- gwibber/microblog/dispatcher.py	2010-03-07 04:35:40 +0000
+++ gwibber/microblog/dispatcher.py	2010-03-12 14:21:27 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 import multiprocessing, threading, traceback, json, time
 import gobject, dbus, dbus.service, mx.DateTime
@@ -13,6 +14,7 @@
 from util.couch import RecordMonitor
 from desktopcouch.records.server import CouchDatabase
 from desktopcouch.records.record import Record as CouchRecord
+import re
 
 from util.const import *
 
@@ -53,6 +55,7 @@
     args = dict((str(k), v) for k, v in args.items())
     message_data = PROTOCOLS[account["protocol"]].Client(account)(opname, **args)
     new_messages = []
+    text_cleaner = re.compile(u"[: \n\t\r♻♺]+|@[^ ]+|![^ ]+|#[^ ]+") # signs, @nickname, !group, #tag
 
     for m in message_data:
       key = (m["id"], m["account"], opname, transient)
@@ -61,6 +64,7 @@
         m["operation"] = opname
         m["stream"] = stream
         m["transient"] = transient
+        m["rtl"] = isRTL(re.sub(text_cleaner, "", m["text"].decode('utf-8')))
         
         log.logger.debug("%s Adding record", logtext)
         new_messages.append(m)
@@ -74,6 +78,31 @@
     log.logger.debug("Traceback:\n%s", traceback.format_exc())
     return ("Failure", traceback.format_exc())
 
+def isRTL(s):
+	""" is given text a RTL content? """
+	if len(s)==0 :
+		return False
+	cc = ord(s[0]) # character code
+	if cc>=1536 and cc<=1791 : # arabic, persian, ...
+		return True
+	if cc>=65136 and cc<=65279 : # arabic peresent 2
+		return True
+	if cc>=64336 and cc<=65023 : # arabic peresent 1
+		return True
+	if cc>=1424 and cc<=1535 : # hebrew
+		return True
+	if cc>=64256 and cc<=64335 : # hebrew peresent
+		return True
+	if cc>=1792 and cc<=1871 : # Syriac
+		return True
+	if cc>=1920 and cc<=1983 : # Thaana
+		return True
+	if cc>=1984 and cc<=2047 : # NKo
+		return True
+	if cc>=11568 and cc<=11647 : # Tifinagh
+		return True
+	return False
+
 class OperationCollector:
   def __init__(self):
     self.accounts = CouchDatabase(COUCH_DB_ACCOUNTS, create=True)
 
=== modified file 'ui/templates/base.mako'
--- ui/templates/base.mako	2010-02-14 03:59:00 +0000
+++ ui/templates/base.mako	2010-03-12 14:21:27 +0000
@@ -132,7 +132,11 @@
     ${sigil(data)}   
     ${title(data)}
     <span class="time"> (${timestring(data)})</span><br />
+  % if data.get("rtl", False):
+    <span class="text rtl">${data.get('content', '')}</span>
+  % else:
     <span class="text">${data.get('content', '')}</span>
+  % endif
   </p>
 </%def>
 
 
=== modified file 'ui/templates/css.mako'
--- ui/templates/css.mako	2009-08-16 03:20:57 +0000
+++ ui/templates/css.mako	2010-03-12 14:21:27 +0000
@@ -27,3 +27,9 @@
 .viewmore p {
   text-align: center;
 }
+
+span.rtl {
+	text-align: right;
+	direction: rtl;
+	display: block;
+}