Use correct i18n module

30 files changed, 30 insertions, 106 deletions

diff --git a/appindicator_integration/manifest.ini b/appindicator_integration/manifest.ini
index 2a32099..2f0ffc9 100644
--- a/appindicator_integration/manifest.ini
+++ b/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>
diff --git a/appindicator_integration/plugin.py b/appindicator_integration/plugin.py
index 0ceadc0..93fba67 100644
--- a/appindicator_integration/plugin.py
+++ b/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
-
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
+from gajim.plugins.plugins_i18n import _
 
 
 class AppindicatorIntegrationPlugin(GajimPlugin):
diff --git a/banner_tweaks/manifest.ini b/banner_tweaks/manifest.ini
index a642d44..c286311 100644
--- a/banner_tweaks/manifest.ini
+++ b/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
diff --git a/banner_tweaks/plugin.py b/banner_tweaks/plugin.py
index 5696923..9ef48b4 100644
--- a/banner_tweaks/plugin.py
+++ b/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
-
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
+from gajim.plugins.plugins_i18n import _
 
 
 class BannerTweaksPlugin(GajimPlugin):
diff --git a/clickable_nicknames/clickable_nicknames.py b/clickable_nicknames/clickable_nicknames.py
index cd93cbd..0dacbcf 100644
--- a/clickable_nicknames/clickable_nicknames.py
+++ b/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
-
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
+from gajim.plugins.plugins_i18n import _
 
 
 class ClickableNicknames(GajimPlugin):
diff --git a/clickable_nicknames/manifest.ini b/clickable_nicknames/manifest.ini
index 3ce37a1..1d9557f 100644
--- a/clickable_nicknames/manifest.ini
+++ b/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>
diff --git a/flashing_keyboard/flashing_keyboard.py b/flashing_keyboard/flashing_keyboard.py
index 16f084c..99bee8d 100644
--- a/flashing_keyboard/flashing_keyboard.py
+++ b/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
-
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
+from gajim.plugins.plugins_i18n import _
 
 class FlashingKeyboard(GajimPlugin):
     @log_calls('FlashingKeyboard')
diff --git a/flashing_keyboard/manifest.ini b/flashing_keyboard/manifest.ini
index 289ecb2..37d2284 100644
--- a/flashing_keyboard/manifest.ini
+++ b/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
diff --git a/gui_for_me/gui_for_me.py b/gui_for_me/gui_for_me.py
index e6c7021..1454f16 100644
--- a/gui_for_me/gui_for_me.py
+++ b/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
-
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
-
+from gajim.plugins.plugins_i18n import _
 
 class GuiForMe(GajimPlugin):
 
diff --git a/gui_for_me/manifest.ini b/gui_for_me/manifest.ini
index 1b469de..95e20f6 100644
--- a/gui_for_me/manifest.ini
+++ b/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
diff --git a/juick/manifest.ini b/juick/manifest.ini
index c33cd65..5fdbbc4 100644
--- a/juick/manifest.ini
+++ b/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>
diff --git a/juick/plugin.py b/juick/plugin.py
index 57fbd85..277a2fc 100644
--- a/juick/plugin.py
+++ b/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
-
-
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
+from gajim.plugins.plugins_i18n import _
 
 
 class JuickPlugin(GajimPlugin):
