diff --git a/apps/i18n.cpp b/apps/i18n.cpp index 53922d5d0..0152bcb99 100644 --- a/apps/i18n.cpp +++ b/apps/i18n.cpp @@ -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}; diff --git a/apps/i18n.h b/apps/i18n.h index 5a99dfe57..b21c1cf3f 100644 --- a/apps/i18n.h +++ b/apps/i18n.h @@ -222,6 +222,9 @@ namespace I18n { Radian, Auto, Scientific, + Deg, + Rad, + Sci, /* UNIVERSAL MESSAGES */ Default = 0x8000, diff --git a/apps/title_bar_view.cpp b/apps/title_bar_view.cpp index 802aa4a74..e67e89c9a 100644 --- a/apps/title_bar_view.cpp +++ b/apps/title_bar_view.cpp @@ -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();