Fix some wrong locale path definitions and disable own locale handling inside Network...

diff --git a/configure.ac b/configure.ac
old mode 100644 (file)
new mode 100755 (executable)
index 462a331..ddc1a4f
--- a/configure.ac
+++ b/configure.ac
@@ -282,7 +282,6 @@ netcaster/src/etc/Makefile
 
 networkbrowser/Makefile
 networkbrowser/meta/Makefile
-networkbrowser/po/Makefile
 networkbrowser/src/Makefile
 networkbrowser/src/icons/Makefile
 networkbrowser/src/lib/Makefile

diff --git a/mediadownloader/src/__init__.py b/mediadownloader/src/__init__.py
old mode 100644 (file)
new mode 100755 (executable)
index bd1375a..bde30ee
--- a/mediadownloader/src/__init__.py
+++ b/mediadownloader/src/__init__.py
@@ -7,7 +7,7 @@ import gettext
 def localeInit():
        lang = language.getLanguage()[:2] # getLanguage returns e.g. "fi_FI" for "language_country"
        os_environ["LANGUAGE"] = lang # Enigma doesn't set this (or LC_ALL, LC_MESSAGES, LANG). gettext needs it!
-       gettext.bindtextdomain("MediaDownloader", resolveFilename(SCOPE_PLUGINS, "Extensions/MediaDownloader/"))
+       gettext.bindtextdomain("MediaDownloader", resolveFilename(SCOPE_PLUGINS, "Extensions/MediaDownloader/locale"))
 
 def _(txt):
        t = gettext.dgettext("MediaDownloader", txt)

diff --git a/mytube/src/__init__.py b/mytube/src/__init__.py
index 8d19ff9..c8c21ef 100755 (executable)
--- a/mytube/src/__init__.py
+++ b/mytube/src/__init__.py
@@ -4,7 +4,7 @@ from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_LANGUAGE
 import os,gettext
 import sha
 PluginLanguageDomain = "MyTube"
-PluginLanguagePath = "Extensions/MyTube/po"
+PluginLanguagePath = "Extensions/MyTube/locale"
 
 def localeInit():
        lang = language.getLanguage()[:2] # getLanguage returns e.g. "fi_FI" for "language_country"

diff --git a/networkbrowser/Makefile.am b/networkbrowser/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 5afb690..ff1ac3d
--- a/networkbrowser/Makefile.am
+++ b/networkbrowser/Makefile.am
@@ -1 +1 @@
-SUBDIRS = src po meta
+SUBDIRS = src meta

diff --git a/networkbrowser/src/AutoMount.py b/networkbrowser/src/AutoMount.py
index cd3f1e1..f353823 100755 (executable)
--- a/networkbrowser/src/AutoMount.py
+++ b/networkbrowser/src/AutoMount.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # for localized messages
-from __init__ import _
+#from __init__ import _
 from re import compile as re_compile
 from os import path as os_path, symlink, listdir, unlink, readlink, remove
 

diff --git a/networkbrowser/src/MountEdit.py b/networkbrowser/src/MountEdit.py
index cd645be..e7677d4 100755 (executable)
--- a/networkbrowser/src/MountEdit.py
+++ b/networkbrowser/src/MountEdit.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # for localized messages
-from __init__ import _
+#from __init__ import _
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Screens.VirtualKeyBoard import VirtualKeyBoard

diff --git a/networkbrowser/src/MountManager.py b/networkbrowser/src/MountManager.py
index 3c56469..8c659a0 100755 (executable)
--- a/networkbrowser/src/MountManager.py
+++ b/networkbrowser/src/MountManager.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # for localized messages
-from __init__ import _
+#from __init__ import _
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Screens.VirtualKeyBoard import VirtualKeyBoard

diff --git a/networkbrowser/src/MountView.py b/networkbrowser/src/MountView.py
index 9f4f725..2e9a87a 100755 (executable)
--- a/networkbrowser/src/MountView.py
+++ b/networkbrowser/src/MountView.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # for localized messages
-from __init__ import _
+#from __init__ import _
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Components.Sources.StaticText import StaticText

diff --git a/networkbrowser/src/NetworkBrowser.py b/networkbrowser/src/NetworkBrowser.py
index dea7c00..0ef7426 100755 (executable)
--- a/networkbrowser/src/NetworkBrowser.py
+++ b/networkbrowser/src/NetworkBrowser.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # for localized messages
-from __init__ import _
+#from __init__ import _
 from enigma import eTimer, getDesktop
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox

diff --git a/networkbrowser/src/UserDialog.py b/networkbrowser/src/UserDialog.py
index 49b6bf8..1e5a41e 100755 (executable)
--- a/networkbrowser/src/UserDialog.py
+++ b/networkbrowser/src/UserDialog.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # for localized messages
-from __init__ import _
+#from __init__ import _
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Screens.VirtualKeyBoard import VirtualKeyBoard

diff --git a/networkbrowser/src/UserManager.py b/networkbrowser/src/UserManager.py
index 3e2a61d..f7fc28d 100755 (executable)
--- a/networkbrowser/src/UserManager.py
+++ b/networkbrowser/src/UserManager.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # for localized messages
-from __init__ import _
+#from __init__ import _
 from Screens.Screen import Screen
 from Components.Sources.StaticText import StaticText
 from Components.Pixmap import Pixmap

diff --git a/networkbrowser/src/__init__.py b/networkbrowser/src/__init__.py
index dc8dd57..c3ed18f 100755 (executable)
--- a/networkbrowser/src/__init__.py
+++ b/networkbrowser/src/__init__.py
@@ -11,7 +11,7 @@ from Components.Language import language
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_LANGUAGE
 import os,gettext
 PluginLanguageDomain = "NetworkBrowser"
-PluginLanguagePath = "SystemPlugins/NetworkBrowser/po"
+PluginLanguagePath = "SystemPlugins/NetworkBrowser/locale"
 
 def localeInit():
        lang = language.getLanguage()[:2] # getLanguage returns e.g. "fi_FI" for "language_country"
@@ -26,5 +26,5 @@ def _(txt):
                t = gettext.gettext(txt)
        return t
 
-localeInit()
-language.addCallback(localeInit)
+#localeInit()
+#language.addCallback(localeInit)

diff --git a/networkbrowser/src/plugin.py b/networkbrowser/src/plugin.py
index 7f587b9..e8eac72 100755 (executable)
--- a/networkbrowser/src/plugin.py
+++ b/networkbrowser/src/plugin.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # for localized messages
-from __init__ import _
+#from __init__ import _
 
 from Plugins.Plugin import PluginDescriptor
 from NetworkBrowser import NetworkBrowser

diff --git a/setpasswd/src/__init__.py b/setpasswd/src/__init__.py
index 3c6abed..320d808 100755 (executable)
--- a/setpasswd/src/__init__.py
+++ b/setpasswd/src/__init__.py
@@ -4,7 +4,7 @@ from Components.Language import language
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_LANGUAGE
 import os,gettext
 PluginLanguageDomain = "SetPasswd"
-PluginLanguagePath = "SystemPlugins/SetPasswd/po"
+PluginLanguagePath = "SystemPlugins/SetPasswd/locale"
 
 def localeInit():
         lang = language.getLanguage()[:2] # getLanguage returns e.g. "fi_FI" for "language_country"