Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/isida/3.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiSabler <dissy@ya.ru>2013-11-04 19:23:36 +0400
committerdiSabler <dissy@ya.ru>2013-11-04 19:23:36 +0400
commit16c67b2044a38154088d2cfdb4cb1137bad6e476 (patch)
tree59888f8010ff12201a195dce27c3d2a1ff5fbe5a
parent618d7a11f645eefe21d5d9f1c86534545019f506 (diff)
fix: localization in steam plugin
fix: parameters in steam commands
-rw-r--r--data/locales/ru.txt8
-rw-r--r--data/locales/ua.txt4
-rw-r--r--plugins/steam.py52
3 files changed, 34 insertions, 30 deletions
diff --git a/data/locales/ru.txt b/data/locales/ru.txt
index 7ea726c..cf7cfa8 100644
--- a/data/locales/ru.txt
+++ b/data/locales/ru.txt
@@ -1282,8 +1282,10 @@ Check conference activity\nspy add <conference>[ u<number>][ m<number>] - add co
# file: plugins/steam.py
Nick: %s\nName: %s\nCountry: %s\nCreated: %s\nLast logoff: %s\nTotal friends: %s\nFriends: %s Ник: %s\nИмя: %s\nСтрана: %s\nСоздан: %s\nПоследний выход: %s\nВсего друзей: %s\nДрузья: %s
+Steam user not found! Пользователь Steam не найден!
+Steam API is broken! Steam API сломано!
Steam API key is wrong! Неверный Steam API ключ!
-Steam ID shald be digital! Steam ID должен быть цифровым!
+Steam ID should be digital! Steam ID должен быть цифровым!
Show information about Steam profile Показ информации о профиле Steam
# file: plugins/svn.py
@@ -1803,5 +1805,5 @@ Youtube settings Настройки youtube
API settings Настройки API
# write locale file: ru.txt
-# total: 1475
-# missed translations: 6
+# total: 1477
+# missed translations: 3
diff --git a/data/locales/ua.txt b/data/locales/ua.txt
index 70bf988..09719ec 100644
--- a/data/locales/ua.txt
+++ b/data/locales/ua.txt
@@ -1795,6 +1795,6 @@ Logs settings Налаштування логів
Youtube settings Налаштування Youtube
# write locale file: ua.txt
-# total: 1475
-# missed translations: 6
+# total: 1477
+# missed translations: 8
diff --git a/plugins/steam.py b/plugins/steam.py
index c56168a..df342a5 100644
--- a/plugins/steam.py
+++ b/plugins/steam.py
@@ -37,32 +37,34 @@ def steam(type, jid, nick, text):
if text.isdigit():
STEAM_API = GT('steam_api_key')
if len(STEAM_API) == 32:
- data = load_page(steam_summary, {'key': STEAM_API, 'steamids': text})
- data = json.loads(data)['response']['players'][0]
- _PERSONANAME = data.get('personaname','')
- _REALNAME = data.get('realname','')
- _LOCCOUNTRYCODE = data.get('loccountrycode','')
- _TIMECREATED = data.get('timecreated','')
- _LASTLOGOFF = data.get('lastlogoff','')
- data = load_page(steam_friends, {'key': STEAM_API, 'steamid': text, 'relationship': 'friend'})
- data = json.loads(data)['friendslist']['friends']
- _FRIENDS = ','.join(t['steamid'] for t in data)
- data = load_page(steam_summary, {'key': STEAM_API, 'steamids': _FRIENDS})
- data = json.loads(data)['response']['players']
- _FRIENDS = [(t.get('personaname','-'),t['steamid']) for t in data]
- _LEN_FRIENDS = len(_FRIENDS)
- if need_id: _FRIENDS = ' | '.join('%s %s' % t for t in _FRIENDS)
- else: _FRIENDS = ', '.join(t[0] for t in _FRIENDS)
-
- msg = L('Nick: %s\nName: %s\nCountry: %s\nCreated: %s\nLast logoff: %s\nTotal friends: %s\nFriends: %s','%s/%s'%(jid,nick)) %\
- (_PERSONANAME,_REALNAME,_LOCCOUNTRYCODE,time_str(_TIMECREATED),time_str(_LASTLOGOFF),_LEN_FRIENDS,_FRIENDS)
-
- if need_id and type == 'groupchat':
- send_msg(type, jid, nick, L('Send for you in private','%s/%s'%(jid,nick)))
- type = 'chat'
-
+ try:
+ data = load_page(steam_summary, {'key': STEAM_API, 'steamids': text})
+ data = json.loads(data)['response']['players']
+ if data:
+ data = data[0]
+ _PERSONANAME = data.get('personaname','')
+ _REALNAME = data.get('realname','')
+ _LOCCOUNTRYCODE = data.get('loccountrycode','')
+ _TIMECREATED = data.get('timecreated','')
+ _LASTLOGOFF = data.get('lastlogoff','')
+ data = load_page(steam_friends, {'key': STEAM_API, 'steamid': text, 'relationship': 'friend'})
+ data = json.loads(data)['friendslist']['friends']
+ _FRIENDS = ','.join(t['steamid'] for t in data)
+ data = load_page(steam_summary, {'key': STEAM_API, 'steamids': _FRIENDS})
+ data = json.loads(data)['response']['players']
+ _FRIENDS = [(t.get('personaname','-'),t['steamid']) for t in data]
+ _LEN_FRIENDS = len(_FRIENDS)
+ if need_id: _FRIENDS = ' | '.join('%s %s' % t for t in _FRIENDS)
+ else: _FRIENDS = ', '.join(t[0] for t in _FRIENDS)
+ msg = L('Nick: %s\nName: %s\nCountry: %s\nCreated: %s\nLast logoff: %s\nTotal friends: %s\nFriends: %s','%s/%s'%(jid,nick)) %\
+ (_PERSONANAME,_REALNAME,_LOCCOUNTRYCODE,time_str(_TIMECREATED),time_str(_LASTLOGOFF),_LEN_FRIENDS,_FRIENDS)
+ if need_id and type == 'groupchat':
+ send_msg(type, jid, nick, L('Send for you in private','%s/%s'%(jid,nick)))
+ type = 'chat'
+ else: msg = L('Steam user not found!','%s/%s'%(jid,nick))
+ except: msg = L('Steam API is broken!','%s/%s'%(jid,nick))
else: msg = L('Steam API key is wrong!','%s/%s'%(jid,nick))
- else: msg = L('Steam ID shald be digital!','%s/%s'%(jid,nick))
+ else: msg = L('Steam ID should be digital!','%s/%s'%(jid,nick))
send_msg(type, jid, nick, msg)
global execute