mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-04 13:59:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Select "English" if the current language is not found in Preferences

Browse Source 
If the user preferences file (aseprite.ini) contained a non-existent
language, the first option of the languages combo box was selected,
which might lead to a confusing situation where just opening the
preferences dialog will change from English to other
language (non-English, the first language in the combobox).
This commit is contained in:
David Capello 2024-04-08 13:23:38 -03:00
parent 4d5bf53be8
commit 6a12c7014d
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/commands/cmd_options.cpp
View File

@ -1317,9 +1317,20 @@ private:
if (language()->getItemCount() > 0)
return;
// Select current language by lang ID
// Check if the current language exists, in other case select English.
Strings* strings = Strings::instance();
std::string curLang = strings->currentLanguage();
bool found = false;
for (const LangInfo& lang : strings->availableLanguages()) {
if (lang.id == curLang) {
found = true;
break;
}
}
if (!found)
curLang = Strings::kDefLanguage;
// Select current language by lang ID
for (const LangInfo& lang : strings->availableLanguages()) {
int i = language()->addItem(new LangItem(lang));
if (lang.id == curLang)

3
src/app/i18n/strings.cpp
View File

@ -25,7 +25,8 @@
namespace app {
static Strings* singleton = nullptr;
static const char* kDefLanguage = "en";
const char* Strings::kDefLanguage = "en";
// static
void Strings::createInstance(Preferences& pref,

4
src/app/i18n/strings.h
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2023 Igara Studio S.A.
// Copyright (C) 2023-2024 Igara Studio S.A.
// Copyright (C) 2016-2018 David Capello
//
// This program is distributed under the terms of
@ -25,6 +25,8 @@ namespace app {
// Singleton class to load and access "strings/en.ini" file.
class Strings : public app::gen::Strings<app::Strings> {
public:
static const char* kDefLanguage;
static void createInstance(Preferences& pref,
Extensions& exts);
static Strings* instance();