From 9188f8c054e6ee521c7b639dabb665c4746b772a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= Date: Fri, 17 Jul 2020 21:26:30 +0200 Subject: [PATCH] [Update] Contributors --- apps/settings/main_controller.cpp | 2 +- apps/settings/main_controller.h | 2 +- .../sub_menu/contributors_controller.cpp | 8 ++++--- apps/shared.universal.i18n | 24 +++++++++++-------- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 5958745b1..b14ef1e12 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -18,7 +18,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[17] = {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::BetaTesters), SettingsMessageTree(I18n::Message::CyprienMejat), SettingsMessageTree(I18n::Message::TimeoArnouts), SettingsMessageTree(I18n::Message::LouisC), SettingsMessageTree(I18n::Message::LelahelHideux)}; +constexpr SettingsMessageTree s_contributorsChildren[19] = {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::HilaireLeRoux)}; #ifdef USERNAME 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)}; #else diff --git a/apps/settings/main_controller.h b/apps/settings/main_controller.h index c7d2b758f..6de4ac3a3 100644 --- a/apps/settings/main_controller.h +++ b/apps/settings/main_controller.h @@ -22,7 +22,7 @@ extern const Shared::SettingsMessageTree s_symbolFunctionChildren[3]; extern const Shared::SettingsMessageTree s_modelMathOptionsChildren[6]; extern const Shared::SettingsMessageTree s_modelFontChildren[2]; extern const Shared::SettingsMessageTree s_accessibilityChildren[6]; -extern const Shared::SettingsMessageTree s_contributorsChildren[17]; +extern const Shared::SettingsMessageTree s_contributorsChildren[19]; #ifdef USERNAME extern const Shared::SettingsMessageTree s_modelAboutChildren[8]; #else diff --git a/apps/settings/sub_menu/contributors_controller.cpp b/apps/settings/sub_menu/contributors_controller.cpp index 26c196fc6..60b64d12d 100644 --- a/apps/settings/sub_menu/contributors_controller.cpp +++ b/apps/settings/sub_menu/contributors_controller.cpp @@ -28,7 +28,7 @@ int ContributorsController::reusableCellCount(int type) { return k_totalNumberOfCell; } -constexpr static int s_numberOfDevelopers = 11; +constexpr static int s_numberOfDevelopers = 12; constexpr static I18n::Message s_developersUsernames[s_numberOfDevelopers] = { I18n::Message::PQuentinGuidee, I18n::Message::PSandraSimmons, @@ -41,15 +41,17 @@ constexpr static I18n::Message s_developersUsernames[s_numberOfDevelopers] = { I18n::Message::PSzaboLevente, I18n::Message::PVenceslasDuet, I18n::Message::PCharlotteThomas, + I18n::Message::PAntoninLoubiere, }; -constexpr static int s_numberOfBetaTesters = 4; +constexpr static int s_numberOfBetaTesters = 5; constexpr static I18n::Message s_betaTestersUsernames[s_numberOfBetaTesters] = { I18n::Message::PCyprienMejat, I18n::Message::PTimeoArnouts, - I18n::Message::PLouisC, + I18n::Message::PJulieC, I18n::Message::PLelahelHideux, + I18n::Message::PHilaireLeRoux, }; void ContributorsController::willDisplayCellForIndex(HighlightCell * cell, int index) { diff --git a/apps/shared.universal.i18n b/apps/shared.universal.i18n index cc92fa246..6d8c0393a 100644 --- a/apps/shared.universal.i18n +++ b/apps/shared.universal.i18n @@ -297,36 +297,40 @@ ElementTsMass = "294" ElementOgMass = "294" ElementUueMass = "295" ElementUbnMass = "297" -QuentinGuidee = "Quentin Guidée " +QuentinGuidee = "Quentin Guidée" PQuentinGuidee = "@quentinguidee" -SandraSimmons = "Sandra Simmons " +SandraSimmons = "Sandra Simmons" PSandraSimmons = "@MixedMatched" -JoachimLeFournis = "Joachim Le Fournis " +JoachimLeFournis = "Joachim Le Fournis" PJoachimLeFournis = "@RedGl0w" -JeanBaptisteBoric = "Jean-Baptiste Boric " +JeanBaptisteBoric = "Jean-Baptiste Boric" PJeanBaptisteBoric = "@boricj" -MaximeFriess = "Maxime Friess " +MaximeFriess = "Maxime Friess" PMaximeFriess = "@M4x1m3" -David = "David " +David = "David" PDavid = "@0b101" -DamienNicolet = "Damien Nicolet " +DamienNicolet = "Damien Nicolet" PDamienNicolet = "@zardam" EvannDreumont = "Evann Dreumont" PEvannDreumont = "@LeGmask" SzaboLevente = "Szabó Levente" PSzaboLevente = "@Gegenter" +CharlotteThomas = "Charlotte Thomas" PCharlotteThomas = "@coco33920" -CharlotteThomas = "Charlotte Thomas " +AntoninLoubiere = "Antonin L." +PAntoninLoubiere = "@AntoninLoubiere" VenceslasDuet = "Venceslas Duet" PVenceslasDuet = "@Citorva" CyprienMejat = "Cyprien Méjat" PCyprienMejat = "@A2drien" TimeoArnouts = "Timéo Arnouts" PTimeoArnouts = "@Dogm" -LouisC = "Louis C" -PLouisC = "@windows9x95" +JulieC = "Julie C" +PJulieC = "@windows9x95" LelahelHideux = "Lélahel Hideux" PLelahelHideux = "@Lelahelry" +HilaireLeRoux = "Hilaire Le Roux" +PHilaireLeRoux = "@0Babass2" SpeedOfLight = "2.99792458·10^8_m_s^-1" YearLight = "9.461·10^15_m" Boltzmann = "1.380649·10^-23_J_K^-1"