squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-31 20:58:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Unify the way to generate the language list in WebUI and GUI

Browse Source 
PR #17994.
This commit is contained in:
brvphoenix
2022-12-25 21:44:37 +08:00
committed by GitHub
parent c5a4a0db2c
commit b33dc7d831
5 changed files with 133 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/webui/webapplication.cpp
View File

@@ -32,6 +32,7 @@
#include <QDateTime>
#include <QDebug>
#include <QDir>
#include <QFile>
#include <QFileInfo>
#include <QJsonDocument>
@@ -112,6 +113,22 @@ namespace
return u"no-store"_qs;
}
QString createLanguagesOptionsHtml()
{
// List language files
const QDir langDir {u":/www/translations"_qs};
const QStringList langFiles = langDir.entryList(QStringList(u"webui_*.qm"_qs), QDir::Files);
QStringList languages;
for (const QString &langFile : langFiles)
{
const QString localeStr = langFile.section(u"_"_qs, 1, -1).section(u"."_qs, 0, 0); // remove "webui_" and ".qm"
languages << u"<option value=\"%1\">%2</option>"_qs.arg(localeStr, Utils::Misc::languageToLocalizedString(localeStr));
qDebug() << "Supported locale:" << localeStr;
}
return languages.join(u'\n');
}
}
WebApplication::WebApplication(IApplication *app, QObject *parent)
@@ -472,13 +489,17 @@ void WebApplication::sendFile(const Path &path)
const QMimeType mimeType = QMimeDatabase().mimeTypeForFileNameAndData(path.data(), data);
const bool isTranslatable = !m_isAltUIUsed && mimeType.inherits(u"text/plain"_qs);
// Translate the file
if (isTranslatable)
{
auto dataStr = QString::fromUtf8(data);
// Translate the file
translateDocument(dataStr);
data = dataStr.toUtf8();
// Add the language options
if (path == (m_rootFolder / Path(PRIVATE_FOLDER) / Path(u"views/preferences.html"_qs)))
dataStr.replace(u"${LANGUAGE_OPTIONS}"_qs, createLanguagesOptionsHtml());
data = dataStr.toUtf8();
m_translatedFiles[path] = {data, mimeType.name(), lastModified}; // caching translated file
}

72
src/webui/www/private/views/preferences.html
View File

@@ -666,62 +666,7 @@
<legend>QBT_TR(Language)QBT_TR[CONTEXT=OptionsDialog]</legend>
<label for="locale_select">QBT_TR(User Interface Language:)QBT_TR[CONTEXT=OptionsDialog]</label>
<select id="locale_select">
<option value="ar_AE">عربي</option>
<option value="az@latin">Azərbaycan dili</option>
<option value="be_BY">Беларуская</option>
<option value="bg_BG">Български</option>
<option value="ca_ES">Català</option>
<option value="cs_CZ">Čeština</option>
<option value="da_DK">Dansk</option>
<option value="de_DE">Deutsch</option>
<option value="el_GR">Ελληνικά</option>
<option value="en">English</option>
<option value="en_AU">English (Australia)</option>
<option value="en_GB">English (United Kingdom)</option>
<option value="eo_EO">Esperanto</option>
<option value="es_ES">Español</option>
<option value="et">Eesti, eesti keel</option>
<option value="eu_ES">Euskara</option>
<option value="fa">فارسی</option>
<option value="fi_FI">Suomi</option>
<option value="fr_FR">Français</option>
<option value="gl_ES">Galego</option>
<option value="he_IL">עברית</option>
<option value="hi_IN">हिन्दी, हिंदी</option>
<option value="hr_HR">Hrvatski</option>
<option value="hu_HU">Magyar</option>
<option value="hy_AM">Հայերեն</option>
<option value="id">Bahasa Indonesia</option>
<option value="is">Íslenska</option>
<option value="it_IT">Italiano</option>
<option value="ja_JP">日本語</option>
<option value="ka_GE">ქართული</option>
<option value="ko_KR">한국어</option>
<option value="ltg">Latgalīšu volūda</option>
<option value="lt_LT">Lietuvių</option>
<option value="lv_LV">Latviešu valoda</option>
<option value="mn_MN">Монгол хэл</option>
<option value="ms_MY">بهاس ملايو</option>
<option value="nb_NO">Norsk</option>
<option value="nl_NL">Nederlands</option>
<option value="oc">lenga d'òc</option>
<option value="pl_PL">Polski</option>
<option value="pt_BR">Português brasileiro</option>
<option value="pt_PT">Português</option>
<option value="ro_RO">Română</option>
<option value="ru_RU">Русский</option>
<option value="sk_SK">Slovenčina</option>
<option value="sl_SI">Slovenščina</option>
<option value="sr_CS">Српски</option>
<option value="sv_SE">Svenska</option>
<option value="th">ไทย</option>
<option value="tr_TR">Türkçe</option>
<option value="uk_UA">Українська</option>
<option value="uz@Latn">أۇزبېك</option>
<option value="vi_VN">Tiếng Việt</option>
<option value="zh">简体中文</option>
<option value="zh_HK">香港正體字</option>
<option value="zh_TW">正體中文</option>
${LANGUAGE_OPTIONS}
</select>
</fieldset>
@@ -1408,6 +1353,7 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD
updateWebUICustomHTTPHeadersSettings: updateWebUICustomHTTPHeadersSettings,
updateWebUIReverseProxySettings: updateWebUIReverseProxySettings,
updateDynDnsSettings: updateDynDnsSettings,
updateWebuiLocaleSelect: updateWebuiLocaleSelect,
registerDynDns: registerDynDns,
applyPreferences: applyPreferences
};
@@ -1737,6 +1683,18 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD
}).send();
};
const updateWebuiLocaleSelect = (selected) => {
let languages = [];
for (let i = 0; i < $('locale_select').options.length; i++)
languages.push($('locale_select').options[i].value);
if (!languages.includes(selected)) {
const lang = selected.slice(0, selected.indexOf('_'));
selected = languages.includes(lang) ? lang : 'en';
}
$('locale_select').setProperty('value', selected);
};
const loadPreferences = function() {
const url = 'api/v2/app/preferences';
new Request.JSON({
@@ -2013,7 +1971,7 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD
// Web UI tab
// Language
$('locale_select').setProperty('value', ((pref.locale === "en_US") ? "en" : pref.locale));
updateWebuiLocaleSelect(pref.locale);
$('performanceWarning').setProperty('checked', pref.performance_warning);
// HTTP Server