diff --git a/latex/latex.py b/latex/latex.py
index 465c9c9..8374ecc 100644
--- a/latex/latex.py
+++ b/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
-
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
+from gajim.plugins.plugins_i18n import _
 
 def latex_template(code):
     return '''\\documentclass[12pt]{article}
diff --git a/latex/manifest.ini b/latex/manifest.ini
index 52f7331..9c0a69a 100644
--- a/latex/manifest.ini
+++ b/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>
diff --git a/length_notifier/length_notifier.py b/length_notifier/length_notifier.py
index 20df647..1cad8d0 100644
--- a/length_notifier/length_notifier.py
+++ b/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
-
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
+from gajim.plugins.plugins_i18n import _
 
 
 class LengthNotifierPlugin(GajimPlugin):
diff --git a/length_notifier/manifest.ini b/length_notifier/manifest.ini
index a6d29ae..a6c6824 100644
--- a/length_notifier/manifest.ini
+++ b/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
diff --git a/message_box_size/manifest.ini b/message_box_size/manifest.ini
index 29dfa46..625c4b8 100644
--- a/message_box_size/manifest.ini
+++ b/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
diff --git a/message_box_size/msg_box_size.py b/message_box_size/msg_box_size.py
index cd9f7e6..7a66148 100644
--- a/message_box_size/msg_box_size.py
+++ b/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
-
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
+from gajim.plugins.plugins_i18n import _
 
 
 class MsgBoxSizePlugin(GajimPlugin):
diff --git a/quick_replies/manifest.ini b/quick_replies/manifest.ini
index 7641197..aa1cc05 100644
--- a/quick_replies/manifest.ini
+++ b/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
diff --git a/quick_replies/plugin.py b/quick_replies/plugin.py
index 13cd594..73624f2 100644
--- a/quick_replies/plugin.py
+++ b/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
-
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
+from gajim.plugins.plugins_i18n import _
 
 class QuickRepliesPlugin(GajimPlugin):
 
diff --git a/regex_filter/manifest.ini b/regex_filter/manifest.ini
index 308baab..eefa4de 100644
--- a/regex_filter/manifest.ini
+++ b/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
diff --git a/regex_filter/regex_filter.py b/regex_filter/regex_filter.py
index 091b9d0..1eec952 100644
--- a/regex_filter/regex_filter.py
+++ b/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 *
-
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
+from gajim.plugins.plugins_i18n import _
 
 
 class RegexFilterPlugin(GajimPlugin):
diff --git a/roster_tweaks/manifest.ini b/roster_tweaks/manifest.ini
index d49fa53..3d6e855 100644
--- a/roster_tweaks/manifest.ini
+++ b/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>
diff --git a/roster_tweaks/roster_tweaks.py b/roster_tweaks/roster_tweaks.py
index 84167cc..7f86b5a 100644
--- a/roster_tweaks/roster_tweaks.py
+++ b/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
-
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
+from gajim.plugins.plugins_i18n import _
 
 
 class RosterTweaksPlugin(GajimPlugin):
diff --git a/server_status_icons/manifest.ini b/server_status_icons/manifest.ini
index 90d4d27..896588d 100644
--- a/server_status_icons/manifest.ini
+++ b/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>
diff --git a/server_status_icons/server_status_icons.py b/server_status_icons/server_status_icons.py
index 50dd5db..a7fca94 100644
--- a/server_status_icons/server_status_icons.py
+++ b/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
-
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
+from gajim.plugins.plugins_i18n import _
 
 class ServerStatusIconsPlugin(GajimPlugin):
 
diff --git a/tictactoe/manifest.ini b/tictactoe/manifest.ini
index 279f606..b4f9a9b 100644
--- a/tictactoe/manifest.ini
+++ b/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
diff --git a/tictactoe/plugin.py b/tictactoe/plugin.py
index b0a9d90..72c099a 100644
--- a/tictactoe/plugin.py
+++ b/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
-
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
+from gajim.plugins.plugins_i18n import _
 
 NS_GAMES = 'http://jabber.org/protocol/games'
 NS_GAMES_TICTACTOE = NS_GAMES + '/tictactoe'
diff --git a/wrong_layout/manifest.ini b/wrong_layout/manifest.ini
index fda4cfc..ea42ef4 100644
--- a/wrong_layout/manifest.ini
+++ b/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&lt;&gt;Eng
 authors: Denis Fomin <fominde@gmail.com>
 homepage: https://dev.gajim.org/gajim/gajim-plugins/wikis/WrongLayoutPlugin
diff --git a/wrong_layout/plugin.py b/wrong_layout/plugin.py
index bf4530a..2858151 100644
--- a/wrong_layout/plugin.py
+++ b/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')