kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

locale stuff

Browse Source
This commit is contained in:
wmayer
2012-04-30 18:30:29 +02:00
parent 95cf62b990
commit da1a42e2ee
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Gui/DlgGeneralImp.cpp
View File

@@ -175,28 +175,26 @@ void DlgGeneralImp::loadSettings()
ParameterGrp::handle hGrp = WindowParameter::getDefaultParameter()->GetGroup("General"); ParameterGrp::handle hGrp = WindowParameter::getDefaultParameter()->GetGroup("General");
QString lang = QLocale::languageToString(QLocale::system().language()); QString lang = QLocale::languageToString(QLocale::system().language());
QByteArray language = hGrp->GetASCII("Language", (const char*)lang.toAscii()).c_str(); QByteArray language = hGrp->GetASCII("Language", (const char*)lang.toAscii()).c_str();
Languages->addItem(Gui::Translator::tr("English"), QByteArray("English"));
int index = 1; int index = 1;
Languages->addItem(QString::fromAscii("English"), QByteArray("English"));
TStringMap list = Translator::instance()->supportedLocales();
for (TStringMap::iterator it = list.begin(); it != list.end(); ++it, index++) {
QLocale locale(QString::fromAscii(it->second.c_str()));
QByteArray lang = it->first.c_str();
QString langname = QString::fromAscii(lang.constData());
#if QT_VERSION >= 0x040800 #if QT_VERSION >= 0x040800
TStringList list = Translator::instance()->supportedLocales(); QString native = locale.nativeLanguageName();
for (TStringList::iterator it = list.begin(); it != list.end(); ++it, index++) { if (!native.isEmpty()) {
QLocale locale(QString::fromAscii(it->c_str())); if (native[0].isLetter())
QByteArray lang = QLocale::languageToString(locale.language()).toAscii(); native[0] = native[0].toUpper();
Languages->addItem(locale.nativeLanguageName(), lang); langname = native;
if (language == lang) {
Languages->setCurrentIndex(index);
} }
}
#else
TStringList list = Translator::instance()->supportedLanguages();
for (TStringList::iterator it = list.begin(); it != list.end(); ++it, index++) {
QByteArray lang = it->c_str();
Languages->addItem(Gui::Translator::tr(lang.constData()), lang);
if (language == lang) {
Languages->setCurrentIndex(index);
}
}
#endif #endif
Languages->addItem(langname, lang);
if (language == lang) {
Languages->setCurrentIndex(index);
}
}
int size = QApplication::style()->pixelMetric(QStyle::PM_ToolBarIconSize); int size = QApplication::style()->pixelMetric(QStyle::PM_ToolBarIconSize);
int current = getMainWindow()->iconSize().width(); int current = getMainWindow()->iconSize().width();

6
src/Gui/Language/Translator.cpp
View File

@@ -174,17 +174,17 @@ TStringList Translator::supportedLanguages() const
return languages; return languages;
} }
TStringList Translator::supportedLocales() const TStringMap Translator::supportedLocales() const
{ {
// List all .qm files // List all .qm files
TStringList languages; TStringMap languages;
QDir dir(QLatin1String(":/translations")); QDir dir(QLatin1String(":/translations"));
for (std::map<std::string,std::string>::const_iterator it = d->mapLanguageTopLevelDomain.begin(); for (std::map<std::string,std::string>::const_iterator it = d->mapLanguageTopLevelDomain.begin();
it != d->mapLanguageTopLevelDomain.end(); ++it) { it != d->mapLanguageTopLevelDomain.end(); ++it) {
QString filter = QString::fromAscii("*_%1.qm").arg(QLatin1String(it->second.c_str())); QString filter = QString::fromAscii("*_%1.qm").arg(QLatin1String(it->second.c_str()));
QStringList fileNames = dir.entryList(QStringList(filter), QDir::Files, QDir::Name); QStringList fileNames = dir.entryList(QStringList(filter), QDir::Files, QDir::Name);
if (!fileNames.isEmpty()) if (!fileNames.isEmpty())
languages.push_back(it->second); languages[it->first] = it->second;
} }
return languages; return languages;

5
src/Gui/Language/Translator.h
View File

@@ -34,6 +34,7 @@ class QDir;
namespace Gui { namespace Gui {
typedef std::list<std::string> TStringList; typedef std::list<std::string> TStringList;
typedef std::map<std::string, std::string> TStringMap;
/** /**
* The Translator class uses Qt's QTranslator objects to change the language of the application * The Translator class uses Qt's QTranslator objects to change the language of the application
@@ -65,8 +66,8 @@ public:
std::string activeLanguage() const; std::string activeLanguage() const;
/** Returns a list of supported languages. */ /** Returns a list of supported languages. */
TStringList supportedLanguages() const; TStringList supportedLanguages() const;
/** Returns a list of supported locales. */ /** Returns a map of supported languages/locales. */
TStringList supportedLocales() const; TStringMap supportedLocales() const;
/** Adds a path where localization files can be found */ /** Adds a path where localization files can be found */
void addPath(const QString& path); void addPath(const QString& path);