projects / packages / FileZilla.git / blame
| Commit | Line | Data |
|---|---|---|
| 9f3a8e72 PG |
1 | --- ./src/interface/FileZilla.cpp.org 2007-10-17 20:22:26.000000000 +0200 |
| 2 | +++ ./src/interface/FileZilla.cpp 2007-10-21 21:09:28.312100761 +0200 | |
| 3 | @@ -509,25 +509,7 @@ bool CFileZillaApp::InitSettingsDir() | |
| 4 | ||
| 5 | bool CFileZillaApp::LoadLocales() | |
| 6 | { | |
| 7 | - m_localesDir = GetDataDir(_T("/../locale/*/filezilla.mo")); | |
| 8 | - if (m_localesDir != _T("")) | |
| 9 | - { | |
| 10 | - if (m_localesDir[m_localesDir.Length() - 1] != wxFileName::GetPathSeparator()) | |
| 11 | - m_localesDir += wxFileName::GetPathSeparator(); | |
| 12 | - | |
| 13 | - m_localesDir += _T("../locale"); | |
| 14 | - } | |
| 15 | - else | |
| 16 | - { | |
| 17 | - m_localesDir = GetDataDir(_T("/locales/*/filezilla.mo")); | |
| 18 | - if (m_localesDir != _T("")) | |
| 19 | - { | |
| 20 | - if (m_localesDir[m_localesDir.Length() - 1] != wxFileName::GetPathSeparator()) | |
| 21 | - m_localesDir += wxFileName::GetPathSeparator(); | |
| 22 | - | |
| 23 | - m_localesDir += _T("locales"); | |
| 24 | - } | |
| 25 | - } | |
| 26 | + m_localesDir = _T("/usr/share/locale/"); | |
| 27 | ||
| 28 | if (m_localesDir != _T("")) | |
| 29 | { | |
| 30 | --- ./src/interface/optionspage_language.cpp.org 2007-10-17 20:22:25.000000000 +0200 | |
| 31 | +++ ./src/interface/optionspage_language.cpp 2007-10-21 21:13:01.894158243 +0200 | |
| 32 | @@ -33,7 +33,7 @@ bool COptionsPageLanguage::LoadPage() | |
| 33 | wxString locale; | |
| 34 | for (bool found = dir.GetFirst(&locale); found; found = dir.GetNext(&locale)) | |
| 35 | { | |
| 36 | - if (!wxFileName::FileExists(localesDir + locale + _T("/filezilla.mo"))) | |
| 37 | + if (!wxFileName::FileExists(localesDir + locale + _T("/LC_MESSAGES/filezilla.mo"))) | |
| 38 | continue; | |
| 39 | ||
| 40 | wxString name; | |
| 41 | --- ./src/interface/wrapengine.cpp.org 2007-10-17 20:22:25.000000000 +0200 | |
| 42 | +++ ./src/interface/wrapengine.cpp 2007-10-21 21:14:14.681600817 +0200 | |
| 43 | @@ -949,7 +949,7 @@ bool CWrapEngine::LoadCache() | |
| 44 | wxString locale; | |
| 45 | for (bool found = dir.GetFirst(&locale); found; found = dir.GetNext(&locale)) | |
| 46 | { | |
| 47 | - if (!wxFileName::FileExists(localesDir + locale + _T("/filezilla.mo"))) | |
| 48 | + if (!wxFileName::FileExists(localesDir + locale + _T("/LC_MESSAGES/filezilla.mo"))) | |
| 49 | continue; | |
| 50 | ||
| 51 | wxString name; | |
| 52 | @@ -957,7 +957,7 @@ bool CWrapEngine::LoadCache() | |
| 53 | if (!pInfo) | |
| 54 | continue; | |
| 55 | ||
| 56 | - wxFileName fn(localesDir + locale + _T("/filezilla.mo")); | |
| 57 | + wxFileName fn(localesDir + locale + _T("/LC_MESSAGES/filezilla.mo")); | |
| 58 | wxDateTime date = fn.GetModificationTime(); | |
| 59 | wxLongLong ticks = date.GetTicks(); | |
| 60 | ||
| 61 | --- ./locales/Makefile.am.org 2007-10-17 20:22:19.000000000 +0200 | |
| 62 | +++ ./locales/Makefile.am 2007-10-21 21:11:20.075076784 +0200 | |
| 63 | @@ -7,13 +7,13 @@ install-data-local: install-filezilla-ca | |
| 64 | ||
| 65 | install-filezilla-catalogs: allmo | |
| 66 | for i in @FILEZILLA_LINGUAS@ ; do \ | |
| 67 | - $(mkinstalldirs) $(DESTDIR)$(localedir)/$$i ; \ | |
| 68 | - $(INSTALL_DATA) $$i.mo $(DESTDIR)$(localedir)/$$i/filezilla.mo ; \ | |
| 69 | + $(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES ; \ | |
| 70 | + $(INSTALL_DATA) $$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/filezilla.mo ; \ | |
| 71 | done | |
| 72 | ||
| 73 | uninstall-local: | |
| 74 | for i in @FILEZILLA_LINGUAS@ ; do \ | |
| 75 | - rm $(DESTDIR)$(localedir)/$$i/filezilla.mo ; \ | |
| 76 | + rm $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/filezilla.mo ; \ | |
| 77 | done | |
| 78 | ||
| 79 |