## Summary **What is the goal of this PR?** This PR introduces Internationalization (i18n) support, enabling users to switch the UI language dynamically. **What changes are included?** - Core Logic: Added I18n class (`lib/I18n/I18n.h/cpp`) to manage language state and string retrieval. - Data Structures: - `lib/I18n/I18nStrings.h/cpp`: Static string arrays for each supported language. - `lib/I18n/I18nKeys.h`: Enum definitions for type-safe string access. - `lib/I18n/translations.csv`: single source of truth. - Documentation: Added `docs/i18n.md` detailing the workflow for developers and translators. - New Settings activity: `src/activities/settings/LanguageSelectActivity.h/cpp` ## Additional Context This implementation (building on concepts from #505) prioritizes performance and memory efficiency. The core approach is to store all localized strings for each language in dedicated arrays and access them via enums. This provides O(1) access with zero runtime overhead, and avoids the heap allocations, hashing, and collision handling required by `std::map` or `std::unordered_map`. The main trade-off is that enums and string arrays must remain perfectly synchronized—any mismatch would result in incorrect strings being displayed in the UI. To eliminate this risk, I added a Python script that automatically generates `I18nStrings.h/.cpp` and `I18nKeys.h` from a CSV file, which will serve as the single source of truth for all translations. The full design and workflow are documented in `docs/i18n.md`. ### Next Steps - [x] Python script `generate_i18n.py` to auto-generate C++ files from CSV - [x] Populate translations.csv with initial translations. Currently available translations: English, Español, Français, Deutsch, Čeština, Português (Brasil), Русский, Svenska. Thanks, community! **Status:** EDIT: ready to be merged. As a proof of concept, the SPANISH strings currently mirror the English ones, but are fully uppercased. --- ### AI Usage Did you use AI tools to help write this code? _**< PARTIALLY >**_ I used AI for the black work of replacing strings with I18n references across the project, and for generating the documentation. EDIT: also some help with merging changes from master. --------- Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> Co-authored-by: yeyeto2788 <juanernestobiondi@gmail.com>
167 lines
5.0 KiB
C++
167 lines
5.0 KiB
C++
#pragma once
|
|
#include <I18n.h>
|
|
|
|
#include <functional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "activities/ActivityWithSubactivity.h"
|
|
#include "util/ButtonNavigator.h"
|
|
|
|
class CrossPointSettings;
|
|
|
|
enum class SettingType { TOGGLE, ENUM, ACTION, VALUE, STRING };
|
|
|
|
enum class SettingAction {
|
|
None,
|
|
RemapFrontButtons,
|
|
KOReaderSync,
|
|
OPDSBrowser,
|
|
Network,
|
|
ClearCache,
|
|
CheckForUpdates,
|
|
Language,
|
|
};
|
|
|
|
struct SettingInfo {
|
|
StrId nameId;
|
|
SettingType type;
|
|
uint8_t CrossPointSettings::* valuePtr = nullptr;
|
|
std::vector<StrId> enumValues;
|
|
SettingAction action = SettingAction::None;
|
|
|
|
struct ValueRange {
|
|
uint8_t min;
|
|
uint8_t max;
|
|
uint8_t step;
|
|
};
|
|
ValueRange valueRange = {};
|
|
|
|
const char* key = nullptr; // JSON API key (nullptr for ACTION types)
|
|
StrId category = StrId::STR_NONE_OPT; // Category for web UI grouping
|
|
|
|
// Direct char[] string fields (for settings stored in CrossPointSettings)
|
|
char* stringPtr = nullptr;
|
|
size_t stringMaxLen = 0;
|
|
|
|
// Dynamic accessors (for settings stored outside CrossPointSettings, e.g. KOReaderCredentialStore)
|
|
std::function<uint8_t()> valueGetter;
|
|
std::function<void(uint8_t)> valueSetter;
|
|
std::function<std::string()> stringGetter;
|
|
std::function<void(const std::string&)> stringSetter;
|
|
|
|
static SettingInfo Toggle(StrId nameId, uint8_t CrossPointSettings::* ptr, const char* key = nullptr,
|
|
StrId category = StrId::STR_NONE_OPT) {
|
|
SettingInfo s;
|
|
s.nameId = nameId;
|
|
s.type = SettingType::TOGGLE;
|
|
s.valuePtr = ptr;
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo Enum(StrId nameId, uint8_t CrossPointSettings::* ptr, std::vector<StrId> values,
|
|
const char* key = nullptr, StrId category = StrId::STR_NONE_OPT) {
|
|
SettingInfo s;
|
|
s.nameId = nameId;
|
|
s.type = SettingType::ENUM;
|
|
s.valuePtr = ptr;
|
|
s.enumValues = std::move(values);
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo Action(StrId nameId, SettingAction action) {
|
|
SettingInfo s;
|
|
s.nameId = nameId;
|
|
s.type = SettingType::ACTION;
|
|
s.action = action;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo Value(StrId nameId, uint8_t CrossPointSettings::* ptr, const ValueRange valueRange,
|
|
const char* key = nullptr, StrId category = StrId::STR_NONE_OPT) {
|
|
SettingInfo s;
|
|
s.nameId = nameId;
|
|
s.type = SettingType::VALUE;
|
|
s.valuePtr = ptr;
|
|
s.valueRange = valueRange;
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo String(StrId nameId, char* ptr, size_t maxLen, const char* key = nullptr,
|
|
StrId category = StrId::STR_NONE_OPT) {
|
|
SettingInfo s;
|
|
s.nameId = nameId;
|
|
s.type = SettingType::STRING;
|
|
s.stringPtr = ptr;
|
|
s.stringMaxLen = maxLen;
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo DynamicEnum(StrId nameId, std::vector<StrId> values, std::function<uint8_t()> getter,
|
|
std::function<void(uint8_t)> setter, const char* key = nullptr,
|
|
StrId category = StrId::STR_NONE_OPT) {
|
|
SettingInfo s;
|
|
s.nameId = nameId;
|
|
s.type = SettingType::ENUM;
|
|
s.enumValues = std::move(values);
|
|
s.valueGetter = std::move(getter);
|
|
s.valueSetter = std::move(setter);
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo DynamicString(StrId nameId, std::function<std::string()> getter,
|
|
std::function<void(const std::string&)> setter, const char* key = nullptr,
|
|
StrId category = StrId::STR_NONE_OPT) {
|
|
SettingInfo s;
|
|
s.nameId = nameId;
|
|
s.type = SettingType::STRING;
|
|
s.stringGetter = std::move(getter);
|
|
s.stringSetter = std::move(setter);
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
};
|
|
|
|
class SettingsActivity final : public ActivityWithSubactivity {
|
|
ButtonNavigator buttonNavigator;
|
|
|
|
int selectedCategoryIndex = 0; // Currently selected category
|
|
int selectedSettingIndex = 0;
|
|
int settingsCount = 0;
|
|
|
|
// Per-category settings derived from shared list + device-only actions
|
|
std::vector<SettingInfo> displaySettings;
|
|
std::vector<SettingInfo> readerSettings;
|
|
std::vector<SettingInfo> controlsSettings;
|
|
std::vector<SettingInfo> systemSettings;
|
|
const std::vector<SettingInfo>* currentSettings = nullptr;
|
|
|
|
const std::function<void()> onGoHome;
|
|
|
|
static constexpr int categoryCount = 4;
|
|
static const StrId categoryNames[categoryCount];
|
|
|
|
void enterCategory(int categoryIndex);
|
|
void toggleCurrentSetting();
|
|
|
|
public:
|
|
explicit SettingsActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
|
|
const std::function<void()>& onGoHome)
|
|
: ActivityWithSubactivity("Settings", renderer, mappedInput), onGoHome(onGoHome) {}
|
|
void onEnter() override;
|
|
void onExit() override;
|
|
void loop() override;
|
|
void render(Activity::RenderLock&&) override;
|
|
};
|