Browse Source

Merge pull request #18432 from sledgehammer999/chinese_fix

Migrate setting about Simplified Chinese locale
adaptive-webui-19844
sledgehammer999 2 years ago committed by GitHub
parent
commit
ca72360b6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      src/app/application.cpp
  2. 25
      src/app/main.cpp
  3. 17
      src/app/upgrade.cpp
  4. 2
      src/app/upgrade.h

13
src/app/application.cpp

@ -88,6 +88,7 @@ @@ -88,6 +88,7 @@
#include "base/version.h"
#include "applicationinstancemanager.h"
#include "filelogger.h"
#include "upgrade.h"
#ifndef DISABLE_GUI
#include "gui/addnewtorrentdialog.h"
@ -173,6 +174,18 @@ Application::Application(int &argc, char **argv) @@ -173,6 +174,18 @@ Application::Application(int &argc, char **argv)
SettingsStorage::initInstance();
Preferences::initInstance();
const bool firstTimeUser = !Preferences::instance()->getAcceptedLegal();
if (!firstTimeUser)
{
if (!upgrade())
throw RuntimeError(u"Failed migration of old settings"_qs); // Not translatable. Translation isn't configured yet.
handleChangedDefaults(DefaultPreferencesMode::Legacy);
}
else
{
handleChangedDefaults(DefaultPreferencesMode::Current);
}
initializeTranslation();
connect(this, &QCoreApplication::aboutToQuit, this, &Application::cleanup);

25
src/app/main.cpp

@ -221,26 +221,6 @@ int main(int argc, char *argv[]) @@ -221,26 +221,6 @@ int main(int argc, char *argv[])
app->setAttribute(Qt::AA_DontShowIconsInMenus);
#endif
if (!firstTimeUser)
{
handleChangedDefaults(DefaultPreferencesMode::Legacy);
#ifndef DISABLE_GUI
if (!upgrade()) return EXIT_FAILURE;
#elif defined(Q_OS_WIN)
if (!upgrade(_isatty(_fileno(stdin))
&& _isatty(_fileno(stdout)))) return EXIT_FAILURE;
#else
if (!upgrade(!params.shouldDaemonize
&& isatty(fileno(stdin))
&& isatty(fileno(stdout)))) return EXIT_FAILURE;
#endif
}
else
{
handleChangedDefaults(DefaultPreferencesMode::Current);
}
#if defined(DISABLE_GUI) && !defined(Q_OS_WIN)
if (params.shouldDaemonize)
{
@ -274,6 +254,11 @@ int main(int argc, char *argv[]) @@ -274,6 +254,11 @@ int main(int argc, char *argv[])
displayBadArgMessage(er.message());
return EXIT_FAILURE;
}
catch (const RuntimeError &er)
{
qDebug() << er.message();
return EXIT_FAILURE;
}
}
#if !defined(DISABLE_GUI)

17
src/app/upgrade.cpp

@ -395,9 +395,21 @@ namespace @@ -395,9 +395,21 @@ namespace
settingsStorage->storeValue(u"GUI/StartUpWindowState"_qs, windowState);
}
}
void migrateChineseLocale()
{
auto *settingsStorage = SettingsStorage::instance();
const auto key = u"Preferences/General/Locale"_qs;
if (settingsStorage->hasKey(key))
{
const auto locale = settingsStorage->loadValue<QString>(key);
if (locale.compare(u"zh"_qs, Qt::CaseInsensitive) == 0)
settingsStorage->storeValue(key, u"zh_CN"_qs);
}
}
}
bool upgrade(const bool /*ask*/)
bool upgrade()
{
CachedSettingValue<int> version {MIGRATION_VERSION_KEY, 0};
@ -425,7 +437,10 @@ bool upgrade(const bool /*ask*/) @@ -425,7 +437,10 @@ bool upgrade(const bool /*ask*/)
#endif
if (version < 5)
{
migrateStartupWindowState();
migrateChineseLocale();
}
version = MIGRATION_VERSION;
}

2
src/app/upgrade.h

@ -35,5 +35,5 @@ enum class DefaultPreferencesMode @@ -35,5 +35,5 @@ enum class DefaultPreferencesMode
};
void handleChangedDefaults(DefaultPreferencesMode mode);
bool upgrade(bool ask = true);
bool upgrade();
void setCurrentMigrationVersion();

Loading…
Cancel
Save