masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #178 from richese/fixes

Browse Source 
Fixes
This commit is contained in:
enkore 2015-03-16 16:03:20 +01:00
commit 0182372d92
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
i3pystatus/clock.py
View File

@ -32,13 +32,24 @@ class Clock(IntervalModule):
on_downscroll = ["scroll_format", -1] on_downscroll = ["scroll_format", -1]
def init(self): def init(self):
lang, enc = os.environ.get('LANG', None).split('.', 1) env_lang = os.environ.get('LC_TIME', None)
if lang != locale.getlocale(locale.LC_TIME)[0]: if env_lang is None:
env_lang = os.environ.get('LANG', None)
if env_lang is not None:
if env_lang.find('.') != -1:
lang = tuple(env_lang.split('.', 1))
else:
lang = (env_lang, None)
else:
lang = (None, None)
if lang != locale.getlocale(locale.LC_TIME):
# affects datetime.time.strftime() in whole program # affects datetime.time.strftime() in whole program
locale.setlocale(locale.LC_TIME, (lang, enc)) locale.setlocale(locale.LC_TIME, lang)
if self.format is None: if self.format is None:
if lang == 'en_US': if lang[0] == 'en_US':
# MDY format - United States of America # MDY format - United States of America
self.format = ["%a %b %-d %X"] self.format = ["%a %b %-d %X"]
else: else:

4
i3pystatus/now_playing.py
View File

@ -80,6 +80,10 @@ class NowPlaying(IntervalModule):
def get_player(self): def get_player(self):
if self.player: if self.player:
player = "org.mpris.MediaPlayer2." + self.player player = "org.mpris.MediaPlayer2." + self.player
try:
return dbus.SessionBus().get_object(player, "/org/mpris/MediaPlayer2")
except dbus.exceptions.DBusException:
raise NoPlayerException()
else: else:
player = self.find_player() player = self.find_player()
return dbus.SessionBus().get_object(player, "/org/mpris/MediaPlayer2") return dbus.SessionBus().get_object(player, "/org/mpris/MediaPlayer2")