From: Richard Heck <rgheck@comcast.net>
Date: Mon, 5 Sep 2011 18:58:56 +0000 (+0000)
Subject: Backport fix for bug #7751: Sort the modules and formats by translated string.
X-Git-Tag: 2.0.2~246
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b9955190bd28edc79eba933fa339c92db01e3105;p=features.git

Backport fix for bug #7751: Sort the modules and formats by translated string.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39596 a592a061-630c-0410-9148-cb99ea01b6c8
---

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 <algorithm>
 
@@ -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);
diff --git a/status.20x b/status.20x
index b1027edb81..5620c6e223 100644
--- a/status.20x
+++ b/status.20x
@@ -56,6 +56,10 @@ What's new
 - Adjust the cursor language after document language change had changed the
   text language (bug 7681).
 
+- Correctly sort modules in Document>Settings and formats in the "Other 
+  formats" dialog (bug 7751).
+
+
 * ADVANCED FIND AND REPLACE