#! /bin/sh /usr/share/dpatch/dpatch-run @DPATCH@ diff -uNar filezilla/src/interface/FileZilla.cpp filezilla-mod/src/interface/FileZilla.cpp --- filezilla/src/interface/FileZilla.cpp 2010-01-02 15:42:28.000000000 +0100 +++ filezilla-mod/src/interface/FileZilla.cpp 2012-06-08 11:24:22.413256000 +0200 @@ -652,35 +652,76 @@ return true; } + +bool checkValencian() +{ + char * llxlang = getenv("LANGUAGE"); + llxlang=strtok(llxlang,":"); + llxlang=strtok(llxlang,"."); + if(strcmp(llxlang,"qcv_ES")==0) + return true; + else + return false; + + +} + + bool CFileZillaApp::SetLocale(int language) { // First check if we can load the new locale wxLocale* pLocale = new wxLocale(); wxLogNull log; - pLocale->Init(language); - if (!pLocale->IsOk() || !pLocale->AddCatalog(_T("filezilla"))) + + + if(!checkValencian()) { + + pLocale->Init(language); + if (!pLocale->IsOk() || !pLocale->AddCatalog(_T("filezilla"))) + { + printf("SetLocale step 1. failed\n"); + delete pLocale; + return false; + } + + // Now unload old locale + // We unload new locale as well, else the internal locale chain in wxWidgets get's broken. delete pLocale; - return false; - } + delete m_pLocale; + m_pLocale = 0; - // Now unload old locale - // We unload new locale as well, else the internal locale chain in wxWidgets get's broken. - delete pLocale; - delete m_pLocale; - m_pLocale = 0; - - // Finally load new one - pLocale = new wxLocale(); - pLocale->Init(language); - if (!pLocale->IsOk() || !pLocale->AddCatalog(_T("filezilla"))) + // Finally load new one + pLocale = new wxLocale(); + pLocale->Init(language); + if (!pLocale->IsOk() || !pLocale->AddCatalog(_T("filezilla"))) + { + printf("SetLocale step 1. failed\n"); + delete pLocale; + return false; + } + m_pLocale = pLocale; + + return true; + } + else { - delete pLocale; - return false; + //printf("QCV mode\n"); + bool ret_init,ret_catalog; + wxLanguageInfo valencian; + valencian.Language=wxLANGUAGE_USER_DEFINED; + valencian.CanonicalName=wxT("qcv"); + valencian.Description=wxT("Valencian"); + valencian.LayoutDirection=wxLayout_LeftToRight; + + + if (!pLocale->Init(_T("Valencian"),_T("qcv"),_T("qcv_ES"),false,false) || !pLocale->AddCatalog(_T("filezilla"), wxLANGUAGE_USER_DEFINED,NULL)) + return false; + + m_pLocale=pLocale; + return true; + } - m_pLocale = pLocale; - - return true; } int CFileZillaApp::GetCurrentLanguage() const @@ -904,4 +945,4 @@ } return res; -} +} \ No hay ningún carácter de nueva línea al final del archivo