r20442 by craig -

[scribus-commit]

Author: craig
Date: Sun Oct  4 10:15:23 2015
New Revision: 20442

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20442
Log:
#13392: Fix order of LANG/LC_ALL/LC_MESSAGES processing

Modified:
    trunk/Scribus/scribus/scribusapp.cpp

Modified: trunk/Scribus/scribus/scribusapp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20442&path=/trunk/Scribus/scribus/scribusapp.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusapp.cpp	(original)
+++ trunk/Scribus/scribus/scribusapp.cpp	Sun Oct  4 10:15:23 2015
@@ -333,20 +333,24 @@
 	if (!lang.isEmpty())
 		langs.push_back(lang);
 
-	if (!(lang = ::getenv("LC_ALL")).isEmpty())
+	if (!(lang = ::getenv("LANG")).isEmpty())
 	{
 		if (lang=="C")
 			lang="en";
 		langs.push_back(lang);
 	}
-	if (!(lang = ::getenv("LANG")).isEmpty())
+	if (!(lang = ::getenv("LC_MESSAGES")).isEmpty())
 	{
 		if (lang=="C")
 			lang="en";
 		langs.push_back(lang);
 	}
-	if (!(lang = ::getenv("LC_MESSAGES")).isEmpty())
+	if (!(lang = ::getenv("LC_ALL")).isEmpty())
+	{
+		if (lang=="C")
+			lang="en";
 		langs.push_back(lang);
+	}
 
 	//add in user preferences lang, only overridden by lang command line option
 	QString Pff = QDir::toNativeSeparators(ScPaths::getApplicationDataDir());