r20036 by craig - #13038: Fix short words not working due to language abbreviations not matching, also fix path separators in RC path definitions

[scribus-commit]

Author: craig
Date: Wed Apr 29 20:38:55 2015
New Revision: 20036

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20036
Log:
#13038: Fix short words not working due to language abbreviations not matching, also fix path separators in RC path definitions

Modified:
    trunk/Scribus/scribus/plugins/short-words/configuration.cpp
    trunk/Scribus/scribus/plugins/short-words/version.h

Modified: trunk/Scribus/scribus/plugins/short-words/configuration.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20036&path=/trunk/Scribus/scribus/plugins/short-words/configuration.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/configuration.cpp (original)
+++ trunk/Scribus/scribus/plugins/short-words/configuration.cpp Wed Apr 29 20:38:55 2015
@@ -74,7 +74,7 @@
 		while (!t.atEnd())
 		{
 			aRow = t.readLine();
-			if (aRow.left(2) == lang)
+			if (aRow.left(2) == lang.left(2))
 			{
 				success = true;
 				shorts += aRow.remove(0, 3);

Modified: trunk/Scribus/scribus/plugins/short-words/version.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20036&path=/trunk/Scribus/scribus/plugins/short-words/version.h
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/version.h (original)
+++ trunk/Scribus/scribus/plugins/short-words/version.h Wed Apr 29 20:38:55 2015
@@ -19,8 +19,8 @@
 #ifndef _SCRIBUS_SHORTVER_H_
 #define _SCRIBUS_SHORTVER_H_
 
-#define RC_PATH QDir::toNativeSeparators(ScPaths::instance().shareDir() + "/plugins/scribus-short-words.rc")
-#define RC_PATH_USR QDir::toNativeSeparators(ScPaths::getApplicationDataDir() + "/scribus-short-words.rc")
+#define RC_PATH QDir::toNativeSeparators(ScPaths::instance().shareDir() + "plugins/scribus-short-words.rc")
+#define RC_PATH_USR QDir::toNativeSeparators(ScPaths::getApplicationDataDir() + "scribus-short-words.rc")
 
 #define SPACE QChar(' ')