mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-17 12:34:37 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated templateengine base code to 1.6.5

Browse Source
This commit is contained in:
Luis Ángel San Martín
2016-06-17 19:56:55 +02:00
parent 5ae7e9fd3f
commit 3675aebdc5
7 changed files with 142 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
YACReaderLibrary/server/lib/templateengine/templateloader.cpp
View File

@ -32,18 +32,22 @@ TemplateLoader::TemplateLoader(QSettings* settings, QObject* parent)
}
fileNameSuffix=settings->value("suffix",".tpl").toString();
QString encoding=settings->value("encoding").toString();
if (encoding.isEmpty()) {
if (encoding.isEmpty())
{
textCodec=QTextCodec::codecForLocale();
}
else {
else
{
textCodec=QTextCodec::codecForName(encoding.toLocal8Bit());
}
qDebug("TemplateLoader: path=%s, codec=%s",qPrintable(templatePath),textCodec->name().data());
}
TemplateLoader::~TemplateLoader() {}
TemplateLoader::~TemplateLoader()
{}
QString TemplateLoader::tryFile(QString localizedName) {
QString TemplateLoader::tryFile(QString localizedName)
{
QString fileName=templatePath+"/"+localizedName+fileNameSuffix;
qDebug("TemplateCache: trying file %s",qPrintable(fileName));
QFile file(fileName);
@ -51,28 +55,33 @@ QString TemplateLoader::tryFile(QString localizedName) {
file.open(QIODevice::ReadOnly);
QString document=textCodec->toUnicode(file.readAll());
file.close();
if (file.error()) {
if (file.error())
{
qCritical("TemplateLoader: cannot load file %s, %s",qPrintable(fileName),qPrintable(file.errorString()));
return "";
}
else {
else
{
return document;
}
}
return "";
}
Template TemplateLoader::getTemplate(QString templateName, QString locales) {
Template TemplateLoader::getTemplate(QString templateName, QString locales)
{
mutex.lock();
QSet<QString> tried; // used to suppress duplicate attempts
QStringList locs=locales.split(',',QString::SkipEmptyParts);
// Search for exact match
foreach (QString loc,locs) {
foreach (QString loc,locs)
{
loc.replace(QRegExp(";.*"),"");
loc.replace('-','_');
QString localizedName=templateName+"-"+loc.trimmed();
if (!tried.contains(localizedName)) {
if (!tried.contains(localizedName))
{
QString document=tryFile(localizedName);
if (!document.isEmpty()) {
mutex.unlock();
@ -83,12 +92,15 @@ Template TemplateLoader::getTemplate(QString templateName, QString locales) {
}
// Search for correct language but any country
foreach (QString loc,locs) {
foreach (QString loc,locs)
{
loc.replace(QRegExp("[;_-].*"),"");
QString localizedName=templateName+"-"+loc.trimmed();
if (!tried.contains(localizedName)) {
if (!tried.contains(localizedName))
{
QString document=tryFile(localizedName);
if (!document.isEmpty()) {
if (!document.isEmpty())
{
mutex.unlock();
return Template(document,localizedName);
}
@ -98,7 +110,8 @@ Template TemplateLoader::getTemplate(QString templateName, QString locales) {
// Search for default file
QString document=tryFile(templateName);
if (!document.isEmpty()) {
if (!document.isEmpty())
{
mutex.unlock();
return Template(document,templateName);
}