From e2f6bd6d45fad4a32554d9d882250b8fd6d8a2f5 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Fri, 2 Sep 2011 18:40:06 +0000 Subject: [PATCH] Fix bug #7751: Sort the modules and formats by translated string. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39579 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ModuleList.cpp | 6 ++++-- src/frontends/qt4/GuiSendto.cpp | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp index a965871002..49895e6d4d 100644 --- a/src/ModuleList.cpp +++ b/src/ModuleList.cpp @@ -18,6 +18,7 @@ #include "support/debug.h" #include "support/FileName.h" +#include "support/gettext.h" #include "support/filetools.h" #include "support/lstrings.h" @@ -112,18 +113,19 @@ bool LyXModule::areCompatible(string const & mod1, string const & mod2) return true; } + // used when sorting the module list. class ModuleSorter { public: int operator()(LyXModule const & lm1, LyXModule const & lm2) const { - return lm1.getName() < lm2.getName(); + return _(lm1.getName()) < _(lm2.getName()); } }; -//Much of this is borrowed from LayoutFileList::read() +// Much of this is borrowed from LayoutFileList::read() bool ModuleList::read() { FileName const real_file = libFileSearch("", "lyxmodules.lst"); diff --git a/src/frontends/qt4/GuiSendto.cpp b/src/frontends/qt4/GuiSendto.cpp index 5675342959..8bb8242a5b 100644 --- a/src/frontends/qt4/GuiSendto.cpp +++ b/src/frontends/qt4/GuiSendto.cpp @@ -19,8 +19,9 @@ #include "Format.h" #include "FuncRequest.h" -#include "support/qstring_helpers.h" #include "support/filetools.h" +#include "support/gettext.h" +#include "support/qstring_helpers.h" #include @@ -67,12 +68,14 @@ void GuiSendTo::changed_adaptor() changed(); } + namespace { bool formatSorter(Format const * lhs, Format const * rhs) { - return lhs->prettyname() < rhs->prettyname(); + return _(lhs->prettyname()) < _(rhs->prettyname()); } } // end namespace + void GuiSendTo::updateContents() { all_formats_ = buffer().params().exportableFormats(false); -- 2.39.2