From 92d79498846f5b4a844555d7e378f4cb0c1eced2 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mike.fabian@basyskom.de>
Date: Wed, 13 Oct 2010 17:57:45 +0200
Subject: Changes: use @ as well as a delimiter when searching for translations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RevBy: Berthold Krevert

Details:

Without using @ as well as a delimiter, for the locale
“de@collation=phonebook” only de@collation=phonebook{,.qm} would be
found but if this does not exist de{,.qm} would not be tried as a
fallback.

Similar for “zh_CN@collation=pinyin”: if
zh_CN@collation=pinyin{,.qm} is not found, the next fallback should be
zh_CN{,.qm}. Without using @ as a delimiter the next fallback would be
zh{,.qm} already.
---
 src/corelib/i18n/mlocale.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/corelib/i18n')

diff --git a/src/corelib/i18n/mlocale.cpp b/src/corelib/i18n/mlocale.cpp
index 7c1c18af..94889b2c 100644
--- a/src/corelib/i18n/mlocale.cpp
+++ b/src/corelib/i18n/mlocale.cpp
@@ -209,7 +209,7 @@ bool MTranslationCatalog::loadWith(MLocale *mlocale, MLocale::Category category)
                 return true;
         }
         else {
-            QString delims("_.");
+            QString delims("_.@");
             QString engineeringEnglishName = fname;
             fname += '_' + mlocale->categoryName(category);
             for (;;) {
-- 
cgit v1.2.3