Updated some translations; basic proxy support (needs testing)

src/app-configuration.defaults

@@ -58,4 +58,10 @@ view_user_lists = string(default="control+win+l")
 get_more_items = string(default="alt+win+pageup")
 reverse_geocode = string(default="control+win+g")
 view_reverse_geocode = string(default="control+win+shift+g")
-get_trending_topics = string(default="control+win+t")
+get_trending_topics = string(default="control+win+t")
+
+[proxy]
+server = string(default="")
+port = string(default="")
+user = string(default="")
+password = string(default="")

src/application.py

@@ -5,8 +5,8 @@ if snapshot == False:
  version = "0.80"
  update_url = 'http://twblue.es/updates/twblue_ngen.json'
 else:
- version = "8"
- update_url = 'http://twblue.es/updates/snap.json'
+ version = "9"
+ update_url = 'http://twblue.es/updates/snapshots_ngen.json'
 author = u"Manuel Cortéz"
 authorEmail = "manuel@manuelcortez.net"
 copyright = u"copyright (C) 2013-2015, Manuel cortéz"

src/controller/settings.py

@@ -20,6 +20,7 @@ class globalSettingsController(object):
   self.dialog = configuration.configurationDialog()
   self.create_config()
   self.needs_restart = False
+  self.is_started = True
 
  def create_config(self):
   self.langs = languageHandler.getAvailableLanguages()
@@ -36,6 +37,11 @@ class globalSettingsController(object):
   self.dialog.set_value("general", "use_invisible_shorcuts", config.app["app-settings"]["use_invisible_keyboard_shorcuts"])
   self.dialog.set_value("general", "disable_sapi5", config.app["app-settings"]["voice_enabled"])
   self.dialog.set_value("general", "hide_gui", config.app["app-settings"]["hide_gui"])  
+  self.dialog.create_proxy()
+  self.dialog.set_value("proxy", "server", config.app["proxy"]["server"])
+  self.dialog.set_value("proxy", "port", config.app["proxy"]["port"])
+  self.dialog.set_value("proxy", "user", config.app["proxy"]["user"])
+  self.dialog.set_value("proxy", "password", config.app["proxy"]["password"])
   self.dialog.realize()
   self.response = self.dialog.get_response()
 
@@ -52,6 +58,13 @@ class globalSettingsController(object):
   config.app["app-settings"]["ask_at_exit"] = self.dialog.get_value("general", "ask_at_exit")
   config.app["app-settings"]["play_ready_sound"] = self.dialog.get_value("general", "play_ready_sound")
   config.app["app-settings"]["speak_ready_msg"] = self.dialog.get_value("general", "speak_ready_msg")
+  if config.app["proxy"]["server"] != self.dialog.get_value("proxy", "server") or config.app["proxy"]["port"] != self.dialog.get_value("proxy", "port") or config.app["proxy"]["user"] != self.dialog.get_value("proxy", "user") or config.app["proxy"]["password"] != self.dialog.get_value("proxy", "password"):
+   if self.is_started == True:
+    self.needs_restart = True
+   config.app["proxy"]["server"] = self.dialog.get_value("proxy", "server")
+   config.app["proxy"]["port"] = self.dialog.get_value("proxy", "port")
+   config.app["proxy"]["user"] = self.dialog.get_value("proxy", "user")
+   config.app["proxy"]["password"] = self.dialog.get_value("proxy", "password")
   config.app.write()
 
 class accountSettingsController(globalSettingsController):

src/locales/ar/lc_messages/twblue.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TW Blue 0.50\n"
 "POT-Creation-Date: 2014-12-10 23:20+Hora estándar central (México)\n"
-"PO-Revision-Date: 2014-12-11 15:57+0100\n"
+"PO-Revision-Date: 2015-01-03 20:32+0300\n"
 "Last-Translator: José Manuel Delicado Alcolea <jmdaweb@hotmail.com>\n"
 "Language-Team: Mohammed Al Shara <mohammed@atexplorer.com>\n"
 "Language: ar\n"
@@ -187,7 +187,7 @@ msgstr "تم تحديث مفضلات شخص ما"
 
 #: ../src\extra\SoundsTutorial\gui.py:19
 msgid "The tweet has coordinates to determine its location"
-msgstr ""
+msgstr "يوجد في هذه  التغريدة معلومات لتحديد الموقع"
 
 #: ../src\extra\SoundsTutorial\gui.py:20
 msgid "There are no more tweets to read"
@@ -332,10 +332,12 @@ msgid ""
 "Are you sure you want to delete this user from the database? This user will "
 "not appear on the autocomplete results anymore."
 msgstr ""
