UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[1.10.1] New contributor

Browse Source
This commit is contained in:
Quentin
2019-10-29 22:07:31 +01:00
parent cf39a060d3
commit eb52d55655
11 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/settings/base.de.i18n
View File

@@ -35,3 +35,4 @@ Contributors = "Beiträger"
QuentinGuidee = "Quentin Guidee "
DannySimmons = "Danny Simmons "
JoachimLeFournis = "Joachim Le Fournis "
JeanBaptisteBoric = "Jean-Baptiste Boric "

1
apps/settings/base.en.i18n
View File

@@ -35,3 +35,4 @@ Contributors = "Contributors"
QuentinGuidee = "Quentin Guidee "
DannySimmons = "Danny Simmons "
JoachimLeFournis = "Joachim Le Fournis "
JeanBaptisteBoric = "Jean-Baptiste Boric "

1
apps/settings/base.es.i18n
View File

@@ -35,3 +35,4 @@ Contributors = "Contribuyentes"
QuentinGuidee = "Quentin Guidee "
DannySimmons = "Danny Simmons "
JoachimLeFournis = "Joachim Le Fournis "
JeanBaptisteBoric = "Jean-Baptiste Boric "

1
apps/settings/base.fr.i18n
View File

@@ -35,3 +35,4 @@ Contributors = "Contributeurs"
QuentinGuidee = "Quentin Guidee "
DannySimmons = "Danny Simmons "
JoachimLeFournis = "Joachim Le Fournis "
JeanBaptisteBoric = "Jean-Baptiste Boric "

1
apps/settings/base.pt.i18n
View File

@@ -35,3 +35,4 @@ Contributors = "Contribuidores"
QuentinGuidee = "Quentin Guidee "
DannySimmons = "Danny Simmons "
JoachimLeFournis = "Joachim Le Fournis "
JeanBaptisteBoric = "Jean-Baptiste Boric "

4
apps/settings/main_controller_prompt_beta.cpp
View File

@@ -10,7 +10,7 @@ constexpr SettingsMessageTree s_modelComplexFormatChildren[3] = {SettingsMessage
constexpr SettingsMessageTree s_modelExamChildren[1] = {SettingsMessageTree(I18n::Message::ActivateExamMode)};
constexpr SettingsMessageTree s_modelAboutChildren[4] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::CustomSoftwareVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId)};
constexpr SettingsMessageTree s_ledColorChildren[4] = {SettingsMessageTree(I18n::Message::ColorWhite), SettingsMessageTree(I18n::Message::ColorGreen), SettingsMessageTree(I18n::Message::ColorBlue), SettingsMessageTree(I18n::Message::ColorYellow)};
constexpr SettingsMessageTree s_contributorsChildren[3] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis)};
constexpr SettingsMessageTree s_contributorsChildren[4] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric)};
constexpr SettingsMessageTree s_modelMenu[] =
{SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren, 3),
@@ -23,7 +23,7 @@ constexpr SettingsMessageTree s_modelMenu[] =
SettingsMessageTree(I18n::Message::BetaPopUp),
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 4),
SettingsMessageTree(I18n::Message::LEDColor, s_ledColorChildren, 4),
SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 3)};
SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 4)};
constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu, 11);

4
apps/settings/main_controller_prompt_none.cpp
View File

@@ -11,7 +11,7 @@ constexpr SettingsMessageTree s_modelComplexFormatChildren[3] = {SettingsMessage
constexpr SettingsMessageTree s_modelExamChildren[1] = {SettingsMessageTree(I18n::Message::ActivateExamMode)};
constexpr SettingsMessageTree s_modelAboutChildren[4] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::CustomSoftwareVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId)};
constexpr SettingsMessageTree s_ledColorChildren[4] = {SettingsMessageTree(I18n::Message::ColorWhite), SettingsMessageTree(I18n::Message::ColorGreen), SettingsMessageTree(I18n::Message::ColorBlue), SettingsMessageTree(I18n::Message::ColorYellow)};
constexpr SettingsMessageTree s_contributorsChildren[3] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis)};
constexpr SettingsMessageTree s_contributorsChildren[4] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric)};
constexpr SettingsMessageTree s_modelMenu[] =
{SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren, 3),
@@ -23,7 +23,7 @@ constexpr SettingsMessageTree s_modelMenu[] =
SettingsMessageTree(I18n::Message::ExamMode, s_modelExamChildren, 1),
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 4),
SettingsMessageTree(I18n::Message::LEDColor, s_ledColorChildren, 4),
SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 3)};
SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 4)};
constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu, 10);

4
apps/settings/main_controller_prompt_update.cpp
View File

@@ -10,7 +10,7 @@ constexpr SettingsMessageTree s_modelComplexFormatChildren[3] = {SettingsMessage
constexpr SettingsMessageTree s_modelExamChildren[1] = {SettingsMessageTree(I18n::Message::ActivateExamMode)};
constexpr SettingsMessageTree s_modelAboutChildren[4] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::CustomSoftwareVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId)};
constexpr SettingsMessageTree s_ledColorChildren[4] = {SettingsMessageTree(I18n::Message::ColorWhite), SettingsMessageTree(I18n::Message::ColorGreen), SettingsMessageTree(I18n::Message::ColorBlue), SettingsMessageTree(I18n::Message::ColorYellow)};
constexpr SettingsMessageTree s_contributorsChildren[3] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis)};
constexpr SettingsMessageTree s_contributorsChildren[4] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric)};
constexpr SettingsMessageTree s_modelMenu[] =
{SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren, 3),
@@ -23,7 +23,7 @@ constexpr SettingsMessageTree s_modelMenu[] =
SettingsMessageTree(I18n::Message::UpdatePopUp),
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 4),
SettingsMessageTree(I18n::Message::LEDColor, s_ledColorChildren, 4),
SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 3)};
SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 4)};
constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu, 11);

2
apps/settings/sub_menu/contributors_controller.h
View File

@@ -14,7 +14,7 @@ public:
int reusableCellCount(int type) override;
void willDisplayCellForIndex(HighlightCell * cell, int index) override;
private:
constexpr static int k_totalNumberOfCell = 3;
constexpr static int k_totalNumberOfCell = 4;
MessageTableCellWithBuffer m_cells[k_totalNumberOfCell];
};

2
build/config.mak
View File

@@ -4,7 +4,7 @@ PLATFORM ?= device
DEBUG ?= 0
EPSILON_VERSION ?= 12.0.0
EPSILON_CUSTOM_VERSION ?= 1.10.0-0
EPSILON_CUSTOM_VERSION ?= 1.10.1-0
# Valid values are "none", "update", "beta"
EPSILON_APPS ?= calculation rpn graph code statistics probability solver sequence regression settings
EPSILON_I18N ?= en fr es de pt

2
ion/src/shared/platform_info.cpp
View File

@@ -57,7 +57,7 @@ private:
constexpr static uint32_t Magic = 0xDEC00DF0;
uint32_t m_header;
const char m_version[8];
const char m_customVersion[8];
const char m_customVersion[16];
const char m_patchLevel[8];
void * m_storageAddress;
size_t m_storageSize;