Use correct i18n module

appindicator_integration/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Ayatana Appindicator integration
 short_name: appindicator_integration
-version: 1.2.0
+version: 1.2.1
 description: This plugin integrates Gajim with the Ayatana AppIndicator. You must have gir1.2-ayatanaappindicator3-0.1 installed to enable this plugin.
 homepage: https://dev.gajim.org/gajim/gajim-plugins/wikis/AppindicatorSupportPlugin
 authors: Denis Borenko <borenko@rambler.ru>

appindicator_integration/plugin.py

@@ -24,12 +24,7 @@ from gajim.common import app, ged
 from gajim.common import configpaths
 from gajim.plugins import GajimPlugin
 from gajim.plugins.helpers import log_calls
-
+from gajim.plugins.plugins_i18n import _
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
 
 
 class AppindicatorIntegrationPlugin(GajimPlugin):

banner_tweaks/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Banner Tweaks
 short_name: banner_tweaks
-version: 1.2.0
+version: 1.2.1
 description: Allows user to tweak chat window banner appearance (eg. make it compact).
 authors: Mateusz Biliński <mateusz@bilinski.it>
 homepage: http://trac-plugins.gajim.org/wiki/BannerTweaksPlugin

banner_tweaks/plugin.py

@@ -38,12 +38,7 @@ from gajim.common import helpers
 from gajim.plugins import GajimPlugin
 from gajim.plugins.helpers import log_calls
 from gajim.plugins.gui import GajimPluginConfigDialog
-
+from gajim.plugins.plugins_i18n import _
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
 
 
 class BannerTweaksPlugin(GajimPlugin):

clickable_nicknames/clickable_nicknames.py

@@ -4,12 +4,7 @@ from gi.repository import Gdk
 from gajim.common import app
 from gajim.plugins import GajimPlugin
 from gajim.plugins.helpers import log_calls
-
+from gajim.plugins.plugins_i18n import _
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
 
 
 class ClickableNicknames(GajimPlugin):

clickable_nicknames/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Clickable Nicknames
 short_name: clickable_nicknames
-version: 1.2.0
+version: 1.2.1
 description: Clickable nicknames in the conversation textview.
 authors: Andrey Musikhin <melomansegfault@gmail.com>
  Denis Fomin <fominde@gmail.com>

flashing_keyboard/flashing_keyboard.py

@@ -7,12 +7,7 @@ from gajim.common import app
 from gajim.plugins import GajimPlugin
 from gajim.plugins.helpers import log_calls
 from gajim.plugins.gui import GajimPluginConfigDialog
-
+from gajim.plugins.plugins_i18n import _
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
 
 class FlashingKeyboard(GajimPlugin):
     @log_calls('FlashingKeyboard')

flashing_keyboard/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Flashing Keyboard
 short_name: flashing_keyboard
-version: 1.2.0
+version: 1.2.1
 description: Flashing keyboard led when there are unread messages.
 authors: Denis Fomin <fominde@gmail.com>
 homepage: https://dev.gajim.org/gajim/gajim-plugins/wikis/flashingkeyboardplugin

gui_for_me/gui_for_me.py

@@ -4,13 +4,7 @@ from gi.repository import GdkPixbuf
 from gajim.common import app
 from gajim.plugins import GajimPlugin
 from gajim.plugins.helpers import log_calls
-
+from gajim.plugins.plugins_i18n import _
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
-
 
 class GuiForMe(GajimPlugin):
 

gui_for_me/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: GUI For Me
 short_name: gui_for_me
-version: 1.2.0
+version: 1.2.1
 description: Adds a button for the '/me' command.
 authors: BomberMan
  copper

juick/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Juick
 short_name: juick
-version: 1.2.1
+version: 1.2.2
 description: Clickable Juick links , Juick nicks, preview Juick picturs.
  The key combination alt + up in the textbox allow insert the number of last message (comment or topic).
 authors: Denis Fomin <fominde@gmail.com>

juick/plugin.py

@@ -17,13 +17,7 @@ from gajim.plugins.helpers import log_calls
 from gajim.plugins.gui import GajimPluginConfigDialog
 from gajim.conversation_textview import TextViewImage
 from gajim import gtkgui_helpers
-
+from gajim.plugins.plugins_i18n import _
-
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
 
 
 class JuickPlugin(GajimPlugin):

latex/latex.py

@@ -38,12 +38,7 @@ from gajim.common import app
 from gajim.plugins import GajimPlugin
 from gajim.plugins.helpers import log, log_calls
 from gajim.plugins.gui import GajimPluginConfigDialog