+"هل أنت متأكد من رغبتك في حذف هذا المستخدم من قاعدة البيانات؟ لن يظهر "
+"المستخدم في قائمة التعبءة التلقائية بعد هذا."
 
 #: ../src\extra\autocompletionUsers\manage.py:38
 msgid "Confirm"
-msgstr ""
+msgstr "تأكيد"
 
 #: ../src\extra\autocompletionUsers\settings.py:24
 msgid ""
@@ -347,35 +349,35 @@ msgstr ""
 
 #: ../src\extra\autocompletionUsers\wx_manage.py:7
 msgid "Manage Autocomplete users’ database"
-msgstr ""
+msgstr "إدارة قاعدة بيانات التعبئة التلقائية"
 
 #: ../src\extra\autocompletionUsers\wx_manage.py:10
 msgid "Editing TWBlue users database"
-msgstr ""
+msgstr "يتم تحرير قاعدة بيانات المستخديم للبرنامج"
 
 #: ../src\extra\autocompletionUsers\wx_manage.py:11
 msgid "Name"
-msgstr ""
+msgstr "الإسم"
 
 #: ../src\extra\autocompletionUsers\wx_manage.py:11
 msgid "Username"
-msgstr ""
+msgstr "إسم المستخدم"
 
 #: ../src\extra\autocompletionUsers\wx_manage.py:14
 msgid "Add user"
-msgstr ""
+msgstr "إضف مستخدم"
 
 #: ../src\extra\autocompletionUsers\wx_manage.py:15
 msgid "Remove user"
-msgstr ""
+msgstr "إحذف مستخدم"
 
 #: ../src\extra\autocompletionUsers\wx_manage.py:36
 msgid "Add user to database"
-msgstr ""
+msgstr "إضف المستخدم إلى قاعدة البيانات"
 
 #: ../src\extra\autocompletionUsers\wx_manage.py:36
 msgid "Twitter username"
-msgstr ""
+msgstr "إسم مستخدم تويتر"
 
 #: ../src\extra\autocompletionUsers\wx_manage.py:42
 #: ../src\gui\dialogs\configuration.py:248 ../src\gui\main.py:234
@@ -402,7 +404,7 @@ msgstr "إضف مستخدمون من صفحة الأصدقاء"
 
 #: ../src\extra\autocompletionUsers\wx_settings.py:13
 msgid "See the users list"
-msgstr ""
+msgstr "إعرض قائمة المستخدمين"
 
 #: ../src\extra\autocompletionUsers\wx_settings.py:25
 msgid "Done"
@@ -1013,11 +1015,11 @@ msgstr "&إظهر المستخدمين"
 
 #: ../src\gui\buffers\menus.py:126
 msgid "&Tweet about this trend"
-msgstr ""
+msgstr "&التغريد حول هذا الموضوع"
 
 #: ../src\gui\buffers\menus.py:129
 msgid "&Show item"
-msgstr ""
+msgstr "&إعرض العنصر"
 
 #: ../src\gui\buffers\panels.py:28
 msgid "Announce"
@@ -1070,6 +1072,7 @@ msgstr "إسأل قبل الخروج من البرنامج؟"
 #: ../src\gui\dialogs\configuration.py:58
 msgid "Use invisible interface's keyboard shorcuts on the GUI"
 msgstr ""
+"إستخدم مفاتيح الإختصار الخاصة بالواجهة المخفية في واجهة التطبيق الظاهرة؟"
 
 #: ../src\gui\dialogs\configuration.py:61
 msgid "Relative times"
@@ -1323,7 +1326,7 @@ msgstr "إبلاغ برسائل غير مرغوب بها"
 
 #: ../src\gui\dialogs\follow.py:52
 msgid "Ignore tweets from this client"
-msgstr ""
+msgstr "تجاهل التغريدات من هذا التطبيق"
 
 #: ../src\gui\dialogs\follow.py:64 ../src\gui\dialogs\search.py:40
 #: ../src\gui\dialogs\trending.py:50 ../src\gui\dialogs\utils.py:39
@@ -1341,7 +1344,7 @@ msgstr "لقد قمت بإلغاء كتم %s"
 
 #: ../src\gui\dialogs\follow.py:142
 msgid "You can't ignore direct messages"
-msgstr ""
+msgstr "لا يمكن تجاهل الرسائل الخاصة"
 
 #: ../src\gui\dialogs\lists.py:36
 msgid "Lists manager"
@@ -1530,7 +1533,7 @@ msgstr "المرسل إليه"
 
 #: ../src\gui\dialogs\message.py:318
 msgid "Men&tion all"
