backend/common/rhnTranslate.py | 2 +-
backend/po/Makefile | 5 +++--
backend/spacewalk-backend.spec | 5 ++---
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit bc5ba7caf7e5424aaf44272367e99068d7af4b6e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Mar 10 14:24:12 2011 +0100
move server.mo from /usr/share/rhn/ to /usr/share/locale and rename it to
spacewalk-backend-server
diff --git a/backend/common/rhnTranslate.py b/backend/common/rhnTranslate.py
index f93062f..c8fbffe 100644
--- a/backend/common/rhnTranslate.py
+++ b/backend/common/rhnTranslate.py
@@ -46,7 +46,7 @@ class RHN_Translations(gettext.GNUTranslations):
class i18n:
_default_langs = ['en', 'en_US', 'C']
# Wrapper class that allows us to change languages
- def __init__(self, domain=None, localedir="/usr/share/rhn/locale"):
+ def __init__(self, domain=None, localedir="/usr/share/locale"):
self.domain = domain
self.localedir = localedir
self.langs = self._default_langs[:]
diff --git a/backend/po/Makefile b/backend/po/Makefile
index a4317d7..728e908 100644
--- a/backend/po/Makefile
+++ b/backend/po/Makefile
@@ -4,11 +4,12 @@
TOP = ..
SUBDIR = locale
+localedir = $(PREFIX)/usr/share/locale
include $(TOP)/Makefile.defs
# What is this package?
-NLSPACKAGE = server
+NLSPACKAGE = spacewalk-backend-server
POTFILE = $(NLSPACKAGE).pot
# PO catalog handling
@@ -55,7 +56,7 @@ clean ::
install :: $(MOFILES)
@for n in $(MOFILES); do \
l=`basename $$n .mo`; \
- d="$(PREFIX)$(INSTALL_DEST)/$$l/LC_MESSAGES" ; \
+ d="$(PREFIX)$(localedir)/$$l/LC_MESSAGES" ; \
$(INSTALL_DIR) $$d ; \
$(INSTALL_DATA) $$n $$d/$(NLSPACKAGE).mo ; \
done
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 2d35618..7905bb3 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -297,6 +297,7 @@ rm -rfv $RPM_BUILD_ROOT/%{rhnroot}/wsgi
rm -v $RPM_BUILD_ROOT/%{apacheconfd}/zz-spacewalk-server-python.conf
%endif
+%find_lang %{name}-server
%clean
rm -rf $RPM_BUILD_ROOT
@@ -394,7 +395,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%doc PYTHON-LICENSES.txt LICENSE
%{pythonrhnroot}/server/rhnSQL/driver_postgresql.py*
-%files server
+%files server -f %{name}-server.lang
%defattr(-,root,root)
%doc PYTHON-LICENSES.txt LICENSE
# modules
@@ -476,8 +477,6 @@ rm -f %{rhnconf}/rhnSecret.py*
# logs and other stuff
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-server
-# translations
-%{rhnroot}/locale
%files xmlrpc
%defattr(-,root,root)
Show replies by date