UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] Translate deg->rad in title bar view

Browse Source 
Change-Id: Ie88ec39177960b98d9fd1cba814ec24a40fe366f
This commit is contained in:
Émilie Feral
2017-03-16 18:17:27 +01:00
parent 296c412356
commit fd299df4c8
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/i18n.cpp
View File

@@ -17,7 +17,7 @@ constexpr static char deviationFrenchDefinition[] = {Ion::Charset::SmallSigma, '
constexpr static char deviationEnglishDefinition[] = {Ion::Charset::SmallSigma, ' ', ':', ' ', 'S', 't', 'a', 'n', 'd', 'a', 'r', 'd', ' ','d','e', 'v', 'i', 'a', 't','i','o','n', 0};
constexpr static char deviationSpanishDefinition[] = {Ion::Charset::SmallSigma, ' ', ':', ' ', 'D', 'e','s','v','i','a','c','i','o','n',' ','t','i','p','i','c','a',0};
const char * messages[197][3] {
const char * messages[200][3] {
{"Attention", "Warning", "Cuidado"},
{"Valider", "Confirm", "Confirmar"},
{"Suivant", "Next", "Siguiente"},
@@ -250,6 +250,9 @@ const char * messages[197][3] {
{"Radians ", "Radians ", "Radianes "},
{"Auto ", "Auto ", "Auto "},
{"Scientifique ", "Scientific ", "Cientifico "},
{"deg", "deg", "gra"},
{"rad", "rad", "rad"},
{"sci/", "sci/", "sci/"},
};
const char sxy[4] = {Ion::Charset::CapitalSigma, 'x', 'y', 0};

3
apps/i18n.h
View File

@@ -222,6 +222,9 @@ namespace I18n {
Radian,
Auto,
Scientific,
Deg,
Rad,
Sci,
/* UNIVERSAL MESSAGES */
Default = 0x8000,

11
apps/title_bar_view.cpp
View File

@@ -51,15 +51,16 @@ void TitleBarView::refreshPreferences() {
char buffer[13];
int numberOfChar = 0;
if (Preferences::sharedPreferences()->displayMode() == Expression::FloatDisplayMode::Scientific) {
strlcpy(buffer, "sci/", 5);
numberOfChar += 4;
strlcpy(buffer, I18n::translate(I18n::Message::Sci), strlen(I18n::translate(I18n::Message::Sci))+1);
numberOfChar += strlen(I18n::translate(I18n::Message::Sci))+1;
}
if (Preferences::sharedPreferences()->angleUnit() == Expression::AngleUnit::Radian) {
strlcpy(buffer+numberOfChar, "rad", 4);
strlcpy(buffer+numberOfChar, I18n::translate(I18n::Message::Rad), strlen(I18n::translate(I18n::Message::Rad))+1);
numberOfChar += strlen(I18n::translate(I18n::Message::Rad))+1;
} else {
strlcpy(buffer+numberOfChar, "deg", 4);
strlcpy(buffer+numberOfChar, I18n::translate(I18n::Message::Deg), strlen(I18n::translate(I18n::Message::Sci))+1);
numberOfChar += strlen(I18n::translate(I18n::Message::Deg))+1;
}
numberOfChar += 3;
buffer[numberOfChar] = 0;
m_preferenceView.setText(buffer);
layoutSubviews();