-msgstr ""
+msgstr "ذكر الجميع"
 
 #: ../src\gui\dialogs\message.py:345
 msgid "Tweet - %i characters "
@@ -1694,7 +1697,7 @@ msgstr "البحث"
 
 #: ../src\gui\main.py:74
 msgid "View &trending topics"
-msgstr ""
+msgstr "إعرض المواضيع المتداولة"
 
 #: ../src\gui\main.py:76
 msgid "&Lists manager"
@@ -2052,7 +2055,7 @@ msgstr "فحص التحديثات الجديدة"
 
 #: ../src\issueReporter\gui.py:30
 msgid "Translation"
-msgstr ""
+msgstr "الترجمة"
 
 #: ../src\issueReporter\gui.py:31
 msgid "always"
@@ -2060,7 +2063,7 @@ msgstr "دائما"
 
 #: ../src\issueReporter\gui.py:31
 msgid "have not tried"
-msgstr ""
+msgstr "لم تحاول"
 
 #: ../src\issueReporter\gui.py:31
 msgid "random"
@@ -2331,15 +2334,15 @@ msgstr "يحمل العناصر السابقة في أي صفحة"
 
 #: ../src\keystrokeEditor\constants.py:45
 msgid "Get location of any tweet"
-msgstr ""
+msgstr "إحصل على موقع أي تغريدة"
 
 #: ../src\keystrokeEditor\constants.py:46
 msgid "Displays the tweet's location in a dialog"
-msgstr ""
+msgstr "يعرض موقع التغريدة في صندوق حوار"
 
 #: ../src\keystrokeEditor\constants.py:47
 msgid "Creates a buffer for displaying trends for a desired place"
-msgstr ""
+msgstr "ينشء صفحة لعرض التغريدات المتداولة حول المكان المرغوب به"
 
 #: ../src\keystrokeEditor\gui.py:10
 msgid "Keystroke editor"

src/locales/es/LC_MESSAGES/twblue.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TW Blue 0.44\n"
 "POT-Creation-Date: 2014-12-10 23:20+Hora estándar central (México)\n"
-"PO-Revision-Date: 2014-12-21 07:01-0600\n"
+"PO-Revision-Date: 2014-12-10 23:36-0600\n"
 "Last-Translator: Manuel Cortéz <manuel@manuelcortez.net>\n"
 "Language-Team: Manuel Cortez <info@twblue.com.mx>\n"
 "Language: es\n"
@@ -2655,7 +2655,7 @@ msgstr "feb"
 
 #: ../src\twitter\compose.py:87
 msgid "mar"
-msgstr "mar"
+msgstr "marAmárico"
 
 #: ../src\twitter\compose.py:88
 msgid "apr"
@@ -2663,7 +2663,7 @@ msgstr "abr"
 
 #: ../src\twitter\compose.py:89
 msgid "may"
-msgstr "may"
+msgstr "mayMayo"
 
 #: ../src\twitter\compose.py:90
 msgid "jun"

src/locales/it/LC_MESSAGES/twblue.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TW Blue 0.50\n"
 "POT-Creation-Date: 2014-12-10 23:20+Hora estándar central (México)\n"
-"PO-Revision-Date: 2014-12-12 17:53+0100\n"
+"PO-Revision-Date: 2015-01-28 11:22+0100\n"
 "Last-Translator: Chris Leo Mameli <llajta2012@gmail.com>\n"
 "Language-Team: Manuel Cortez <info@twblue.com.mx>\n"
 "Language: it\n"
@@ -1867,7 +1867,7 @@ msgstr "Ricerca"
 
 #: ../src\gui\main.py:305
 msgid "Timelines"
-msgstr "Linea temporale"
+msgstr "Linee temporali di..."
 
 #: ../src\gui\main.py:308 ../src\gui\main.py:747
 msgid "Timeline for %s"

src/locales/pl/LC_MESSAGES/twblue.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tw Blue 0.50\n"
 "POT-Creation-Date: 2014-12-10 23:20+Hora estándar central (México)\n"
-"PO-Revision-Date: 2014-12-11 19:52+0100\n"
+"PO-Revision-Date: 2014-12-17 22:07+0100\n"
 "Last-Translator: Paweł Masarczyk <pawelmasarczyk@gmail.com>\n"
 "Language-Team: Paweł Masarczyk <pawelmasarczyk@gmail.com>\n"
 "Language: pl\n"
@@ -1727,7 +1727,7 @@ msgstr "Wybierz link"
 
 #: ../src\gui\main.py:66
 msgid "S&witch account"
-msgstr "S&z kontem"
+msgstr "&Przełącz konto"
 
 #: ../src\gui\main.py:68
 msgid "&Update profile"

