SOURCES: FileZilla-locales.patch - 3.0.7

[blues]

Author: blues                        Date: Thu Feb 14 21:46:16 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 3.0.7

---- Files affected:
SOURCES:
   FileZilla-locales.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/FileZilla-locales.patch
diff -u SOURCES/FileZilla-locales.patch:1.1 SOURCES/FileZilla-locales.patch:1.2
--- SOURCES/FileZilla-locales.patch:1.1	Sun Oct 21 21:19:46 2007
+++ SOURCES/FileZilla-locales.patch	Thu Feb 14 22:46:11 2008
@@ -1,9 +1,40 @@
---- ./src/interface/FileZilla.cpp.org	2007-10-17 20:22:26.000000000 +0200
-+++ ./src/interface/FileZilla.cpp	2007-10-21 21:09:28.312100761 +0200
-@@ -509,25 +509,7 @@ bool CFileZillaApp::InitSettingsDir()
+--- ./locales/Makefile.am.org	2008-02-14 00:47:56.000000000 +0100
++++ ./locales/Makefile.am	2008-02-14 22:27:31.221778064 +0100
+@@ -7,13 +7,13 @@ install-data-local: install-filezilla-ca
+ 
+ install-filezilla-catalogs: allmo
+ 	for i in @FILEZILLA_LINGUAS@ ; do \
+-	  $(mkinstalldirs) $(DESTDIR)$(localedir)/$$i ; \
+-	  $(INSTALL_DATA) $$i.mo $(DESTDIR)$(localedir)/$$i/filezilla.mo ; \
++	  $(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES ; \
++	  $(INSTALL_DATA) $$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/filezilla.mo ; \
+ 	done
+ 
+ uninstall-local:
+ 	for i in @FILEZILLA_LINGUAS@ ; do \
+-	  rm $(DESTDIR)$(localedir)/$$i/filezilla.mo ; \
++	  rm $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/filezilla.mo ; \
+ 	done
+ 
+ 
+@@ -22,8 +22,8 @@ uninstall-local:
+ 
+ #install-wxstd-catalogs:
+ #	for i in $(WXWIN_LINGUAS) ; do \
+-#	  $(mkinstalldirs) $(DESTDIR)$(localedir)/$$i ; \
+-#	  $(INSTALL_DATA) wxwin/$$i.mo $(DESTDIR)$(localedir)/$$i/filezilla-wxstd.mo ; \
++#	  $(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES ; \
++#	  $(INSTALL_DATA) wxwin/$$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/filezilla-wxstd.mo ; \
+ #	done
+ 
+ 
+--- ./src/interface/FileZilla.cpp.org	2008-02-14 00:47:59.000000000 +0100
++++ ./src/interface/FileZilla.cpp	2008-02-14 22:23:45.254013629 +0100
+@@ -578,29 +578,7 @@ bool CFileZillaApp::InitSettingsDir()
  
  bool CFileZillaApp::LoadLocales()
  {
+-#ifndef __WXMAC__
 -	m_localesDir = GetDataDir(_T("/../locale/*/filezilla.mo"));
 -	if (m_localesDir != _T(""))
 -	{
@@ -23,13 +54,16 @@
 -			m_localesDir += _T("locales");
 -		}
 -	}
+-#else
+-	m_localesDir = wxStandardPaths::Get().GetDataDir() + _T("/locales");
+-#endif
 +	m_localesDir = _T("/usr/share/locale/");
  
  	if (m_localesDir != _T(""))
  	{
---- ./src/interface/optionspage_language.cpp.org	2007-10-17 20:22:25.000000000 +0200
-+++ ./src/interface/optionspage_language.cpp	2007-10-21 21:13:01.894158243 +0200
-@@ -33,7 +33,7 @@ bool COptionsPageLanguage::LoadPage()
+--- ./src/interface/optionspage_language.cpp.org	2008-02-14 00:47:57.000000000 +0100
++++ ./src/interface/optionspage_language.cpp	2008-02-14 22:25:47.313341533 +0100
+@@ -36,7 +36,7 @@ bool COptionsPageLanguage::LoadPage()
  	wxString locale;
  	for (bool found = dir.GetFirst(&locale); found; found = dir.GetNext(&locale))
  	{
@@ -38,42 +72,3 @@
  			continue;
  
  		wxString name;
---- ./src/interface/wrapengine.cpp.org	2007-10-17 20:22:25.000000000 +0200
-+++ ./src/interface/wrapengine.cpp	2007-10-21 21:14:14.681600817 +0200
-@@ -949,7 +949,7 @@ bool CWrapEngine::LoadCache()
- 		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;
-@@ -957,7 +957,7 @@ bool CWrapEngine::LoadCache()
- 			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();
- 
---- ./locales/Makefile.am.org	2007-10-17 20:22:19.000000000 +0200
-+++ ./locales/Makefile.am	2007-10-21 21:11:20.075076784 +0200
-@@ -7,13 +7,13 @@ install-data-local: install-filezilla-ca
- 
- install-filezilla-catalogs: allmo
- 	for i in @FILEZILLA_LINGUAS@ ; do \
--	  $(mkinstalldirs) $(DESTDIR)$(localedir)/$$i ; \
--	  $(INSTALL_DATA) $$i.mo $(DESTDIR)$(localedir)/$$i/filezilla.mo ; \
-+	  $(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES ; \
-+	  $(INSTALL_DATA) $$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/filezilla.mo ; \
- 	done
- 
- uninstall-local:
- 	for i in @FILEZILLA_LINGUAS@ ; do \
--	  rm $(DESTDIR)$(localedir)/$$i/filezilla.mo ; \
-+	  rm $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/filezilla.mo ; \
- 	done
- 
- 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/FileZilla-locales.patch?r1=1.1&r2=1.2&f=u