r17766 by jghali - fix default hyphenation language : en_US is not correct as Scribus does not provide an hyphenation file for that language code, use en_GB instead

[scribus-commit]

Author: jghali
Date: Tue Aug 28 22:32:34 2012
New Revision: 17766

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17766
Log:
fix default hyphenation language : en_US is not correct as Scribus does not provide an hyphenation file for that language code, use en_GB instead

Modified:
    trunk/Scribus/scribus/prefsmanager.cpp
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17766&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp (original)
+++ trunk/Scribus/scribus/prefsmanager.cpp Tue Aug 28 22:32:34 2012
@@ -310,7 +310,7 @@
 	appPrefs.docSetupPrefs.bleeds.Bottom = 0;
 	appPrefs.hyphPrefs.MinWordLen = 3;
 	appPrefs.hyphPrefs.HyCount = 2;
-	appPrefs.hyphPrefs.Language = "en_US";
+	appPrefs.hyphPrefs.Language = "en_GB";
 	appPrefs.hyphPrefs.specialWords.clear();
 	appPrefs.hyphPrefs.ignoredWords.clear();
 	appPrefs.hyphPrefs.Automatic = true;
@@ -2393,7 +2393,7 @@
 		}
 		if (dc.tagName()=="Hyphenator")
 		{
-			appPrefs.hyphPrefs.Language = dc.attribute("Language","en_US");
+			appPrefs.hyphPrefs.Language = dc.attribute("Language","en_GB");
 			appPrefs.hyphPrefs.MinWordLen = dc.attribute("WordLength", "3").toInt();
 			appPrefs.hyphPrefs.HyCount = dc.attribute("HyphenCount", "2").toInt();
 			appPrefs.hyphPrefs.Automatic = static_cast<bool>(dc.attribute("Automatic", "1").toInt());

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17766&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Tue Aug 28 22:32:34 2012
@@ -9366,7 +9366,7 @@
 	//For each hyphenation file, grab the strings and the hyphenation data.
 	QString lang = QString(QLocale::system().name()).left(2);
 	LangTransl.clear();
-	prefsManager->appPrefs.hyphPrefs.Language = "en_US";
+	prefsManager->appPrefs.hyphPrefs.Language = "en_GB";
 	if ((hyphDir.exists()) && (hyphDir.count() != 0))
 	{
 		LanguageManager *langmgr(LanguageManager::instance());
@@ -9383,7 +9383,7 @@
 				prefsManager->appPrefs.hyphPrefs.Language = fileLangAbbrev;
 		}
 		if (tLang.isEmpty())
-			prefsManager->appPrefs.hyphPrefs.Language = "en_US";
+			prefsManager->appPrefs.hyphPrefs.Language = "en_GB";
 	}
 }