diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 4426d0349..6b65f15d3 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -19,7 +19,7 @@ constexpr SettingsMessageTree s_symbolFunctionChildren[3] = {SettingsMessageTree constexpr SettingsMessageTree s_modelMathOptionsChildren[6] = {SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren), SettingsMessageTree(I18n::Message::DisplayMode, s_modelFloatDisplayModeChildren), SettingsMessageTree(I18n::Message::EditionMode, s_modelEditionModeChildren), SettingsMessageTree(I18n::Message::SymbolFunction, s_symbolFunctionChildren), SettingsMessageTree(I18n::Message::ComplexFormat, s_modelComplexFormatChildren), SettingsMessageTree(I18n::Message::SymbolMultiplication, s_symbolChildren)}; constexpr SettingsMessageTree s_modelFontChildren[2] = {SettingsMessageTree(I18n::Message::LargeFont), SettingsMessageTree(I18n::Message::SmallFont)}; constexpr SettingsMessageTree s_accessibilityChildren[6] = {SettingsMessageTree(I18n::Message::AccessibilityInvertColors), SettingsMessageTree(I18n::Message::AccessibilityMagnify),SettingsMessageTree(I18n::Message::AccessibilityGamma),SettingsMessageTree(I18n::Message::AccessibilityGammaRed),SettingsMessageTree(I18n::Message::AccessibilityGammaGreen),SettingsMessageTree(I18n::Message::AccessibilityGammaBlue)}; -constexpr SettingsMessageTree s_contributorsChildren[20] = {SettingsMessageTree(I18n::Message::Developers), SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::SandraSimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::MaximeFriess), SettingsMessageTree(I18n::Message::David), SettingsMessageTree(I18n::Message::DamienNicolet), SettingsMessageTree(I18n::Message::EvannDreumont), SettingsMessageTree(I18n::Message::SzaboLevente), SettingsMessageTree(I18n::Message::VenceslasDuet), SettingsMessageTree(I18n::Message::CharlotteThomas), SettingsMessageTree(I18n::Message::AntoninLoubiere), SettingsMessageTree(I18n::Message::BetaTesters), SettingsMessageTree(I18n::Message::CyprienMejat), SettingsMessageTree(I18n::Message::TimeoArnouts), SettingsMessageTree(I18n::Message::JulieC), SettingsMessageTree(I18n::Message::LelahelHideux), SettingsMessageTree(I18n::Message::Madil), SettingsMessageTree(I18n::Message::HilaireLeRoux)}; +constexpr SettingsMessageTree s_contributorsChildren[23] = {SettingsMessageTree(I18n::Message::Developers), SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::MaximeFriess), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::SandraSimmons), SettingsMessageTree(I18n::Message::David), SettingsMessageTree(I18n::Message::DamienNicolet), SettingsMessageTree(I18n::Message::EvannDreumont), SettingsMessageTree(I18n::Message::SzaboLevente), SettingsMessageTree(I18n::Message::VenceslasDuet), SettingsMessageTree(I18n::Message::CharlotteThomas), SettingsMessageTree(I18n::Message::AntoninLoubiere), SettingsMessageTree(I18n::Message::CyprienMejat), SettingsMessageTree(I18n::Message::BetaTesters), SettingsMessageTree(I18n::Message::TimeoArnouts), SettingsMessageTree(I18n::Message::JulieC), SettingsMessageTree(I18n::Message::LelahelHideux), SettingsMessageTree(I18n::Message::Madil), SettingsMessageTree(I18n::Message::HilaireLeRoux), SettingsMessageTree(I18n::Message::HectorNussbaumer), SettingsMessageTree(I18n::Message::RaphaelDyda), SettingsMessageTree(I18n::Message::ThibautC)}; constexpr SettingsMessageTree s_modelAboutChildren[8] = {SettingsMessageTree(I18n::Message::Username), SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::OmegaVersion), SettingsMessageTree(I18n::Message::MicroPythonVersion), SettingsMessageTree(I18n::Message::MemUse), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId), SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren)}; MainController::MainController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate) : diff --git a/apps/settings/main_controller.h b/apps/settings/main_controller.h index 7052fc3f3..fd638a0cd 100644 --- a/apps/settings/main_controller.h +++ b/apps/settings/main_controller.h @@ -24,7 +24,7 @@ extern const Shared::SettingsMessageTree s_modelMathOptionsChildren[6]; extern const Shared::SettingsMessageTree s_modelFontChildren[2]; extern const Shared::SettingsMessageTree s_modelDateTimeChildren[3]; extern const Shared::SettingsMessageTree s_accessibilityChildren[6]; -extern const Shared::SettingsMessageTree s_contributorsChildren[20]; +extern const Shared::SettingsMessageTree s_contributorsChildren[23]; extern const Shared::SettingsMessageTree s_modelAboutChildren[8]; extern const Shared::SettingsMessageTree s_model; diff --git a/apps/settings/sub_menu/contributors_controller.cpp b/apps/settings/sub_menu/contributors_controller.cpp index 19fc88895..26bab3326 100644 --- a/apps/settings/sub_menu/contributors_controller.cpp +++ b/apps/settings/sub_menu/contributors_controller.cpp @@ -28,13 +28,13 @@ int ContributorsController::reusableCellCount(int type) { return k_totalNumberOfCell; } -constexpr static int s_numberOfDevelopers = 12; +constexpr static int s_numberOfDevelopers = 13; constexpr static I18n::Message s_developersUsernames[s_numberOfDevelopers] = { I18n::Message::PQuentinGuidee, - I18n::Message::PSandraSimmons, I18n::Message::PJoachimLeFournis, - I18n::Message::PJeanBaptisteBoric, I18n::Message::PMaximeFriess, + I18n::Message::PJeanBaptisteBoric, + I18n::Message::PSandraSimmons, I18n::Message::PDavid, I18n::Message::PDamienNicolet, I18n::Message::PEvannDreumont, @@ -42,16 +42,19 @@ constexpr static I18n::Message s_developersUsernames[s_numberOfDevelopers] = { I18n::Message::PVenceslasDuet, I18n::Message::PCharlotteThomas, I18n::Message::PAntoninLoubiere, + I18n::Message::PCyprienMejat, }; -constexpr static int s_numberOfBetaTesters = 6; +constexpr static int s_numberOfBetaTesters = 8; constexpr static I18n::Message s_betaTestersUsernames[s_numberOfBetaTesters] = { - I18n::Message::PCyprienMejat, I18n::Message::PTimeoArnouts, I18n::Message::PJulieC, I18n::Message::PLelahelHideux, I18n::Message::PMadil, I18n::Message::PHilaireLeRoux, + I18n::Message::PHectorNussbaumer, + I18n::Message::PRaphaelDyda, + I18n::Message::PThibautC, }; void ContributorsController::willDisplayCellForIndex(HighlightCell * cell, int index) { diff --git a/apps/shared.universal.i18n b/apps/shared.universal.i18n index 97c75c00e..fb927a659 100644 --- a/apps/shared.universal.i18n +++ b/apps/shared.universal.i18n @@ -343,7 +343,7 @@ CyprienMejat = "Cyprien Méjat" PCyprienMejat = "@A2drien" TimeoArnouts = "Timéo Arnouts" PTimeoArnouts = "@Dogm" -JulieC = "Julie C" +JulieC = "Julie C." PJulieC = "@windows9x95" LelahelHideux = "Lélahel Hideux" PLelahelHideux = "@Lelahelry" @@ -351,6 +351,12 @@ Madil = "Madil" PMadil = "@le-grand-mannitout" HilaireLeRoux = "Hilaire Le Roux" PHilaireLeRoux = "@0Babass2" +HectorNussbaumer = "Hector Nussbaumer" +PHectorNussbaumer = "@Sycorax" +RaphaelDyda = "Raphaël Dyda" +PRaphaelDyda = "@Trixciel" +ThibautC = "Thibaut C." +PThibautC = "@Tibo_C" SpeedOfLight = "2.99792458·10^8_m_s^-1" YearLight = "9.461·10^15_m" Boltzmann = "1.380649·10^-23_J_K^-1"