SOURCES: filezilla-locales.patch (NEW) - use glibc locale dirs and...

[glen]

Author: glen                         Date: Thu Feb 23 13:53:59 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use glibc locale dirs and names

---- Files affected:
SOURCES:
   filezilla-locales.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/filezilla-locales.patch
diff -u /dev/null SOURCES/filezilla-locales.patch:1.1
--- /dev/null	Thu Feb 23 14:53:59 2006
+++ SOURCES/filezilla-locales.patch	Thu Feb 23 14:53:54 2006
@@ -0,0 +1,76 @@
+unchanged:
+--- FileZilla3/src/interface/FileZilla.cpp~	2006-01-23 19:08:57.000000000 +0200
++++ FileZilla3/src/interface/FileZilla.cpp	2006-02-23 14:02:45.000000000 +0200
+@@ -260,12 +260,7 @@
+ 
+ bool CFileZillaApp::LoadLocales()
+ {
+-	m_localesDir = GetDataDir(_T("/locales/*/filezilla.mo"));
+-
+-	if (!m_localesDir.Length() || m_localesDir[m_localesDir.Length() - 1] != wxFileName::GetPathSeparator())
+-		m_localesDir += wxFileName::GetPathSeparator();
+-
+-	m_localesDir += _T("locales/");
++	m_localesDir = _T("/usr/share/locale/");
+ 
+ 	wxLocale::AddCatalogLookupPathPrefix(m_localesDir);
+ 
+diff -u FileZilla3/locales/Makefile.am FileZilla3/locales/Makefile.am
+--- FileZilla3/locales/Makefile.am	2006-02-23 14:03:48.000000000 +0200
++++ FileZilla3/locales/Makefile.am	2006-02-23 14:22:26.000000000 +0200
+@@ -1,4 +1,4 @@
+-localesdir = $(pkgdatadir)/locales
++localesdir = $(datadir)/locale
+ 
+ CLEANFILES = *.po.new *.mo resources.h filezilla.pot filezilla.pot.new filezilla.pot~
+ 
+@@ -8,13 +8,13 @@
+ 
+ install-filezilla-catalogs: allmo
+ 	for i in @FILEZILLA_LINGUAS@ ; do \
+-	  $(mkinstalldirs) $(DESTDIR)$(localesdir)/$$i ; \
+-	  $(INSTALL_DATA) $$i.mo $(DESTDIR)$(localesdir)/$$i/filezilla.mo ; \
++	  $(mkinstalldirs) $(DESTDIR)$(localesdir)/$$i/LC_MESSAGES ; \
++	  $(INSTALL_DATA) $$i.mo $(DESTDIR)$(localesdir)/$$i/LC_MESSAGES/filezilla.mo ; \
+ 	done
+ 
+ uninstall-local:
+ 	for i in @FILEZILLA_LINGUAS@ ; do \
+-	  rm $(DESTDIR)$(localesdir)/$$i/filezilla.mo ; \
++	  rm $(DESTDIR)$(localesdir)/$$i/LC_MESSAGES/filezilla.mo ; \
+ 	done
+ 
+ 
+unchanged:
+--- FileZilla3/src/interface/optionspage_language.cpp~	2004-12-31 21:03:34.000000000 +0200
++++ FileZilla3/src/interface/optionspage_language.cpp	2006-02-23 14:20:41.000000000 +0200
+@@ -32,7 +32,7 @@
+ 	wxString locale;
+ 	for (bool found = dir.GetFirst(&locale); found; found = dir.GetNext(&locale))
+ 	{
+-		if (!wxFileName::FileExists(localesDir + locale + _T("/filezilla.mo")))
++		if (!wxFileName::FileExists(localesDir + locale + _T("/LC_MESSAGES/filezilla.mo")))
+ 			continue;
+ 		
+ 		wxString name;
+unchanged:
+--- FileZilla3/src/interface/wrapengine.cpp~	2006-02-11 17:08:16.000000000 +0200
++++ FileZilla3/src/interface/wrapengine.cpp	2006-02-23 14:21:16.000000000 +0200
+@@ -583,7 +583,7 @@
+ 	wxString locale;
+ 	for (bool found = dir.GetFirst(&locale); found; found = dir.GetNext(&locale))
+ 	{
+-		if (!wxFileName::FileExists(localesDir + locale + _T("/filezilla.mo")))
++		if (!wxFileName::FileExists(localesDir + locale + _T("/LC_MESSAGES/filezilla.mo")))
+ 			continue;
+ 		
+ 		wxString name;
+@@ -591,7 +591,7 @@
+ 		if (!pInfo)
+ 			continue;
+ 
+-		wxFileName fn(localesDir + locale + _T("/filezilla.mo"));
++		wxFileName fn(localesDir + locale + _T("/LC_MESSAGES/filezilla.mo"));
+ 		wxDateTime date = fn.GetModificationTime();
+ 		wxLongLong ticks = date.GetTicks();
+ 
================================================================