[Debian-islamic-commits] [monajat] 07/12: Dropped fix_locale.diff patch, as it is included upstream.

[أحمد المحمودي (Ahmed El-Mahmoudy)]

This is an automated email from the git hooks/post-receive script.

aelmahmoudy-guest pushed a commit to branch master
in repository monajat.

commit ec6ddc2d9fcf07aaed7a4d410a92d98faf8e4775
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Fri Apr 11 11:15:21 2014 +0200

    Dropped fix_locale.diff patch, as it is included upstream.
---
 debian/patches/fix_locale.diff | 52 ------------------------------------------
 debian/patches/series          |  1 -
 2 files changed, 53 deletions(-)

diff --git a/debian/patches/fix_locale.diff b/debian/patches/fix_locale.diff
deleted file mode 100644
index 6c08092..0000000
--- a/debian/patches/fix_locale.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Set language after several trials
-Origin: http://git.ojuba.org/cgit/monajat/commit/?id=c013cce80553ef1b7749d7e1719f6a6862c84efb
-
----
- monajat/applet.py |   23 +++++++++++++++++++----
- 1 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/monajat/applet.py b/monajat/applet.py
-index bb5e750..211b4cb 100644
---- a/monajat/applet.py
-+++ b/monajat/applet.py
-@@ -241,7 +241,25 @@ class ConfigDlg(gtk.Dialog):
-     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_locale(self, lang):
-+    try: l=locale.setlocale(locale.LC_MESSAGES, (lang, 'UTF-8'))
-+    except: pass
-+    else:
-+      if l: os.environ['LC_MESSAGES']=l
-+      return
-+    for l in locale.locale_alias.keys():
-+      if not l.startswith(lang+'_') or not self.locale_re.match(l): continue
-+      l,c=l.split('_',1)
-+      l=l+"_"+c.upper()+".UTF-8"
-+      try: locale.setlocale(locale.LC_MESSAGES, l)
-+      except locale.Error: pass
-+      else:
-+          os.environ['LC_MESSAGES']=l
-+          return
-+
-   def __init__(self):
-     self.conf_dlg=None
-     self.chngbody=time.time()
-@@ -252,10 +270,7 @@ class applet(object):
-     self.prayer_items=[]
-     kw=self.conf_to_prayer_args()
-     self.prayer=itl.PrayerTimes(**kw)
--    try:
--      l=locale.setlocale(locale.LC_MESSAGES, (self.m.lang, 'UTF-8'))
--      if l: os.environ['LC_MESSAGES']=l
--    except locale.Error: pass
-+    self._init_locale(self.m.lang)
-     ld=os.path.join(self.m.get_prefix(),'..','locale')
-     gettext.install('monajat', ld, unicode=0)
-     self.ptnames=[_("Fajr"), _("Sunrise"), _("Dhuhr"), _("Asr"), _("Maghrib"), _("Isha'a")]
--- 
-1.7.7.2
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c0b7c51..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_locale.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/monajat.git