src/twitter/buffers/indibidual.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+import config
+from requests.auth import HTTPProxyAuth
 from twitter import compose, utils
 from twython import TwythonStreamer
 from pubsub import pub
@@ -8,7 +10,14 @@ log = original_logger.getLogger("TimelinesStream")
 class timelinesStreamer(TwythonStreamer):
  def __init__(self, app_key, app_secret, oauth_token, oauth_token_secret, timeout=300, retry_count=None, retry_in=10, client_args=None, handlers=None, chunk_size=1, session=None):
   self.session = session
-  super(timelinesStreamer, self).__init__(app_key, app_secret, oauth_token, oauth_token_secret, timeout=60, retry_count=None, retry_in=180, client_args=None, handlers=None, chunk_size=1)
+  args = None
+  if config.app["proxy"]["server"] != "" and config.app["proxy"]["port"] != "":
+   args = {"proxies": {"http": "http://{0}:{1}".format(config.app["proxy"]["server"], config.app["proxy"]["port"]),
+  "https": "https://{0}:{1}".format(config.app["proxy"]["server"], config.app["proxy"]["port"])}}
+   if config.app["proxy"]["user"] != "" and config.app["proxy"]["password"] != "":
+    auth = HTTPProxyAuth(config.app["proxy"]["user"], config.app["proxy"]["password"])
+    args["auth"] = auth
+  super(timelinesStreamer, self).__init__(app_key, app_secret, oauth_token, oauth_token_secret, timeout=60, retry_count=None, retry_in=180, client_args=args, handlers=None, chunk_size=1)
 
  def on_error(self, status_code, data):
   log.debug("%s: %s" % (status_code, data))

src/twitter/buffers/stream.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+import config
+from requests.auth import HTTPProxyAuth
 from twitter import utils
 from twython import TwythonStreamer
 from pubsub import pub
@@ -6,8 +8,15 @@ import logging as original_logger
 log = original_logger.getLogger("MainStream")
 
 class streamer(TwythonStreamer):
- def __init__(self, app_key, app_secret, oauth_token, oauth_token_secret, sessionObject, *args, **kwargs):
-  super(streamer, self).__init__(app_key, app_secret, oauth_token, oauth_token_secret, *args, **kwargs)
+ def __init__(self, app_key, app_secret, oauth_token, oauth_token_secret, sessionObject, *a, **kw):
+  args = None
+  if config.app["proxy"]["server"] != "" and config.app["proxy"]["port"] != "":
+   args = {"proxies": {"http": "http://{0}:{1}".format(config.app["proxy"]["server"], config.app["proxy"]["port"]),
+  "https": "https://{0}:{1}".format(config.app["proxy"]["server"], config.app["proxy"]["port"])}}
+   if config.app["proxy"]["user"] != "" and config.app["proxy"]["password"] != "":
+    auth = HTTPProxyAuth(config.app["proxy"]["user"], config.app["proxy"]["password"])
+    args["auth"] = auth
+  super(streamer, self).__init__(app_key, app_secret, oauth_token, oauth_token_secret, client_args=args, *a, **kw)
   self.session = sessionObject
   self.muted_users = self.session.db["muted_users"]
 #  self.blocked_users = []

src/twitter/twitter.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from requests.auth import HTTPProxyAuth
+import config
 import random
 import BaseHTTPServer
 import webbrowser
@@ -6,11 +8,18 @@ from twython import Twython, TwythonError
 from keys import keyring
 import authorisationHandler
 
-
 class twitter(object):
 
  def login(self, user_key, user_secret, verify_credentials):
-  self.twitter = Twython(keyring.get("api_key"), keyring.get("api_secret"), user_key, user_secret)
+  if config.app["proxy"]["server"] != "" and config.app["proxy"]["port"] != "":
+   args = {"proxies": {"http": "http://{0}:{1}".format(config.app["proxy"]["server"], config.app["proxy"]["port"]),
+  "https": "https://{0}:{1}".format(config.app["proxy"]["server"], config.app["proxy"]["port"])}}
+   if config.app["proxy"]["user"] != "" and config.app["proxy"]["password"] != "":
+    auth = HTTPProxyAuth(config.app["proxy"]["user"], config.app["proxy"]["password"])
+    args["auth"] = auth
+   self.twitter = Twython(keyring.get("api_key"), keyring.get("api_secret"), user_key, user_secret, client_args=args)
+  else:
+   self.twitter = Twython(keyring.get("api_key"), keyring.get("api_secret"), user_key, user_secret)
   if verify_credentials == True:
    self.credentials = self.twitter.verify_credentials()
 
