sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a config module into the shell holding path informations.

Browse Source 
Get rid of env.get_locale_path()
This commit is contained in:
Marco Pesenti Gritti 2008-02-04 19:16:46 +01:00
parent b3cc0bec55
commit 1c361ea5dd
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/sugar-shell
View File

@ -41,6 +41,7 @@ from shellservice import ShellService
from hardware import hardwaremanager from hardware import hardwaremanager
from intro import intro from intro import intro
import logsmanager import logsmanager
import config
def _start_matchbox(): def _start_matchbox():
cmd = ['matchbox-window-manager'] cmd = ['matchbox-window-manager']
@ -68,8 +69,10 @@ def _save_session_info():
f.close() f.close()
def _setup_translations(): def _setup_translations():
locale_path = os.path.join(config.prefix, 'share', 'locale')
domain = 'sugar' domain = 'sugar'
gettext.bindtextdomain(domain, env.get_locale_path())
gettext.bindtextdomain(domain, locale_path)
gettext.textdomain(domain) gettext.textdomain(domain)
def check_cm(bus_name): def check_cm(bus_name):

5
configure.ac
View File

@ -39,7 +39,10 @@ AC_ARG_ENABLE(update-mimedb,
enable_update_mimedb=yes) enable_update_mimedb=yes)
AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes) AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
AC_CONFIG_FILES([bin/sugar], [chmod +x sugar]) AC_CONFIG_FILES([
bin/sugar
shell/config.py
], [chmod +x sugar])
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile

3
lib/sugar/env.py
View File

@ -77,9 +77,6 @@ def get_user_activities_path():
def get_user_library_path(): def get_user_library_path():
return os.path.expanduser('~/Library') return os.path.expanduser('~/Library')
def get_locale_path(path=None):
return get_prefix_path('share/locale', path)
def get_service_path(name): def get_service_path(name):
return _get_sugar_path('services', name) return _get_sugar_path('services', name)

1
shell/Makefile.am
View File

@ -2,6 +2,7 @@ SUBDIRS = controlpanel hardware model view intro
sugardir = $(pkgdatadir)/shell sugardir = $(pkgdatadir)/shell
sugar_PYTHON = \ sugar_PYTHON = \
config.py \
logsmanager.py \ logsmanager.py \
shellservice.py shellservice.py