From 972cc3e72179ecf8d33e8851687dfc39161cd179 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 16 Apr 2012 11:48:04 +0200 Subject: [PATCH] fixed path issue on mac --- src/frameworks/UBPlatformUtils_mac.mm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/frameworks/UBPlatformUtils_mac.mm b/src/frameworks/UBPlatformUtils_mac.mm index 5e1933ed..8ab96c0d 100644 --- a/src/frameworks/UBPlatformUtils_mac.mm +++ b/src/frameworks/UBPlatformUtils_mac.mm @@ -185,6 +185,7 @@ void UBPlatformUtils::fadeDisplayIn() QString UBPlatformUtils::preferredTranslation(QString pFilePrefix) { QString qmPath; + NSString* filePrefix = [[NSString alloc] initWithUTF8String:(const char*)(pFilePrefix.toUtf8())]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; @@ -192,7 +193,7 @@ QString UBPlatformUtils::preferredTranslation(QString pFilePrefix) if (lprojPath) { NSString *lang = [[lprojPath lastPathComponent] stringByDeletingPathExtension]; - NSString *translationFilePath = [lprojPath stringByAppendingPathComponent:[[@"sankore_" stringByAppendingString:lang] stringByAppendingPathExtension:@"qm"]]; + NSString *translationFilePath = [lprojPath stringByAppendingPathComponent:[[filePrefix stringByAppendingString:lang] stringByAppendingPathExtension:@"qm"]]; qmPath = QString::fromUtf8([translationFilePath UTF8String], strlen([translationFilePath UTF8String])); } @@ -202,7 +203,7 @@ QString UBPlatformUtils::preferredTranslation(QString pFilePrefix) QString UBPlatformUtils::preferredLanguage() { - QFileInfo qmFileInfo = QFileInfo(applicationPreferredTranslation()); + QFileInfo qmFileInfo = QFileInfo(preferredTranslation("sankore_")); QDir lprojPath = qmFileInfo.dir(); QFileInfo lprojFileInfo = QFileInfo(lprojPath.absolutePath()); return lprojFileInfo.baseName();