-
+from gajim.plugins.plugins_i18n import _
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
 
 def latex_template(code):
     return '''\\documentclass[12pt]{article}

latex/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Latex
 short_name: latex
-version: 1.2.0
+version: 1.2.1
 description: render received latex code
 authors: Yves Fischer <yvesf@xapek.org>
  Yann Leboulanger <asterix@lagaule.org>

length_notifier/length_notifier.py

@@ -30,12 +30,7 @@ from gi.repository import Gdk
 from gajim.plugins import GajimPlugin
 from gajim.plugins.helpers import log_calls
 from gajim.plugins.gui import GajimPluginConfigDialog
-
+from gajim.plugins.plugins_i18n import _
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
 
 
 class LengthNotifierPlugin(GajimPlugin):

length_notifier/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Message Length Notifier
 short_name: length_notifier
-version: 1.2.0
+version: 1.2.1
 description: Highlights message entry field in chat window when given length of message is exceeded.
 authors: Mateusz Biliński <mateusz@bilinski.it>
 homepage: http://trac-plugins.gajim.org/wiki/LengthNotifierPlugin

message_box_size/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Message Box Size
 short_name: message_box_size
-version: 1.2.0
+version: 1.2.1
 description: Allows you to adjust the height of the new message input field.
 authors: Denis Fomin <fominde@gmail.com>
 homepage: http://trac-plugins.gajim.org/wiki/MessageBoxSizePlugin

message_box_size/msg_box_size.py

@@ -3,12 +3,7 @@ from gi.repository import Gtk
 from gajim.plugins import GajimPlugin
 from gajim.plugins.helpers import log_calls
 from gajim.plugins.gui import GajimPluginConfigDialog
-
+from gajim.plugins.plugins_i18n import _
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
 
 
 class MsgBoxSizePlugin(GajimPlugin):

quick_replies/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Quick replies
 short_name: quick_replies
-version: 1.2.0
+version: 1.2.1
 description: Plugin for quick insert template message and add your own template messages
 authors = Evgeniy Popov <evgeniypopov@gmail.com>
 homepage = https://dev.gajim.org/gajim/gajim-plugins/wikis/QuickRepliesPlugin

quick_replies/plugin.py

@@ -6,12 +6,7 @@ from gajim.common import app
 from gajim.plugins import GajimPlugin
 from gajim.plugins.gui import GajimPluginConfigDialog
 from gajim.plugins.helpers import log_calls
-
+from gajim.plugins.plugins_i18n import _
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
 
 class QuickRepliesPlugin(GajimPlugin):
 

regex_filter/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Regex Filter
 short_name: regex_filter
-version: 1.2.0
+version: 1.2.1
 description: Filter incoming messages using regex.
 authors: Yann Leboulanger <asterix@lagaule.org>
 homepage: http://trac-plugins.gajim.org/wiki/RegexFilterPlugin

regex_filter/regex_filter.py

@@ -33,12 +33,7 @@ from gajim.common import app
 from gajim.common import ged
 from gajim.command_system.framework import CommandContainer, command, doc
 from gajim.command_system.implementation.hosts import *
-
+from gajim.plugins.plugins_i18n import _
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
 
 
 class RegexFilterPlugin(GajimPlugin):

roster_tweaks/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Roster Tweaks
 short_name: roster_tweaks
-version: 1.2.0
+version: 1.2.1
 description: Allows user to tweak roster window appearance (eg. make it compact).
  Added ability to quickly change the status message to all connected accounts.
 authors = Denis Fomin <fominde@gmail.com>

roster_tweaks/roster_tweaks.py

@@ -8,12 +8,7 @@ from gajim.plugins import GajimPlugin
 from gajim.plugins.gui import GajimPluginConfigDialog
 from gajim.dialogs import ChangeActivityDialog, ChangeMoodDialog
 from gajim import gtkgui_helpers
-
+from gajim.plugins.plugins_i18n import _
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
 
 
 class RosterTweaksPlugin(GajimPlugin):

server_status_icons/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Server Status Icons
 short_name: server_status_icons
-version: 1.2.0
+version: 1.2.1
 description: Replace standard Gajim status icons with server
  specific for known XMPP server accounts (vk.com, ...)
 authors = Denis Fomin <fominde@gmail.com>

server_status_icons/server_status_icons.py

@@ -6,12 +6,7 @@ from gajim import gtkgui_helpers
 from gajim.common import app
 from gajim.common import helpers
 from gajim.common import ged
-
+from gajim.plugins.plugins_i18n import _
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
 
 class ServerStatusIconsPlugin(GajimPlugin):
 

tictactoe/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Tic tac toe
 short_name: tictactoe
-version: 1.6.31
+version: 1.6.32
 description: Play tic tac toe
 authors = Yann Leboulanger <asterix@lagaule.org>
 homepage = https://dev.gajim.org/gajim/gajim-plugins/wikis/TictactoePlugin

tictactoe/plugin.py

@@ -48,12 +48,7 @@ from gajim import chat_control
 from gajim.common import ged
 from gajim import dialogs
 from gajim.common.connection_handlers_events import InformationEvent
-
+from gajim.plugins.plugins_i18n import _
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
 
 NS_GAMES = 'http://jabber.org/protocol/games'
 NS_GAMES_TICTACTOE = NS_GAMES + '/tictactoe'

wrong_layout/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Wrong Layout
 short_name: wrong_layout
-version: 1.2.1
+version: 1.2.2
 description: Press alt+r to convert chars typed in wrong layout Rus<>Eng
 authors: Denis Fomin <fominde@gmail.com>
 homepage: https://dev.gajim.org/gajim/gajim-plugins/wikis/WrongLayoutPlugin

wrong_layout/plugin.py

@@ -5,12 +5,8 @@ from gajim.common import app
 
 from gajim.plugins import GajimPlugin
 from gajim.plugins.helpers import log_calls
+from gajim.plugins.plugins_i18n import _
 
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
 
 class WrongLayoutPlugin(GajimPlugin):
     @log_calls('WrongLayoutPlugin')