@@ -18,7 +27,15 @@ class twitter(object):
   authorisationHandler.logged = False
   port = random.randint(30000, 66000)
   httpd = BaseHTTPServer.HTTPServer(('127.0.0.1', port), authorisationHandler.handler)
-  twitter = Twython(keyring.get("api_key"), keyring.get("api_secret"), auth_endpoint='authorize')
+  if config.app["proxy"]["server"] != "" and config.app["proxy"]["port"] != "":
+   args = {"proxies": {"http": "http://{0}:{1}".format(config.app["proxy"]["server"], config.app["proxy"]["port"]),
+  "https": "https://{0}:{1}".format(config.app["proxy"]["server"], config.app["proxy"]["port"])}}
+   if config.app["proxy"]["user"] != "" and config.app["proxy"]["password"] != "":
+    auth = HTTPProxyAuth(config.app["proxy"]["user"], config.app["proxy"]["password"])
+    args["auth"] = auth
+   twitter = Twython(keyring.get("api_key"), keyring.get("api_secret"), auth_endpoint='authorize', client_args=args)
+  else:
+   twitter = Twython(keyring.get("api_key"), keyring.get("api_secret"), auth_endpoint='authorize')
   auth = twitter.get_authentication_tokens("http://127.0.0.1:{0}".format(port,))
   webbrowser.open_new_tab(auth['auth_url'])
   while authorisationHandler.logged == False:

src/wxUI/dialogs/configuration.py

@@ -3,6 +3,7 @@ import baseDialog
 import wx
 import logging as original_logger
 import application
+
 class general(wx.Panel, baseDialog.BaseWXDialog):
  def __init__(self, parent, languages):
   super(general, self).__init__(parent)
@@ -28,6 +29,37 @@ class general(wx.Panel, baseDialog.BaseWXDialog):
   sizer.Add(self.hide_gui, 0, wx.ALL, 5)
   self.SetSizer(sizer)
 
+class proxy(wx.Panel, baseDialog.BaseWXDialog):
+
+ def __init__(self, parent):
+  super(proxy, self).__init__(parent)
+  sizer = wx.BoxSizer(wx.VERTICAL)
+  lbl = wx.StaticText(self, wx.NewId(), _(u"Proxy server: "))
+  self.server = wx.TextCtrl(self, -1)
+  serverBox = wx.BoxSizer(wx.HORIZONTAL)
+  serverBox.Add(lbl, 0, wx.ALL, 5)
+  serverBox.Add(self.server, 0, wx.ALL, 5)
+  sizer.Add(serverBox, 0, wx.ALL, 5)
+  lbl = wx.StaticText(self, wx.NewId(), _(u"Port: "))
+  self.port = wx.TextCtrl(self, wx.NewId())
+  portBox = wx.BoxSizer(wx.HORIZONTAL)
+  portBox.Add(lbl, 0, wx.ALL, 5)
+  portBox.Add(self.port, 0, wx.ALL, 5)
+  sizer.Add(portBox, 0, wx.ALL, 5)
+  lbl = wx.StaticText(self, wx.NewId(), _(u"User: "))
+  self.user = wx.TextCtrl(self, wx.NewId())
+  userBox = wx.BoxSizer(wx.HORIZONTAL)
+  userBox.Add(lbl, 0, wx.ALL, 5)
+  userBox.Add(self.user, 0, wx.ALL, 5)
+  sizer.Add(userBox, 0, wx.ALL, 5)
+  lbl = wx.StaticText(self, wx.NewId(), _(u"Password: "))
+  self.password = wx.TextCtrl(self, wx.NewId(), style=wx.TE_PASSWORD)
+  passwordBox = wx.BoxSizer(wx.HORIZONTAL)
+  passwordBox.Add(lbl, 0, wx.ALL, 5)
+  passwordBox.Add(self.password, 0, wx.ALL, 5)
+  sizer.Add(serverBox, 0, wx.ALL, 5)
+  self.SetSizer(sizer)
+
 class generalAccount(wx.Panel, baseDialog.BaseWXDialog):
  def __init__(self, parent):
   super(generalAccount, self).__init__(parent)
@@ -206,6 +238,10 @@ class configurationDialog(baseDialog.BaseWXDialog):
   self.notebook.AddPage(self.general, _(u"General"))
   self.general.SetFocus()
 
+ def create_proxy(self):
+  self.proxy = proxy(self.notebook)
+  self.notebook.AddPage(self.proxy, _(u"Proxy"))
+
  def create_general_account(self):
   self.general = generalAccount(self.notebook)
   self.notebook.AddPage(self.general, _(u"General"))