[Debian-islamic-commits] [SCM] Packaging for Monajat branch, master, updated. debian/2.6.1-1-4-g0507322

[أحمد المحمو =?UTF-8?Q?=D8=AF=D9=8A=20?=(Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit 22792728775ff11dd35084a7b2a89cc63f4b69da
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Mon Aug 15 23:42:35 2011 +0200

    Added fix-lang-selection.diff patch from upstream to fix language
    selection.

diff --git a/debian/patches/fix-lang-selection.diff b/debian/patches/fix-lang-selection.diff
new file mode 100644
index 0000000..cd47e2d
--- /dev/null
+++ b/debian/patches/fix-lang-selection.diff
@@ -0,0 +1,41 @@
+Description: Fix language selections
+Origin: http://git.ojuba.org/cgit/monajat/commit/?id=e24c17ab572e5c56c14c8f3af465382ede61091b
+Author: Muayyad Alsadi مؤيد السعدي <alsadi at ojuba.org>
+
+
+--- a/monajat/applet.py
++++ b/monajat/applet.py
+@@ -4,6 +4,7 @@
+ from monajat import Monajat
+ from utils import init_dbus
+ import locale, gettext
++import re
+ 
+ import glib
+ import gtk
+@@ -45,7 +46,7 @@
+     
+   def on_message(self, bus, message):
+     t = message.type
+-    print t
++    # print t
+     if t == gst.MESSAGE_EOS:
+       if self.change_play_status: self.change_play_status()
+       self.gst_player.set_state(gst.STATE_NULL)
+@@ -233,6 +234,7 @@
+     return gtk.Dialog.run(self, *a, **kw)
+ 
+ class applet(object):
++  locale_re=re.compile('^[a-z]+_[A-Z]+$', re.I)
+   skip_auto_fn=os.path.expanduser('~/.monajat-applet-skip-auto')
+   def __init__(self):
+     self.conf_dlg=None
+@@ -244,7 +246,7 @@
+     self.prayer_items=[]
+     kw=self.conf_to_prayer_args()
+     self.prayer=itl.PrayerTimes(**kw)
+-    l=filter(lambda i: i.startswith('ar_') and "_" in i and '.' not in i, locale.locale_alias.keys())
++    l=filter(lambda i: i.startswith(self.m.lang+'_') and self.locale_re.match(i), locale.locale_alias.keys())
+     if l:
+       l,c=l[0].split('_',1)
+       l=l+"_"+c.upper()+".UTF-8"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d4a6d84
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-lang-selection.diff

-- 
Packaging for Monajat