diff --git a/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp b/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp index baaceea75..96554f759 100644 --- a/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp +++ b/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp @@ -101,7 +101,7 @@ namespace app return std::make_unique(app, std::move(presenter)); }); windowsFactory.attach( - utils::localize.get("app_alarm_clock_options_title"), + utils::translate("app_alarm_clock_options_title"), [](Application *app, const std::string &name) { return std::make_unique(app, name); }); windowsFactory.attach( diff --git a/module-apps/application-alarm-clock/data/AlarmsData.cpp b/module-apps/application-alarm-clock/data/AlarmsData.cpp index a08744bc2..0c372b24f 100644 --- a/module-apps/application-alarm-clock/data/AlarmsData.cpp +++ b/module-apps/application-alarm-clock/data/AlarmsData.cpp @@ -1,7 +1,8 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "AlarmsData.hpp" +#include static const std::map weekDaysAbbreviation = {{WeekDayIso::Monday, "common_mon"}, {WeekDayIso::Tuesday, "common_tue"}, @@ -22,7 +23,7 @@ std::string CustomRepeatValueParser::getWeekDaysText() const std::string weekDaysText; for (auto const &[key, val] : weekDaysAbbreviation) { if (weekDayData->getData(static_cast(key))) { - weekDaysText += utils::localize.get(val) + ", "; + weekDaysText += utils::translate(val) + ", "; } } if (!weekDaysText.empty()) { diff --git a/module-apps/application-alarm-clock/models/AlarmsModel.cpp b/module-apps/application-alarm-clock/models/AlarmsModel.cpp index 60c18f232..31c73c65e 100644 --- a/module-apps/application-alarm-clock/models/AlarmsModel.cpp +++ b/module-apps/application-alarm-clock/models/AlarmsModel.cpp @@ -57,7 +57,7 @@ namespace app::alarmClock }; item->inputCallback = [this, record = record.get()](gui::Item &, const gui::InputEvent &event) { if (event.isShortPress() && event.is(gui::KeyCode::KEY_LF)) { - application->switchWindow(utils::localize.get("app_alarm_clock_options_title"), + application->switchWindow(utils::translate("app_alarm_clock_options_title"), std::make_unique( alarmsListOptions(application, *record, *alarmsRepository))); } diff --git a/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp b/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp index 099ae176f..aa1191b9b 100644 --- a/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp +++ b/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp @@ -38,7 +38,7 @@ namespace app::alarmClock void CustomRepeatModel::createData(const WeekDaysRepeatData &data) { for (auto const &[key, dayName] : gui::CustomCheckBoxWithLabel::weekDays) { - internalData.push_back(new gui::CustomCheckBoxWithLabel(application, utils::localize.get(dayName), data)); + internalData.push_back(new gui::CustomCheckBoxWithLabel(application, utils::translate(dayName), data)); } for (auto &item : internalData) { diff --git a/module-apps/application-alarm-clock/widgets/AlarmItem.cpp b/module-apps/application-alarm-clock/widgets/AlarmItem.cpp index 5f3755bbe..8a2ecb72f 100644 --- a/module-apps/application-alarm-clock/widgets/AlarmItem.cpp +++ b/module-apps/application-alarm-clock/widgets/AlarmItem.cpp @@ -58,10 +58,10 @@ namespace gui onOffImage->switchState(ButtonState::Off); } if (alarm->repeat == static_cast(AlarmRepeat::everyday)) { - periodLabel->setText(utils::localize.get("app_alarm_clock_repeat_everyday")); + periodLabel->setText(utils::translate("app_alarm_clock_repeat_everyday")); } else if (alarm->repeat == static_cast(AlarmRepeat::weekDays)) { - periodLabel->setText(utils::localize.get("app_alarm_clock_repeat_week_days")); + periodLabel->setText(utils::translate("app_alarm_clock_repeat_week_days")); } else if (alarm->repeat != static_cast(AlarmRepeat::never)) { periodLabel->setText(CustomRepeatValueParser(alarm->repeat).getWeekDaysText()); diff --git a/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.cpp b/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.cpp index b6891945a..a9ba56f99 100644 --- a/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.cpp +++ b/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "AlarmOptionsItem.hpp" @@ -83,13 +83,13 @@ namespace gui optionsNames.clear(); switch (itemName) { case AlarmOptionItemName::Sound: - descriptionLabel->setText(utils::localize.get("app_alarm_clock_sound")); + descriptionLabel->setText(utils::translate("app_alarm_clock_sound")); break; case AlarmOptionItemName::Snooze: - descriptionLabel->setText(utils::localize.get("app_alarm_clock_snooze")); + descriptionLabel->setText(utils::translate("app_alarm_clock_snooze")); break; case AlarmOptionItemName::Repeat: - descriptionLabel->setText(utils::localize.get("app_alarm_clock_repeat")); + descriptionLabel->setText(utils::translate("app_alarm_clock_repeat")); break; } if (itemName == AlarmOptionItemName::Sound) { @@ -98,16 +98,16 @@ namespace gui } } else if (itemName == AlarmOptionItemName::Snooze) { - optionsNames.push_back(utils::localize.get("app_alarm_clock_snooze_5_min")); - optionsNames.push_back(utils::localize.get("app_alarm_clock_snooze_10_min")); - optionsNames.push_back(utils::localize.get("app_alarm_clock_snooze_15_min")); - optionsNames.push_back(utils::localize.get("app_alarm_clock_snooze_30_min")); + optionsNames.push_back(utils::translate("app_alarm_clock_snooze_5_min")); + optionsNames.push_back(utils::translate("app_alarm_clock_snooze_10_min")); + optionsNames.push_back(utils::translate("app_alarm_clock_snooze_15_min")); + optionsNames.push_back(utils::translate("app_alarm_clock_snooze_30_min")); } else if (itemName == AlarmOptionItemName::Repeat) { - optionsNames.push_back(utils::localize.get("app_alarm_clock_repeat_never")); - optionsNames.push_back(utils::localize.get("app_alarm_clock_repeat_everyday")); - optionsNames.push_back(utils::localize.get("app_alarm_clock_repeat_week_days")); - optionsNames.push_back(utils::localize.get("app_alarm_clock_repeat_custom")); + optionsNames.push_back(utils::translate("app_alarm_clock_repeat_never")); + optionsNames.push_back(utils::translate("app_alarm_clock_repeat_everyday")); + optionsNames.push_back(utils::translate("app_alarm_clock_repeat_week_days")); + optionsNames.push_back(utils::translate("app_alarm_clock_repeat_custom")); } } @@ -121,10 +121,10 @@ namespace gui rightArrow->setVisible(true); hBox->resizeItems(); if (itemName == AlarmOptionItemName::Sound) { - bottomBarTemporaryMode(utils::localize.get("app_alarm_clock_play_pause")); + bottomBarTemporaryMode(utils::translate("app_alarm_clock_play_pause")); } if (itemName == AlarmOptionItemName::Repeat && actualVectorIndex == optionsNames.size() - 1) { - bottomBarTemporaryMode(utils::localize.get("app_alarm_clock_edit")); + bottomBarTemporaryMode(utils::translate("app_alarm_clock_edit")); } } else { @@ -151,7 +151,7 @@ namespace gui if (actualVectorIndex >= optionsNames.size()) { actualVectorIndex = optionsNames.size() - 1; if (itemName == AlarmOptionItemName::Repeat) { - bottomBarTemporaryMode(utils::localize.get("app_alarm_clock_edit")); + bottomBarTemporaryMode(utils::translate("app_alarm_clock_edit")); } } else if (itemName == AlarmOptionItemName::Repeat) { @@ -167,7 +167,7 @@ namespace gui actualVectorIndex = 0; } if (actualVectorIndex == optionsNames.size() - 1 && itemName == AlarmOptionItemName::Repeat) { - bottomBarTemporaryMode(utils::localize.get("app_alarm_clock_edit")); + bottomBarTemporaryMode(utils::translate("app_alarm_clock_edit")); } else if (itemName == AlarmOptionItemName::Repeat) { bottomBarRestoreFromTemporaryMode(); @@ -213,8 +213,7 @@ namespace gui alarm->repeat = actualVectorIndex; } else if (alarm->repeat == optionsNames.size() - 1 || - optionsNames[optionsNames.size() - 1] == - utils::localize.get("app_alarm_clock_repeat_custom")) { + optionsNames[optionsNames.size() - 1] == utils::translate("app_alarm_clock_repeat_custom")) { alarm->repeat = static_cast(AlarmRepeat::never); } break; @@ -252,7 +251,7 @@ namespace gui if (alarm->repeat < optionsNames.size() - 1) { actualVectorIndex = alarm->repeat; if (alarm->repeat == static_cast(AlarmRepeat::never)) { - optionsNames[optionsNames.size() - 1] = utils::localize.get("app_alarm_clock_repeat_custom"); + optionsNames[optionsNames.size() - 1] = utils::translate("app_alarm_clock_repeat_custom"); } bottomBarRestoreFromTemporaryMode(); } @@ -262,19 +261,19 @@ namespace gui actualVectorIndex = static_cast(AlarmRepeat::everyday); alarm->repeat = actualVectorIndex; bottomBarRestoreFromTemporaryMode(); - optionsNames[optionsNames.size() - 1] = utils::localize.get("app_alarm_clock_repeat_custom"); + optionsNames[optionsNames.size() - 1] = utils::translate("app_alarm_clock_repeat_custom"); } else if (parser.isCustomValueWeekDays()) { actualVectorIndex = static_cast(AlarmRepeat::weekDays); alarm->repeat = actualVectorIndex; bottomBarRestoreFromTemporaryMode(); - optionsNames[optionsNames.size() - 1] = utils::localize.get("app_alarm_clock_repeat_custom"); + optionsNames[optionsNames.size() - 1] = utils::translate("app_alarm_clock_repeat_custom"); } else { actualVectorIndex = optionsNames.size() - 1; optionsNames[optionsNames.size() - 1] = parser.getWeekDaysText(); if (this->focus) { - bottomBarTemporaryMode(utils::localize.get("app_alarm_clock_edit")); + bottomBarTemporaryMode(utils::translate("app_alarm_clock_edit")); } } } diff --git a/module-apps/application-alarm-clock/widgets/AlarmTimeItem.cpp b/module-apps/application-alarm-clock/widgets/AlarmTimeItem.cpp index 26c6593ed..050891940 100644 --- a/module-apps/application-alarm-clock/widgets/AlarmTimeItem.cpp +++ b/module-apps/application-alarm-clock/widgets/AlarmTimeItem.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "AlarmTimeItem.hpp" @@ -155,17 +155,17 @@ namespace gui mode12hInput->setFont(style::window::font::largelight); mode12hInput->setPenFocusWidth(style::window::default_border_focus_w); mode12hInput->setPenWidth(style::window::default_border_rect_no_focus); - mode12hInput->setText(utils::localize.get(utils::time::Locale::getAM())); + mode12hInput->setText(utils::translate(utils::time::Locale::getAM())); mode12hInput->inputCallback = [&](Item &item, const InputEvent &event) { if (event.state != gui::InputEvent::State::keyReleasedShort) { return false; } if (event.keyCode == gui::KeyCode::KEY_LF) { - if (mode12hInput->getText() == utils::localize.get(utils::time::Locale::getAM())) { - mode12hInput->setText(utils::localize.get(utils::time::Locale::getPM())); + if (mode12hInput->getText() == utils::translate(utils::time::Locale::getAM())) { + mode12hInput->setText(utils::translate(utils::time::Locale::getPM())); } else { - mode12hInput->setText(utils::localize.get(utils::time::Locale::getAM())); + mode12hInput->setText(utils::translate(utils::time::Locale::getAM())); } return true; } @@ -173,7 +173,7 @@ namespace gui }; mode12hInput->focusChangedCallback = [&](Item &item) { if (item.focus) { - bottomBarTemporaryMode(utils::localize.get("common_switch")); + bottomBarTemporaryMode(utils::translate("common_switch")); } else { bottomBarRestoreFromTemporaryMode(); @@ -190,10 +190,10 @@ namespace gui hourInput->setText(TimePointToHourString12H(alarm->time)); minuteInput->setText(TimePointToMinutesString(alarm->time)); if (date::is_am(TimePointToHourMinSec(alarm->time).hours())) { - mode12hInput->setText(utils::localize.get(utils::time::Locale::getAM())); + mode12hInput->setText(utils::translate(utils::time::Locale::getAM())); } else { - mode12hInput->setText(utils::localize.get(utils::time::Locale::getPM())); + mode12hInput->setText(utils::translate(utils::time::Locale::getPM())); } }; } @@ -210,7 +210,7 @@ namespace gui bool AlarmTimeItem::isPm(const std::string &text) const { - return !(text == utils::localize.get(utils::time::Locale::getAM())); + return !(text == utils::translate(utils::time::Locale::getAM())); } void AlarmTimeItem::validateHour() diff --git a/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.cpp b/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.cpp index 8d897c788..8594ee730 100644 --- a/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.cpp +++ b/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "CustomCheckBoxWithLabel.hpp" @@ -90,7 +90,7 @@ namespace gui void CustomCheckBoxWithLabel::setCheckBoxes() { for (auto const &[key, dayName] : weekDays) { - if (descriptionLabel->getText() == utils::localize.get(dayName)) { + if (descriptionLabel->getText() == utils::translate(dayName)) { checkBox->setImageVisible(checkBoxData.getData(static_cast(key))); } } diff --git a/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp b/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp index a7f0ad5e4..64be523dc 100644 --- a/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp +++ b/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp @@ -33,11 +33,11 @@ namespace app::alarmClock AppWindow::buildInterface(); bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(style::strings::common::Switch)); - bottomBar->setText(gui::BottomBar::Side::LEFT, utils::localize.get(style::strings::common::options)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::Switch)); + bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate(style::strings::common::options)); - setTitle(utils::localize.get("app_alarm_clock_title_main")); + setTitle(utils::translate("app_alarm_clock_title_main")); leftArrowImage = new gui::Image( this, style::alarmClock::window::arrow_x, style::alarmClock::window::arrow_y, 0, 0, "arrow_left"); plusSignImage = @@ -62,7 +62,7 @@ namespace app::alarmClock style::window_width, style::window_height - ::style::header::height - ::style::footer::height, "phonebook_empty_grey_circle_W_G", - utils::localize.get("app_alarm_clock_no_alarms_information")); + utils::translate("app_alarm_clock_no_alarms_information")); emptyListIcon->focusChangedCallback = [this](gui::Item &) { onEmptyList(); return true; diff --git a/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp b/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp index 0f85673ba..94db242f8 100644 --- a/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp +++ b/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp @@ -16,7 +16,7 @@ namespace app::alarmClock std::function onClickCallback, std::list &options) { - options.emplace_back(utils::localize.get(translationId), onClickCallback); + options.emplace_back(utils::translate(translationId), onClickCallback); } void removeAlarm(const AlarmsRecord &record, @@ -24,9 +24,9 @@ namespace app::alarmClock AbstractAlarmsRepository &alarmsRepository) { auto metaData = std::make_unique( - gui::DialogMetadata{utils::localize.get("app_alarm_clock_title_main"), + gui::DialogMetadata{utils::translate("app_alarm_clock_title_main"), "phonebook_contact_delete_trashcan", - utils::localize.get("app_alarm_clock_delete_confirmation"), + utils::translate("app_alarm_clock_delete_confirmation"), "", [record, application, &alarmsRepository] { alarmsRepository.remove(record, [application](bool) { diff --git a/module-apps/application-alarm-clock/windows/CustomRepeatWindow.cpp b/module-apps/application-alarm-clock/windows/CustomRepeatWindow.cpp index 11257e105..ea706999b 100644 --- a/module-apps/application-alarm-clock/windows/CustomRepeatWindow.cpp +++ b/module-apps/application-alarm-clock/windows/CustomRepeatWindow.cpp @@ -20,10 +20,10 @@ namespace app::alarmClock bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(style::strings::common::save)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::save)); - setTitle(utils::localize.get("app_calendar_custom_repeat_title")); + setTitle(utils::translate("app_calendar_custom_repeat_title")); list = new gui::ListView(this, style::alarmClock::window::listView_x, style::alarmClock::window::listView_y, diff --git a/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.cpp b/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.cpp index 38fd1d52b..31e3a96d1 100644 --- a/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.cpp +++ b/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.cpp @@ -23,8 +23,8 @@ namespace app::alarmClock bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(style::strings::common::save)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::save)); list = new gui::ListView(this, style::alarmClock::window::listView_x, @@ -40,10 +40,10 @@ namespace app::alarmClock { switch (alarmAction) { case AlarmAction::Add: - setTitle(utils::localize.get("app_alarm_clock_new_alarm_title")); + setTitle(utils::translate("app_alarm_clock_new_alarm_title")); break; case AlarmAction::Edit: - setTitle(utils::localize.get("app_alarm_clock_edit_alarm_title")); + setTitle(utils::translate("app_alarm_clock_edit_alarm_title")); break; } diff --git a/module-apps/application-antenna/windows/AlgoParamsWindow.cpp b/module-apps/application-antenna/windows/AlgoParamsWindow.cpp index d23de0558..0f0d5880b 100644 --- a/module-apps/application-antenna/windows/AlgoParamsWindow.cpp +++ b/module-apps/application-antenna/windows/AlgoParamsWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "AlgoParamsWindow.hpp" @@ -36,10 +36,10 @@ namespace gui bottomBar->setActive(BottomBar::Side::LEFT, true); bottomBar->setActive(BottomBar::Side::CENTER, true); bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::open)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); - setTitle(utils::localize.get("app_desktop_tools_antenna")); + setTitle(utils::translate("app_desktop_tools_antenna")); lowBandBox = new gui::VBox(this, antenna::algo_window::leftColumnXPos, diff --git a/module-apps/application-antenna/windows/AntennaMainWindow.cpp b/module-apps/application-antenna/windows/AntennaMainWindow.cpp index e3dc230e1..665acd35a 100644 --- a/module-apps/application-antenna/windows/AntennaMainWindow.cpp +++ b/module-apps/application-antenna/windows/AntennaMainWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md /* @@ -45,10 +45,10 @@ namespace gui bottomBar->setActive(BottomBar::Side::CENTER, true); bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::open)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); - setTitle(utils::localize.get("app_desktop_tools_antenna")); + setTitle(utils::translate("app_desktop_tools_antenna")); for (auto title : titlesText) { titles.push_back(addLabel(title, [=](gui::Item &item) { return true; })); diff --git a/module-apps/application-antenna/windows/ScanModesWindow.cpp b/module-apps/application-antenna/windows/ScanModesWindow.cpp index f310038f6..92fc6e722 100644 --- a/module-apps/application-antenna/windows/ScanModesWindow.cpp +++ b/module-apps/application-antenna/windows/ScanModesWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "ScanModesWindow.hpp" @@ -34,10 +34,10 @@ namespace gui bottomBar->setActive(BottomBar::Side::LEFT, true); bottomBar->setActive(BottomBar::Side::CENTER, true); bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::open)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); - setTitle(utils::localize.get("app_desktop_tools_antenna")); + setTitle(utils::translate("app_desktop_tools_antenna")); modeButtonParams.insert(std::pair(scanModes::Auto, "AUTO")); modeButtonParams.insert(std::pair(scanModes::GSM_only, "GSM only")); diff --git a/module-apps/application-calculator/data/CalculatorInputProcessorText.cpp b/module-apps/application-calculator/data/CalculatorInputProcessorText.cpp index e20b6f4c7..c0b12588e 100644 --- a/module-apps/application-calculator/data/CalculatorInputProcessorText.cpp +++ b/module-apps/application-calculator/data/CalculatorInputProcessorText.cpp @@ -61,7 +61,7 @@ bool calc::InputProcessorText::handle(const gui::InputEvent &event) if (event.keyCode == gui::KeyCode::KEY_LF) { if (!isPreviousNumberDecimal()) { - writeEquation(lastCharIsSymbol, utils::localize.get("app_calculator_decimal_separator")); + writeEquation(lastCharIsSymbol, utils::translate("app_calculator_decimal_separator")); } return true; } @@ -138,7 +138,7 @@ bool calc::InputProcessorText::isPreviousNumberDecimal() const else { lastNumber = input.substr(*it, std::string::npos); } - return lastNumber.find(utils::localize.get("app_calculator_decimal_separator")) != std::string::npos; + return lastNumber.find(utils::translate("app_calculator_decimal_separator")) != std::string::npos; } return false; } @@ -149,7 +149,7 @@ bool calc::InputProcessorText::decimalLimitReached() const return false; const auto &txt = std::string{inputField->getText()}; - const auto separator_pos = txt.find_last_of(utils::localize.get("app_calculator_decimal_separator")); + const auto separator_pos = txt.find_last_of(utils::translate("app_calculator_decimal_separator")); if ((txt.size() - separator_pos) > DecimalDigitsLimit) return true; diff --git a/module-apps/application-calculator/data/CalculatorUtility.cpp b/module-apps/application-calculator/data/CalculatorUtility.cpp index 17cc7b11b..df33ec735 100644 --- a/module-apps/application-calculator/data/CalculatorUtility.cpp +++ b/module-apps/application-calculator/data/CalculatorUtility.cpp @@ -25,14 +25,14 @@ namespace calc if (output.length() > CalculatorConstants::maxStringLength) { output = getValueThatFitsOnScreen(result); } - if (utils::localize.get("app_calculator_decimal_separator") == symbols::strings::comma) { + if (utils::translate("app_calculator_decimal_separator") == symbols::strings::comma) { output.replace(output.find(symbols::strings::full_stop), std::size(std::string_view(symbols::strings::full_stop)), symbols::strings::comma); } return Result{source, output, false}; } - return Result{source, utils::localize.get("app_calculator_error"), true}; + return Result{source, utils::translate("app_calculator_error"), true}; } std::string Calculator::prepareEquationForParser(std::string input) diff --git a/module-apps/application-calculator/tests/CalculatorInput_tests.cpp b/module-apps/application-calculator/tests/CalculatorInput_tests.cpp index 1863e5b7f..d0409c044 100644 --- a/module-apps/application-calculator/tests/CalculatorInput_tests.cpp +++ b/module-apps/application-calculator/tests/CalculatorInput_tests.cpp @@ -19,7 +19,7 @@ SCENARIO("Input Processor tests") GIVEN("An empty input") { - utils::localize.setDisplayLanguage("English"); + utils::setDisplayLanguage("English"); auto inputField = gui::Text{}; auto processor = calc::InputProcessorText{gsl::make_strict_not_null(&inputField)}; diff --git a/module-apps/application-calculator/tests/CalculatorUtility_tests.cpp b/module-apps/application-calculator/tests/CalculatorUtility_tests.cpp index 95e274bb0..3701b073e 100644 --- a/module-apps/application-calculator/tests/CalculatorUtility_tests.cpp +++ b/module-apps/application-calculator/tests/CalculatorUtility_tests.cpp @@ -9,7 +9,7 @@ TEST_CASE("Calculator utilities") { auto calculator = calc::Calculator(); - utils::localize.setDisplayLanguage("English"); + utils::setDisplayLanguage("English"); SECTION("Empty input") { @@ -87,7 +87,7 @@ TEST_CASE("Calculator utilities") SECTION("Fraction with comma") { - utils::localize.setDisplayLanguage("Polski"); + utils::setDisplayLanguage("Polski"); auto result = calculator.calculate("15,5+12,056"); REQUIRE(result.value == "27,556"); REQUIRE(result.equation == "15.5+12.056"); @@ -97,7 +97,7 @@ TEST_CASE("Calculator utilities") SECTION("Division by 0") { auto result = calculator.calculate("15+5÷0"); - REQUIRE(result.value == utils::localize.get("app_calculator_error")); + REQUIRE(result.value == utils::translate("app_calculator_error")); REQUIRE(result.equation == "15+5/0"); REQUIRE(result.isError); } @@ -105,7 +105,7 @@ TEST_CASE("Calculator utilities") SECTION("Division 0 by 0") { auto result = calculator.calculate("0÷0"); - REQUIRE(result.value == utils::localize.get("app_calculator_error")); + REQUIRE(result.value == utils::translate("app_calculator_error")); REQUIRE(result.equation == "0/0"); REQUIRE(result.isError); } @@ -113,7 +113,7 @@ TEST_CASE("Calculator utilities") SECTION("Result exceeds maximum number") { auto result = calculator.calculate("1.79769e+308×2"); - REQUIRE(result.value == utils::localize.get("app_calculator_error")); + REQUIRE(result.value == utils::translate("app_calculator_error")); REQUIRE(result.equation == "1.79769e+308*2"); REQUIRE(result.isError); } diff --git a/module-apps/application-calculator/windows/CalculatorMainWindow.cpp b/module-apps/application-calculator/windows/CalculatorMainWindow.cpp index 576620a4f..3666f3fa6 100644 --- a/module-apps/application-calculator/windows/CalculatorMainWindow.cpp +++ b/module-apps/application-calculator/windows/CalculatorMainWindow.cpp @@ -18,14 +18,14 @@ namespace gui { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_calculator_title_main")); + setTitle(utils::translate("app_calculator_title_main")); bottomBar->setActive(gui::BottomBar::Side::CENTER, true); bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); bottomBar->setActive(gui::BottomBar::Side::LEFT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(style::calculator::equals)); - bottomBar->setText(gui::BottomBar::Side::LEFT, utils::localize.get(style::calculator::decimal_separator)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::calculator::equals)); + bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate(style::calculator::decimal_separator)); bottomBar->setFont(BottomBar::Side::LEFT, style::window::font::largelight); mathOperationInput = new gui::Text(this, diff --git a/module-apps/application-calendar/ApplicationCalendar.cpp b/module-apps/application-calendar/ApplicationCalendar.cpp index 4f6fb12fa..34ab7c13e 100644 --- a/module-apps/application-calendar/ApplicationCalendar.cpp +++ b/module-apps/application-calendar/ApplicationCalendar.cpp @@ -167,7 +167,7 @@ namespace app auto metaData = std::make_unique(gui::DialogMetadata{ title, "phonebook_empty_grey_circle_W_G", - utils::localize.get("app_calendar_no_events_information"), + utils::translate("app_calendar_no_events_information"), "", [=]() -> bool { LOG_DEBUG("Switch to new event window"); diff --git a/module-apps/application-calendar/models/AllEventsModel.cpp b/module-apps/application-calendar/models/AllEventsModel.cpp index 9a5a99710..71083f27d 100644 --- a/module-apps/application-calendar/models/AllEventsModel.cpp +++ b/module-apps/application-calendar/models/AllEventsModel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "AllEventsModel.hpp" @@ -77,7 +77,7 @@ auto AllEventsModel::handleQueryResponse(db::QueryResult *queryResult) -> bool if (app->getEquivalentToEmptyWindow() == EquivalentWindow::AllEventsWindow) { auto filter = TimePointNow(); - app->switchToNoEventsWindow(utils::localize.get("app_calendar_title_main"), filter); + app->switchToNoEventsWindow(utils::translate("app_calendar_title_main"), filter); } } auto eventShift = app->getEventShift(); diff --git a/module-apps/application-calendar/models/CustomRepeatModel.cpp b/module-apps/application-calendar/models/CustomRepeatModel.cpp index 63a394909..03812e0cd 100644 --- a/module-apps/application-calendar/models/CustomRepeatModel.cpp +++ b/module-apps/application-calendar/models/CustomRepeatModel.cpp @@ -33,19 +33,19 @@ gui::ListItem *CustomRepeatModel::getItem(gui::Order order) void CustomRepeatModel::createData(const std::shared_ptr &data) { internalData.push_back( - new gui::CheckBoxWithLabelItem(application, utils::localize.get(style::strings::common::Monday), data)); + new gui::CheckBoxWithLabelItem(application, utils::translate(style::strings::common::Monday), data)); internalData.push_back( - new gui::CheckBoxWithLabelItem(application, utils::localize.get(style::strings::common::Tuesday), data)); + new gui::CheckBoxWithLabelItem(application, utils::translate(style::strings::common::Tuesday), data)); internalData.push_back( - new gui::CheckBoxWithLabelItem(application, utils::localize.get(style::strings::common::Wednesday), data)); + new gui::CheckBoxWithLabelItem(application, utils::translate(style::strings::common::Wednesday), data)); internalData.push_back( - new gui::CheckBoxWithLabelItem(application, utils::localize.get(style::strings::common::Thursday), data)); + new gui::CheckBoxWithLabelItem(application, utils::translate(style::strings::common::Thursday), data)); internalData.push_back( - new gui::CheckBoxWithLabelItem(application, utils::localize.get(style::strings::common::Friday), data)); + new gui::CheckBoxWithLabelItem(application, utils::translate(style::strings::common::Friday), data)); internalData.push_back( - new gui::CheckBoxWithLabelItem(application, utils::localize.get(style::strings::common::Saturday), data)); + new gui::CheckBoxWithLabelItem(application, utils::translate(style::strings::common::Saturday), data)); internalData.push_back( - new gui::CheckBoxWithLabelItem(application, utils::localize.get(style::strings::common::Sunday), data)); + new gui::CheckBoxWithLabelItem(application, utils::translate(style::strings::common::Sunday), data)); for (auto &item : internalData) { item->deleteByList = false; diff --git a/module-apps/application-calendar/models/NewEditEventModel.cpp b/module-apps/application-calendar/models/NewEditEventModel.cpp index a505ca7b7..a6d735f2e 100644 --- a/module-apps/application-calendar/models/NewEditEventModel.cpp +++ b/module-apps/application-calendar/models/NewEditEventModel.cpp @@ -47,13 +47,13 @@ void NewEditEventModel::createData(bool allDayEvent) assert(app != nullptr); eventNameInput = new gui::TextWithLabelItem( - utils::localize.get("app_calendar_new_edit_event_name"), + utils::translate("app_calendar_new_edit_event_name"), [app](const UTF8 &text) { app->getCurrentWindow()->bottomBarTemporaryMode(text); }, [app]() { app->getCurrentWindow()->bottomBarRestoreFromTemporaryMode(); }, [app]() { app->getCurrentWindow()->selectSpecialCharacter(); }); allDayEventCheckBox = new gui::NewEventCheckBoxWithLabel( - application, utils::localize.get("app_calendar_new_edit_event_allday"), [this](bool isChecked) { + application, utils::translate("app_calendar_new_edit_event_allday"), [this](bool isChecked) { isChecked ? createTimeItems() : eraseTimeItems(); const auto it = std::find(std::begin(internalData), std::end(internalData), allDayEventCheckBox); list->rebuildList(gui::listview::RebuildType::OnPageElement, std::distance(std::begin(internalData), it)); @@ -63,13 +63,13 @@ void NewEditEventModel::createData(bool allDayEvent) reminder = new gui::SeveralOptionsItem( application, - utils::localize.get("app_calendar_event_detail_reminder"), + utils::translate("app_calendar_event_detail_reminder"), [app](const UTF8 &text) { app->getCurrentWindow()->bottomBarTemporaryMode(text, false); }, [app]() { app->getCurrentWindow()->bottomBarRestoreFromTemporaryMode(); }); repeat = new gui::SeveralOptionsItem( application, - utils::localize.get("app_calendar_event_detail_repeat"), + utils::translate("app_calendar_event_detail_repeat"), [app](const UTF8 &text) { app->getCurrentWindow()->bottomBarTemporaryMode(text, false); }, [app]() { app->getCurrentWindow()->bottomBarRestoreFromTemporaryMode(); }); @@ -196,8 +196,8 @@ void NewEditEventModel::createTimeItems() } }; - create(startTime, utils::localize.get("app_calendar_new_edit_event_start"), gui::TimeWidget::Type::Start); - create(endTime, utils::localize.get("app_calendar_new_edit_event_end"), gui::TimeWidget::Type::End); + create(startTime, utils::translate("app_calendar_new_edit_event_start"), gui::TimeWidget::Type::Start); + create(endTime, utils::translate("app_calendar_new_edit_event_end"), gui::TimeWidget::Type::End); startTime->setConnectionToSecondItem(endTime); endTime->setConnectionToSecondItem(startTime); diff --git a/module-apps/application-calendar/widgets/CheckBoxWithLabelItem.cpp b/module-apps/application-calendar/widgets/CheckBoxWithLabelItem.cpp index 436075bef..5be7660a1 100644 --- a/module-apps/application-calendar/widgets/CheckBoxWithLabelItem.cpp +++ b/module-apps/application-calendar/widgets/CheckBoxWithLabelItem.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "CheckBoxWithLabelItem.hpp" @@ -90,25 +90,25 @@ namespace gui void CheckBoxWithLabelItem::setCheckBoxes() { - if (descriptionLabel->getText() == utils::localize.get(style::strings::common::Monday)) { + if (descriptionLabel->getText() == utils::translate(style::strings::common::Monday)) { checkBox->setImageVisible(checkBoxData->getData(date::Monday.iso_encoding() - 1)); } - else if (descriptionLabel->getText() == utils::localize.get(style::strings::common::Tuesday)) { + else if (descriptionLabel->getText() == utils::translate(style::strings::common::Tuesday)) { checkBox->setImageVisible(checkBoxData->getData(date::Tuesday.iso_encoding() - 1)); } - else if (descriptionLabel->getText() == utils::localize.get(style::strings::common::Wednesday)) { + else if (descriptionLabel->getText() == utils::translate(style::strings::common::Wednesday)) { checkBox->setImageVisible(checkBoxData->getData(date::Wednesday.iso_encoding() - 1)); } - else if (descriptionLabel->getText() == utils::localize.get(style::strings::common::Thursday)) { + else if (descriptionLabel->getText() == utils::translate(style::strings::common::Thursday)) { checkBox->setImageVisible(checkBoxData->getData(date::Thursday.iso_encoding() - 1)); } - else if (descriptionLabel->getText() == utils::localize.get(style::strings::common::Friday)) { + else if (descriptionLabel->getText() == utils::translate(style::strings::common::Friday)) { checkBox->setImageVisible(checkBoxData->getData(date::Friday.iso_encoding() - 1)); } - else if (descriptionLabel->getText() == utils::localize.get(style::strings::common::Saturday)) { + else if (descriptionLabel->getText() == utils::translate(style::strings::common::Saturday)) { checkBox->setImageVisible(checkBoxData->getData(date::Saturday.iso_encoding() - 1)); } - else if (descriptionLabel->getText() == utils::localize.get(style::strings::common::Sunday)) { + else if (descriptionLabel->getText() == utils::translate(style::strings::common::Sunday)) { checkBox->setImageVisible(checkBoxData->getData(date::Sunday.iso_encoding() - 1)); } } diff --git a/module-apps/application-calendar/widgets/EventDetailDescriptionItem.cpp b/module-apps/application-calendar/widgets/EventDetailDescriptionItem.cpp index 9658cca74..a33372c9e 100644 --- a/module-apps/application-calendar/widgets/EventDetailDescriptionItem.cpp +++ b/module-apps/application-calendar/widgets/EventDetailDescriptionItem.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "EventDetailDescriptionItem.hpp" @@ -74,7 +74,7 @@ namespace gui void EventDetailDescriptionItem::descriptionHandler() { - title->setText(utils::localize.get("app_calendar_event_detail")); + title->setText(utils::translate("app_calendar_event_detail")); onLoadCallback = [&](std::shared_ptr event) { description->setText(event->title); eventTime->setText( diff --git a/module-apps/application-calendar/widgets/RepeatAndReminderItem.cpp b/module-apps/application-calendar/widgets/RepeatAndReminderItem.cpp index 7f39696c9..5c6d24d19 100644 --- a/module-apps/application-calendar/widgets/RepeatAndReminderItem.cpp +++ b/module-apps/application-calendar/widgets/RepeatAndReminderItem.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "RepeatAndReminderItem.hpp" @@ -100,18 +100,18 @@ namespace gui void RepeatAndReminderItem::descriptionHandler() { - repeatTitle->setText(utils::localize.get("app_calendar_event_detail_repeat")); - reminderTitle->setText(utils::localize.get("app_calendar_event_detail_reminder")); + repeatTitle->setText(utils::translate("app_calendar_event_detail_repeat")); + reminderTitle->setText(utils::translate("app_calendar_event_detail_reminder")); onLoadCallback = [&](std::shared_ptr event) { if (event->repeat > app::ApplicationCalendar::repeatOptions.size()) { repeat->setText(CustomRepeatValueParser(event->repeat).getWeekDaysText()); } else { - repeat->setText(utils::localize.get( - app::ApplicationCalendar::repeatOptions.at(static_cast(event->repeat)))); + repeat->setText( + utils::translate(app::ApplicationCalendar::repeatOptions.at(static_cast(event->repeat)))); } - reminder->setText(utils::localize.get( - app::ApplicationCalendar::reminderOptions.at(static_cast(event->reminder)))); + reminder->setText( + utils::translate(app::ApplicationCalendar::reminderOptions.at(static_cast(event->reminder)))); }; } diff --git a/module-apps/application-calendar/widgets/SeveralOptionsItem.cpp b/module-apps/application-calendar/widgets/SeveralOptionsItem.cpp index bcf84eab8..42584a523 100644 --- a/module-apps/application-calendar/widgets/SeveralOptionsItem.cpp +++ b/module-apps/application-calendar/widgets/SeveralOptionsItem.cpp @@ -79,26 +79,26 @@ namespace gui void SeveralOptionsItem::prepareOptionsNames() { optionsNames.clear(); - if (descriptionLabel->getText() == utils::localize.get("app_calendar_event_detail_reminder")) { - optionsNames.push_back(utils::localize.get("app_calendar_reminder_never")); - optionsNames.push_back(utils::localize.get("app_calendar_reminder_event_time")); - optionsNames.push_back(utils::localize.get("app_calendar_reminder_5_min_before")); - optionsNames.push_back(utils::localize.get("app_calendar_reminder_15_min_before")); - optionsNames.push_back(utils::localize.get("app_calendar_reminder_30_min_before")); - optionsNames.push_back(utils::localize.get("app_calendar_reminder_1_hour_before")); - optionsNames.push_back(utils::localize.get("app_calendar_reminder_2_hour_before")); - optionsNames.push_back(utils::localize.get("app_calendar_reminder_1_day_before")); - optionsNames.push_back(utils::localize.get("app_calendar_reminder_2_days_before")); - optionsNames.push_back(utils::localize.get("app_calendar_reminder_1_week_before")); + if (descriptionLabel->getText() == utils::translate("app_calendar_event_detail_reminder")) { + optionsNames.push_back(utils::translate("app_calendar_reminder_never")); + optionsNames.push_back(utils::translate("app_calendar_reminder_event_time")); + optionsNames.push_back(utils::translate("app_calendar_reminder_5_min_before")); + optionsNames.push_back(utils::translate("app_calendar_reminder_15_min_before")); + optionsNames.push_back(utils::translate("app_calendar_reminder_30_min_before")); + optionsNames.push_back(utils::translate("app_calendar_reminder_1_hour_before")); + optionsNames.push_back(utils::translate("app_calendar_reminder_2_hour_before")); + optionsNames.push_back(utils::translate("app_calendar_reminder_1_day_before")); + optionsNames.push_back(utils::translate("app_calendar_reminder_2_days_before")); + optionsNames.push_back(utils::translate("app_calendar_reminder_1_week_before")); } - else if (descriptionLabel->getText() == utils::localize.get("app_calendar_event_detail_repeat")) { - optionsNames.push_back(utils::localize.get("app_calendar_repeat_never")); - optionsNames.push_back(utils::localize.get("app_calendar_repeat_daily")); - optionsNames.push_back(utils::localize.get("app_calendar_repeat_weekly")); - optionsNames.push_back(utils::localize.get("app_calendar_repeat_two_weeks")); - optionsNames.push_back(utils::localize.get("app_calendar_repeat_month")); - optionsNames.push_back(utils::localize.get("app_calendar_repeat_year")); - optionsNames.push_back(utils::localize.get("app_calendar_repeat_custom")); + else if (descriptionLabel->getText() == utils::translate("app_calendar_event_detail_repeat")) { + optionsNames.push_back(utils::translate("app_calendar_repeat_never")); + optionsNames.push_back(utils::translate("app_calendar_repeat_daily")); + optionsNames.push_back(utils::translate("app_calendar_repeat_weekly")); + optionsNames.push_back(utils::translate("app_calendar_repeat_two_weeks")); + optionsNames.push_back(utils::translate("app_calendar_repeat_month")); + optionsNames.push_back(utils::translate("app_calendar_repeat_year")); + optionsNames.push_back(utils::translate("app_calendar_repeat_custom")); } } @@ -107,8 +107,8 @@ namespace gui focusChangedCallback = [&](Item &item) { if (item.focus) { if (actualVectorIndex == optionsNames.size() - 1 && - descriptionLabel->getText() == utils::localize.get("app_calendar_event_detail_repeat")) { - bottomBarTemporaryMode(utils::localize.get("app_calendar_edit")); + descriptionLabel->getText() == utils::translate("app_calendar_event_detail_repeat")) { + bottomBarTemporaryMode(utils::translate("app_calendar_edit")); } optionLabel->setMargins(gui::Margins(0, 0, 0, 0)); } @@ -130,8 +130,8 @@ namespace gui actualVectorIndex--; if (actualVectorIndex >= optionsNames.size()) { actualVectorIndex = optionsNames.size() - 1; - if (descriptionLabel->getText() == utils::localize.get("app_calendar_event_detail_repeat")) { - bottomBarTemporaryMode(utils::localize.get("app_calendar_edit")); + if (descriptionLabel->getText() == utils::translate("app_calendar_event_detail_repeat")) { + bottomBarTemporaryMode(utils::translate("app_calendar_edit")); } } else { @@ -147,8 +147,8 @@ namespace gui } optionLabel->setText(optionsNames[actualVectorIndex]); if (actualVectorIndex == optionsNames.size() - 1 && - descriptionLabel->getText() == utils::localize.get("app_calendar_event_detail_repeat")) { - bottomBarTemporaryMode(utils::localize.get("app_calendar_edit")); + descriptionLabel->getText() == utils::translate("app_calendar_event_detail_repeat")) { + bottomBarTemporaryMode(utils::translate("app_calendar_edit")); } else { bottomBarRestoreFromTemporaryMode(); @@ -156,7 +156,7 @@ namespace gui return true; } if (event.keyCode == gui::KeyCode::KEY_LF && actualVectorIndex == optionsNames.size() - 1 && - descriptionLabel->getText() == utils::localize.get("app_calendar_event_detail_repeat")) { + descriptionLabel->getText() == utils::translate("app_calendar_event_detail_repeat")) { OptionParser parser; auto weekDayRepeatData = std::make_unique(); assert(weekDayRepeatData != nullptr); @@ -168,26 +168,26 @@ namespace gui }; onSaveCallback = [&](std::shared_ptr record) { - if (descriptionLabel->getText() == utils::localize.get("app_calendar_event_detail_repeat")) { + if (descriptionLabel->getText() == utils::translate("app_calendar_event_detail_repeat")) { if (record->repeat < optionsNames.size() - 1 && actualVectorIndex != optionsNames.size() - 1) { record->repeat = actualVectorIndex; } else if (record->repeat == optionsNames.size() - 1 || - optionsNames[optionsNames.size() - 1] == utils::localize.get("app_calendar_repeat_custom")) { + optionsNames[optionsNames.size() - 1] == utils::translate("app_calendar_repeat_custom")) { record->repeat = static_cast(AlarmRepeat::never); } } - else if (descriptionLabel->getText() == utils::localize.get("app_calendar_event_detail_reminder")) { + else if (descriptionLabel->getText() == utils::translate("app_calendar_event_detail_reminder")) { record->reminder = static_cast(reminderTimeOptions[actualVectorIndex]); } }; onLoadCallback = [&](std::shared_ptr event) { - if (descriptionLabel->getText() == utils::localize.get("app_calendar_event_detail_repeat")) { + if (descriptionLabel->getText() == utils::translate("app_calendar_event_detail_repeat")) { if (event->repeat < optionsNames.size() - 1) { actualVectorIndex = event->repeat; if (event->repeat == static_cast(Repeat::never)) { - optionsNames[optionsNames.size() - 1] = utils::localize.get("app_calendar_repeat_custom"); + optionsNames[optionsNames.size() - 1] = utils::translate("app_calendar_repeat_custom"); } bottomBarRestoreFromTemporaryMode(); } @@ -197,20 +197,20 @@ namespace gui actualVectorIndex = static_cast(Repeat::daily); event->repeat = actualVectorIndex; bottomBarRestoreFromTemporaryMode(); - optionsNames[optionsNames.size() - 1] = utils::localize.get("app_calendar_repeat_custom"); + optionsNames[optionsNames.size() - 1] = utils::translate("app_calendar_repeat_custom"); } else { actualVectorIndex = optionsNames.size() - 1; optionsNames[optionsNames.size() - 1] = parser.getWeekDaysText(); if (this->focus) { - bottomBarTemporaryMode(utils::localize.get("app_calendar_edit")); + bottomBarTemporaryMode(utils::translate("app_calendar_edit")); } } } repeatOptionValue = event->repeat; optionLabel->setText(optionsNames[actualVectorIndex]); } - else if (descriptionLabel->getText() == utils::localize.get("app_calendar_event_detail_reminder")) { + else if (descriptionLabel->getText() == utils::translate("app_calendar_event_detail_reminder")) { actualVectorIndex = std::find(reminderTimeOptions.begin(), reminderTimeOptions.end(), static_cast(event->reminder)) - diff --git a/module-apps/application-calendar/windows/AllEventsWindow.cpp b/module-apps/application-calendar/windows/AllEventsWindow.cpp index 8613706c6..44285dde1 100644 --- a/module-apps/application-calendar/windows/AllEventsWindow.cpp +++ b/module-apps/application-calendar/windows/AllEventsWindow.cpp @@ -35,11 +35,11 @@ namespace gui AppWindow::buildInterface(); bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(style::strings::common::open)); - bottomBar->setText(gui::BottomBar::Side::LEFT, utils::localize.get("app_calendar_bar_month")); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); + bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate("app_calendar_bar_month")); - setTitle(utils::localize.get("app_calendar_title_main")); + setTitle(utils::translate("app_calendar_title_main")); leftArrowImage = new gui::Image( this, style::window::calendar::arrow_x, style::window::calendar::arrow_y, 0, 0, "arrow_left"); newDayEventImage = diff --git a/module-apps/application-calendar/windows/CalendarEventsOptionsWindow.cpp b/module-apps/application-calendar/windows/CalendarEventsOptionsWindow.cpp index 2d4091315..a28fd667d 100644 --- a/module-apps/application-calendar/windows/CalendarEventsOptionsWindow.cpp +++ b/module-apps/application-calendar/windows/CalendarEventsOptionsWindow.cpp @@ -22,7 +22,7 @@ namespace gui auto CalendarEventsOptions::eventsOptionsList() -> std::list { std::list options; - options.emplace_back(gui::Option{utils::localize.get("app_calendar_options_edit"), [=](gui::Item &item) { + options.emplace_back(gui::Option{utils::translate("app_calendar_options_edit"), [=](gui::Item &item) { LOG_INFO("Switch to edit window"); auto rec = std::make_unique(*eventRecord); auto data = std::make_unique(std::move(rec)); @@ -31,7 +31,7 @@ namespace gui std::move(data)); return true; }}); - options.emplace_back(gui::Option{utils::localize.get("app_calendar_options_delete"), + options.emplace_back(gui::Option{utils::translate("app_calendar_options_delete"), [=](gui::Item &item) { return eventDelete(); }}); return options; } @@ -60,7 +60,7 @@ namespace gui auto metaData = std::make_unique(gui::DialogMetadata{ eventRecord->title, "phonebook_contact_delete_trashcan", - utils::localize.get("app_calendar_event_delete_confirmation"), + utils::translate("app_calendar_event_delete_confirmation"), "", [=]() -> bool { LOG_INFO("Delete calendar event %d", static_cast(eventRecord->ID)); diff --git a/module-apps/application-calendar/windows/CalendarMainWindow.cpp b/module-apps/application-calendar/windows/CalendarMainWindow.cpp index 56af1a666..8fff68ab6 100644 --- a/module-apps/application-calendar/windows/CalendarMainWindow.cpp +++ b/module-apps/application-calendar/windows/CalendarMainWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "CalendarMainWindow.hpp" @@ -151,7 +151,7 @@ namespace gui LOG_DEBUG("Start build interface for calendar main window"); - setTitle(utils::localize.get("app_calendar_title_main")); + setTitle(utils::translate("app_calendar_title_main")); monthModel = std::make_unique(actualDate); filterRequest(); @@ -161,9 +161,9 @@ namespace gui bottomBar->setActive(gui::BottomBar::Side::CENTER, true); bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); bottomBar->setActive(gui::BottomBar::Side::LEFT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(style::strings::common::open)); - bottomBar->setText(gui::BottomBar::Side::LEFT, utils::localize.get("app_calendar_bar_list")); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); + bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate("app_calendar_bar_list")); } void CalendarMainWindow::destroyInterface() @@ -228,7 +228,7 @@ namespace gui else { auto appCalendar = dynamic_cast(application); assert(appCalendar != nullptr); - appCalendar->switchToNoEventsWindow(utils::localize.get("app_calendar_title_main"), filter); + appCalendar->switchToNoEventsWindow(utils::translate("app_calendar_title_main"), filter); } return true; } diff --git a/module-apps/application-calendar/windows/CustomRepeatWindow.cpp b/module-apps/application-calendar/windows/CustomRepeatWindow.cpp index 1acdf042c..48fabc0d5 100644 --- a/module-apps/application-calendar/windows/CustomRepeatWindow.cpp +++ b/module-apps/application-calendar/windows/CustomRepeatWindow.cpp @@ -30,10 +30,10 @@ namespace gui bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(style::strings::common::save)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::save)); - setTitle(utils::localize.get("app_calendar_custom_repeat_title")); + setTitle(utils::translate("app_calendar_custom_repeat_title")); list = new gui::ListView(this, style::window::calendar::listView_x, style::window::calendar::listView_y, diff --git a/module-apps/application-calendar/windows/DayEventsWindow.cpp b/module-apps/application-calendar/windows/DayEventsWindow.cpp index a690d5a7d..96e7556ea 100644 --- a/module-apps/application-calendar/windows/DayEventsWindow.cpp +++ b/module-apps/application-calendar/windows/DayEventsWindow.cpp @@ -66,8 +66,8 @@ namespace gui AppWindow::buildInterface(); bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(style::strings::common::open)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); setTitle(dayMonthTitle); leftArrowImage = new gui::Image( diff --git a/module-apps/application-calendar/windows/EventDetailWindow.cpp b/module-apps/application-calendar/windows/EventDetailWindow.cpp index 85af8d674..f793c78b6 100644 --- a/module-apps/application-calendar/windows/EventDetailWindow.cpp +++ b/module-apps/application-calendar/windows/EventDetailWindow.cpp @@ -30,8 +30,8 @@ namespace gui bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); bottomBar->setActive(gui::BottomBar::Side::LEFT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::LEFT, utils::localize.get(style::strings::common::options)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate(style::strings::common::options)); bodyList = new gui::ListView(this, style::window::calendar::listView_x, diff --git a/module-apps/application-calendar/windows/EventReminderWindow.cpp b/module-apps/application-calendar/windows/EventReminderWindow.cpp index e31671fd2..85e6e50a7 100644 --- a/module-apps/application-calendar/windows/EventReminderWindow.cpp +++ b/module-apps/application-calendar/windows/EventReminderWindow.cpp @@ -57,7 +57,7 @@ namespace gui AppWindow::buildInterface(); bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(style::strings::common::ok)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::ok)); bottomBar->setBorderColor(ColorNoColor); const uint32_t w = this->getWidth() - style::window::default_left_margin - style::window::default_right_margin; diff --git a/module-apps/application-calendar/windows/NewEditEventWindow.cpp b/module-apps/application-calendar/windows/NewEditEventWindow.cpp index a5e06354c..4c0ecc616 100644 --- a/module-apps/application-calendar/windows/NewEditEventWindow.cpp +++ b/module-apps/application-calendar/windows/NewEditEventWindow.cpp @@ -27,8 +27,8 @@ namespace gui bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(style::strings::common::save)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::save)); list = new gui::ListView(this, style::window::calendar::listView_x, @@ -44,11 +44,11 @@ namespace gui { switch (eventAction) { case EventAction::Add: { - setTitle(utils::localize.get("app_calendar_new_event_title")); + setTitle(utils::translate("app_calendar_new_event_title")); break; } case EventAction::Edit: - setTitle(utils::localize.get("app_calendar_edit_event_title")); + setTitle(utils::translate("app_calendar_edit_event_title")); break; } diff --git a/module-apps/application-call/ApplicationCall.cpp b/module-apps/application-call/ApplicationCall.cpp index 14ab96cc7..c1305456a 100644 --- a/module-apps/application-call/ApplicationCall.cpp +++ b/module-apps/application-call/ApplicationCall.cpp @@ -60,7 +60,7 @@ namespace app return true; }; constexpr auto iconNoEmergency = "emergency_W_G"; - auto textNoEmergency = utils::localize.get("app_call_wrong_emergency"); + auto textNoEmergency = utils::translate("app_call_wrong_emergency"); utils::findAndReplaceAll(textNoEmergency, "$NUMBER", data->getDescription()); showNotification(buttonAction, iconNoEmergency, textNoEmergency); return actionHandled(); @@ -71,7 +71,7 @@ namespace app return true; }; constexpr auto iconNoSim = "info_big_circle_W_G"; - const auto textNoSim = utils::localize.get("app_call_no_sim"); + const auto textNoSim = utils::translate("app_call_no_sim"); showNotification(buttonAction, iconNoSim, textNoSim); return actionHandled(); }); @@ -81,7 +81,7 @@ namespace app return true; }; constexpr auto icon = "info_big_circle_W_G"; - const auto textOffline = utils::localize.get("app_call_offline"); + const auto textOffline = utils::translate("app_call_offline"); showNotification(buttonAction, icon, textOffline); return actionHandled(); }); diff --git a/module-apps/application-call/widgets/StateIcon.hpp b/module-apps/application-call/widgets/StateIcon.hpp index c4822149b..bfc989764 100644 --- a/module-apps/application-call/widgets/StateIcon.hpp +++ b/module-apps/application-call/widgets/StateIcon.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #pragma once @@ -8,6 +8,7 @@ #include #include #include +#include namespace gui { @@ -74,7 +75,7 @@ namespace gui { this->state = state; img->set(data.at(state).first); - label->setText(utils::localize.get(data.at(state).second)); + label->setText(utils::translate(data.at(state).second)); using namespace style::window; label->setFont(data.find(state) != data.begin() ? font::verysmallbold : font::verysmall); } diff --git a/module-apps/application-call/windows/CallWindow.cpp b/module-apps/application-call/windows/CallWindow.cpp index 0d9ea0e0a..322a96cf1 100644 --- a/module-apps/application-call/windows/CallWindow.cpp +++ b/module-apps/application-call/windows/CallWindow.cpp @@ -60,9 +60,9 @@ namespace gui bottomBar->setActive(BottomBar::Side::CENTER, true); bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::select)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(strings::message)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::select)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(strings::message)); // top circle image imageCircleTop = new gui::Image(this, imageCircleTop::x, imageCircleTop::y, 0, 0, imageCircleTop::name); @@ -85,7 +85,7 @@ namespace gui speakerIcon = new SpeakerIcon(this, speakerIcon::x, speakerIcon::y); speakerIcon->focusChangedCallback = [=](gui::Item &item) { LOG_DEBUG("speakerIcon get/lost focus"); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::Switch), false); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::Switch), false); return true; }; speakerIcon->activatedCallback = [=](gui::Item &item) { @@ -113,7 +113,7 @@ namespace gui microphoneIcon = new MicrophoneIcon(this, microphoneIcon::x, microphoneIcon::y); microphoneIcon->focusChangedCallback = [=](gui::Item &item) { LOG_DEBUG("microphoneIcon get/lost focus"); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::Switch), false); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::Switch), false); return true; }; microphoneIcon->activatedCallback = [=](gui::Item &item) { @@ -130,7 +130,7 @@ namespace gui sendSmsIcon = new gui::SendSmsIcon(this, sendMessageIcon::x, sendMessageIcon::y); sendSmsIcon->focusChangedCallback = [=](gui::Item &item) { LOG_DEBUG("Send message get/lost focus"); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(strings::message), false); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(strings::message), false); return true; }; sendSmsIcon->activatedCallback = [=](gui::Item &item) { @@ -162,9 +162,9 @@ namespace gui switch (state) { case State::INCOMING_CALL: { interface->startAudioRinging(); - bottomBar->setText(gui::BottomBar::Side::LEFT, utils::localize.get(strings::answer), true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(strings::reject), true); - durationLabel->setText(utils::localize.get(strings::iscalling)); + bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate(strings::answer), true); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(strings::reject), true); + durationLabel->setText(utils::translate(strings::iscalling)); durationLabel->setVisible(true); speakerIcon->setVisible(false); microphoneIcon->setVisible(false); @@ -186,7 +186,7 @@ namespace gui bottomBar->setActive(gui::BottomBar::Side::CENTER, false); bottomBar->setActive(gui::BottomBar::Side::RIGHT, false); durationLabel->setVisible(true); - durationLabel->setText(utils::localize.get(strings::callended)); + durationLabel->setText(utils::translate(strings::callended)); sendSmsIcon->setVisible(false); speakerIcon->setVisible(false); microphoneIcon->setVisible(false); @@ -202,7 +202,7 @@ namespace gui runCallTimer(); bottomBar->setActive(gui::BottomBar::Side::LEFT, false); bottomBar->setActive(gui::BottomBar::Side::CENTER, false); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(strings::endcall), true); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(strings::endcall), true); durationLabel->setVisible(true); sendSmsIcon->setVisible(false); speakerIcon->setVisible(true); @@ -216,8 +216,8 @@ namespace gui interface->startAudioRouting(); bottomBar->setActive(gui::BottomBar::Side::LEFT, false); bottomBar->setActive(gui::BottomBar::Side::CENTER, false); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(strings::endcall), true); - durationLabel->setText(utils::localize.get(strings::calling)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(strings::endcall), true); + durationLabel->setText(utils::translate(strings::calling)); durationLabel->setVisible(true); sendSmsIcon->setVisible(false); speakerIcon->setVisible(true); @@ -274,7 +274,7 @@ namespace gui numberLabel->setText(displayName); } else { - numberLabel->setText(utils::localize.get(strings::privateNumber)); + numberLabel->setText(utils::translate(strings::privateNumber)); } if (dynamic_cast(data) != nullptr) { diff --git a/module-apps/application-call/windows/EmergencyCallWindow.cpp b/module-apps/application-call/windows/EmergencyCallWindow.cpp index 97dadac35..3b88e0ae0 100644 --- a/module-apps/application-call/windows/EmergencyCallWindow.cpp +++ b/module-apps/application-call/windows/EmergencyCallWindow.cpp @@ -21,10 +21,10 @@ namespace gui using namespace callAppStyle; NumberWindow::buildInterface(); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get("app_phonebook_ice_contacts_title")); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate("app_phonebook_ice_contacts_title")); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); - numberDescriptionLabel->setText(utils::localize.get("app_call_emergency_text")); + numberDescriptionLabel->setText(utils::translate("app_call_emergency_text")); } top_bar::Configuration EmergencyCallWindow::configureTopBar(top_bar::Configuration appConfiguration) diff --git a/module-apps/application-call/windows/EnterNumberWindow.cpp b/module-apps/application-call/windows/EnterNumberWindow.cpp index 9d01f7659..e0ea9ce3a 100644 --- a/module-apps/application-call/windows/EnterNumberWindow.cpp +++ b/module-apps/application-call/windows/EnterNumberWindow.cpp @@ -34,8 +34,8 @@ namespace gui using namespace callAppStyle::enterNumberWindow; NumberWindow::buildInterface(); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get("common_add")); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get("app_call_clear")); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate("common_add")); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate("app_call_clear")); newContactIcon = new gui::AddContactIcon(this, newContactIcon::x, newContactIcon::y); newContactIcon->activatedCallback = [=](gui::Item &item) { return addNewContact(); }; diff --git a/module-apps/application-call/windows/NumberWindow.cpp b/module-apps/application-call/windows/NumberWindow.cpp index 50da70fec..f493f5ed1 100644 --- a/module-apps/application-call/windows/NumberWindow.cpp +++ b/module-apps/application-call/windows/NumberWindow.cpp @@ -38,10 +38,10 @@ namespace gui numberLabel->setText(num); if (num.empty()) { - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); return; } - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get("app_call_clear")); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate("app_call_clear")); } void NumberWindow::buildInterface() @@ -54,7 +54,7 @@ namespace gui bottomBar->setActive(BottomBar::Side::CENTER, true); bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get(callAppStyle::strings::call)); + bottomBar->setText(BottomBar::Side::LEFT, utils::translate(callAppStyle::strings::call)); numberLabel = new gui::Label(this, numberLabel::x, numberLabel::y, numberLabel::w, numberLabel::h); numberLabel->setPenWidth(numberLabel::borderW); diff --git a/module-apps/application-calllog/ApplicationCallLog.cpp b/module-apps/application-calllog/ApplicationCallLog.cpp index 7c9e76db0..4f4339c68 100644 --- a/module-apps/application-calllog/ApplicationCallLog.cpp +++ b/module-apps/application-calllog/ApplicationCallLog.cpp @@ -94,7 +94,7 @@ namespace app return std::make_unique(app); }); windowsFactory.attach( - utils::localize.get("app_phonebook_options_title"), + utils::translate("app_phonebook_options_title"), [](Application *app, const std::string &name) { return std::make_unique(app, name); }); windowsFactory.attach(calllog::settings::DialogYesNoStr, [](Application *app, const std::string &name) { return std::make_unique(app, name); @@ -115,7 +115,7 @@ namespace app auto metaData = std::make_unique( gui::DialogMetadata{record.name, "phonebook_contact_delete_trashcan", - utils::localize.get("app_calllog_delete_call_confirmation"), + utils::translate("app_calllog_delete_call_confirmation"), "", [=]() -> bool { if (DBServiceAPI::CalllogRemove(this, record.ID) == false) { diff --git a/module-apps/application-calllog/widgets/CalllogItem.cpp b/module-apps/application-calllog/widgets/CalllogItem.cpp index a7a3cc774..e8a817c9c 100644 --- a/module-apps/application-calllog/widgets/CalllogItem.cpp +++ b/module-apps/application-calllog/widgets/CalllogItem.cpp @@ -61,7 +61,7 @@ namespace gui { this->call = call; if (call->presentation == PresentationType::PR_UNKNOWN) { - text->setText(utils::localize.get(callLogStyle::strings::privateNumber)); + text->setText(utils::translate(callLogStyle::strings::privateNumber)); } else { text->setText(call->name); diff --git a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp index 08d411e02..5af4a38d5 100644 --- a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp +++ b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp @@ -77,9 +77,9 @@ namespace gui { AppWindow::buildInterface(); - bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get(style::strings::common::options)); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::call)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::LEFT, utils::translate(style::strings::common::options)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::call)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); // NOTE: height of all labels is set using decorators @@ -89,7 +89,7 @@ namespace gui information::label::y, information::label::w, 0, - utils::localize.get(style::strings::common::information))); + utils::translate(style::strings::common::information))); number = decorateData( new gui::Label(this, information::number::x, information::number::y, information::number::w, 0)); number->setFont(style::window::font::mediumbold); @@ -128,12 +128,12 @@ namespace gui // focus callbacks rects[static_cast(FocusRects::Call)]->focusChangedCallback = [=](gui::Item &item) { - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::call)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::call)); return true; }; rects[static_cast(FocusRects::Sms)]->focusChangedCallback = [=](gui::Item &item) { - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::send)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::send)); return true; }; @@ -158,7 +158,7 @@ namespace gui // Type typeLabel = decorateLabel(new gui::Label( - this, type::label::x, type::label::y, type::label::w, 0, utils::localize.get("app_calllog_type"))); + this, type::label::x, type::label::y, type::label::w, 0, utils::translate("app_calllog_type"))); typeData = decorateData(new gui::Label(this, type::data::x, type::data::y, type::data::w, 0)); // TODO: alek: it is used in the code at least twice, possibly create one common function for this @@ -177,12 +177,12 @@ namespace gui duration::label::y, duration::label::w, 0, - utils::localize.get("app_calllog_duration"))); + utils::translate("app_calllog_duration"))); durationData = decorateData(new gui::Label(this, duration::data::x, duration::data::y, duration::data::w, 0)); // Date dateLabel = decorateLabel(new gui::Label( - this, date::label::x, date::label::y, date::label::w, 0, utils::localize.get("app_calllog_date"))); + this, date::label::x, date::label::y, date::label::w, 0, utils::translate("app_calllog_date"))); dateDay = decorateData(new gui::Label(this, date::dataDay::x, date::dataDay::y, date::dataDay::w, 0)); dateDate = decorateData(new gui::Label(this, date::dataDate::x, date::dataDate::y, date::dataDate::w, 0)); } @@ -214,16 +214,16 @@ namespace gui UTF8 callTypeStr; switch (record.type) { case CallType::CT_INCOMING: - callTypeStr = utils::localize.get("app_calllog_incoming_call"); + callTypeStr = utils::translate("app_calllog_incoming_call"); break; case CallType::CT_OUTGOING: - callTypeStr = utils::localize.get("app_calllog_outgoing_call"); + callTypeStr = utils::translate("app_calllog_outgoing_call"); break; case CallType::CT_MISSED: - callTypeStr = utils::localize.get("app_calllog_missed_call"); + callTypeStr = utils::translate("app_calllog_missed_call"); break; case CallType::CT_REJECTED: - callTypeStr = utils::localize.get("app_calllog_rejected_call"); + callTypeStr = utils::translate("app_calllog_rejected_call"); break; default: break; @@ -234,8 +234,8 @@ namespace gui utils::time::Timestamp t(record.date); dateDay->setText(t.day() + ","); - dateDate->setText(t.str(utils::localize.get("locale_date_full") + ", " + - utils::localize.get("locale_12hour_min"))); // TODO: alek 12/24 h + dateDate->setText(t.str(utils::translate("locale_date_full") + ", " + + utils::translate("locale_12hour_min"))); // TODO: alek 12/24 h } if (mode == ShowMode::GUI_SHOW_INIT) @@ -248,7 +248,7 @@ namespace gui rects[FocusRects::Sms]->setVisible(false); rects[FocusRects::Sms]->activatedCallback = nullptr; rects[FocusRects::Sms]->focusChangedCallback = nullptr; - number->setText(utils::localize.get(callLogStyle::strings::privateNumber)); + number->setText(utils::translate(callLogStyle::strings::privateNumber)); bottomBar->setActive(BottomBar::Side::CENTER, false); } else { @@ -274,7 +274,7 @@ namespace gui (inputEvent.keyCode == KeyCode::KEY_LF)) { auto app = dynamic_cast(application); assert(app != nullptr); - app->switchWindow(utils::localize.get("app_phonebook_options_title"), + app->switchWindow(utils::translate("app_phonebook_options_title"), std::make_unique(calllogWindowOptions(app, record))); return true; diff --git a/module-apps/application-calllog/windows/CallLogMainWindow.cpp b/module-apps/application-calllog/windows/CallLogMainWindow.cpp index 173ab4fc6..69218b672 100644 --- a/module-apps/application-calllog/windows/CallLogMainWindow.cpp +++ b/module-apps/application-calllog/windows/CallLogMainWindow.cpp @@ -45,11 +45,11 @@ namespace gui { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_calllog_title_main")); + setTitle(utils::translate("app_calllog_title_main")); - bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get(style::strings::common::call)); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::open)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::LEFT, utils::translate(style::strings::common::call)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); list = new gui::ListView(this, mainWindow::x, diff --git a/module-apps/application-calllog/windows/CallLogOptionsWindow.cpp b/module-apps/application-calllog/windows/CallLogOptionsWindow.cpp index 537e7a441..3329f528d 100644 --- a/module-apps/application-calllog/windows/CallLogOptionsWindow.cpp +++ b/module-apps/application-calllog/windows/CallLogOptionsWindow.cpp @@ -28,7 +28,7 @@ std::list calllogWindowOptions(app::ApplicationCallLog *app, const // add option delete call option options.push_back(gui::Option( - utils::localize.get("app_calllog_options_delete_call"), + utils::translate("app_calllog_options_delete_call"), [=](gui::Item &item) { return app->removeCalllogEntry(record); }, gui::option::Arrow::Disabled)); diff --git a/module-apps/application-desktop/ApplicationDesktop.cpp b/module-apps/application-desktop/ApplicationDesktop.cpp index e2df098f2..a9ff8f85f 100644 --- a/module-apps/application-desktop/ApplicationDesktop.cpp +++ b/module-apps/application-desktop/ApplicationDesktop.cpp @@ -421,9 +421,9 @@ namespace app auto createPinChangedSuccessfullyDialog = [](app::ApplicationDesktop *app) -> std::unique_ptr { return std::make_unique( - gui::DialogMetadata{utils::localize.get("app_desktop_sim_change_pin"), + gui::DialogMetadata{utils::translate("app_desktop_sim_change_pin"), "success_icon_W_G", - utils::localize.get("app_desktop_sim_pin_changed_successfully"), + utils::translate("app_desktop_sim_pin_changed_successfully"), "", [app]() { app->switchWindow(app::window::name::desktop_main_window); @@ -459,8 +459,8 @@ namespace app "", "success_icon_W_G", response->getSimCardLock() == CellularSimCardLockDataMessage::SimCardLock::Unlocked - ? utils::localize.get("app_desktop_sim_card_unlocked") - : utils::localize.get("app_desktop_sim_card_locked"), + ? utils::translate("app_desktop_sim_card_unlocked") + : utils::translate("app_desktop_sim_card_locked"), "", [this]() { switchWindow(app::window::name::desktop_main_window); diff --git a/module-apps/application-desktop/data/Mmi.hpp b/module-apps/application-desktop/data/Mmi.hpp index 65050ab94..fa3033d7a 100644 --- a/module-apps/application-desktop/data/Mmi.hpp +++ b/module-apps/application-desktop/data/Mmi.hpp @@ -122,13 +122,13 @@ namespace mmi virtual void visit(mmiactions::MMICallForwardingResult &customResult, std::string &displayMessage) { - displayMessage += utils::localize.get("app_desktop_info_mmi_call_forwarding") + "\n"; + displayMessage += utils::translate("app_desktop_info_mmi_call_forwarding") + "\n"; if (customResult.getMessageType() == mmiactions::IMMICustomResultParams::MMIType::CallForwardingData) { auto [voice, fax, sync, async] = customResult.getData(); - displayMessage += utils::localize.get("app_desktop_info_mmi_common_voice") + ": " + voice + "\n" + - utils::localize.get("app_desktop_info_mmi_common_fax") + ": " + fax + "\n" + - utils::localize.get("app_desktop_info_mmi_common_sync") + ": " + sync + "\n" + - utils::localize.get("app_desktop_info_mmi_common_async") + ": " + async + "\n"; + displayMessage += utils::translate("app_desktop_info_mmi_common_voice") + ": " + voice + "\n" + + utils::translate("app_desktop_info_mmi_common_fax") + ": " + fax + "\n" + + utils::translate("app_desktop_info_mmi_common_sync") + ": " + sync + "\n" + + utils::translate("app_desktop_info_mmi_common_async") + ": " + async + "\n"; } else if (customResult.getMessageType() == mmiactions::IMMICustomResultParams::MMIType::CallForwardingNotification) { @@ -138,7 +138,7 @@ namespace mmi virtual void visit(mmiactions::MMICallBarringResult &customResult, std::string &displayMessage) { - displayMessage += utils::localize.get("app_desktop_info_mmi_call_barring") + "\n"; + displayMessage += utils::translate("app_desktop_info_mmi_call_barring") + "\n"; if (customResult.getMessageType() == mmiactions::IMMICustomResultParams::MMIType::CallBarringData) { displayMessage += getCustomMessagesFromDictionary(customResult.getMessages()); } @@ -150,7 +150,7 @@ namespace mmi virtual void visit(mmiactions::MMICallWaitingResult &customResult, std::string &displayMessage) { - displayMessage += utils::localize.get("app_desktop_info_mmi_call_waiting") + "\n"; + displayMessage += utils::translate("app_desktop_info_mmi_call_waiting") + "\n"; if (customResult.getMessageType() == mmiactions::IMMICustomResultParams::MMIType::CallWaitingData) { displayMessage += getCustomMessagesFromDictionary(customResult.getMessages()); } @@ -162,19 +162,19 @@ namespace mmi virtual void visit(mmiactions::MMIClipResult &customResult, std::string &displayMessage) { - displayMessage += utils::localize.get("app_desktop_info_mmi_clip") + "\n"; + displayMessage += utils::translate("app_desktop_info_mmi_clip") + "\n"; displayMessage += getSelectedMessagesFromDictionary(customResult.getMessage()); } virtual void visit(mmiactions::MMIClirResult &customResult, std::string &displayMessage) { - displayMessage += utils::localize.get("app_desktop_info_mmi_clir") + "\n"; + displayMessage += utils::translate("app_desktop_info_mmi_clir") + "\n"; displayMessage += getSelectedMessagesFromDictionary(customResult.getMessage()); } virtual void visit(mmiactions::MMIImeiResult &customResult, std::string &displayMessage) { - displayMessage += utils::localize.get("app_desktop_info_mmi_imei") + "\n"; + displayMessage += utils::translate("app_desktop_info_mmi_imei") + "\n"; displayMessage += customResult.getImei() + "\n"; displayMessage += getSelectedMessagesFromDictionary(customResult.getMessage()); } @@ -191,12 +191,12 @@ namespace mmi auto it = messageDictionary.find(serviceState); if (messageDictionary.end() != it) { if (queryStr.empty()) { - queryStr += utils::localize.get(it->second) + "\n"; + queryStr += utils::translate(it->second) + "\n"; } } it = messageDictionary.find(serviceClass); if (messageDictionary.end() != it) { - queryStr += utils::localize.get(it->second) + "\n"; + queryStr += utils::translate(it->second) + "\n"; } } return queryStr; @@ -209,7 +209,7 @@ namespace mmi for (const auto &msg : msgList) { auto it = messageDictionary.find(msg); if (messageDictionary.end() != it) { - selectedMessages += utils::localize.get(it->second) + "\n"; + selectedMessages += utils::translate(it->second) + "\n"; } } return selectedMessages; diff --git a/module-apps/application-desktop/windows/DesktopMainWindow.cpp b/module-apps/application-desktop/windows/DesktopMainWindow.cpp index 2ccee9243..ee6c53d7b 100644 --- a/module-apps/application-desktop/windows/DesktopMainWindow.cpp +++ b/module-apps/application-desktop/windows/DesktopMainWindow.cpp @@ -97,11 +97,10 @@ namespace gui [this](top_bar::Configuration configuration) { return configureTopBar(std::move(configuration)); }); if (app->lockHandler.isScreenLocked()) { - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get("app_desktop_unlock")); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate("app_desktop_unlock")); bottomBar->setActive(BottomBar::Side::RIGHT, false); - bottomBar->setText(BottomBar::Side::LEFT, - utils::localize.get("app_desktop_emergency"), - app->lockHandler.isScreenBlocked()); + bottomBar->setText( + BottomBar::Side::LEFT, utils::translate("app_desktop_emergency"), app->lockHandler.isScreenBlocked()); inputCallback = nullptr; setFocusItem(nullptr); @@ -250,15 +249,15 @@ namespace gui } auto onNotificationFocus = [this](bool isFocused) -> void { - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get("app_desktop_show"), isFocused); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get("app_desktop_clear"), isFocused); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate("app_desktop_show"), isFocused); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate("app_desktop_clear"), isFocused); bottomBar->setActive(BottomBar::Side::LEFT, !isFocused); }; if (app->notifications.notSeen.Calls > 0) { notifications->addNotification( "phone", - utils::localize.get("app_desktop_missed_calls"), + utils::translate("app_desktop_missed_calls"), std::to_string(app->notifications.notSeen.Calls), [app]() -> bool { return app->showCalls(); }, [app]() -> bool { return app->clearCallsNotification(); }, @@ -267,7 +266,7 @@ namespace gui if (app->notifications.notSeen.SMS > 0) { notifications->addNotification( "mail", - utils::localize.get("app_desktop_unread_messages"), + utils::translate("app_desktop_unread_messages"), std::to_string(app->notifications.notSeen.SMS), [this]() -> bool { return app::manager::Controller::sendAction( @@ -293,10 +292,10 @@ namespace gui } auto DesktopMainWindow::setActiveState(app::ApplicationDesktop *app) -> bool { - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get("app_desktop_menu")); - bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get("app_desktop_calls")); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate("app_desktop_menu")); + bottomBar->setText(BottomBar::Side::LEFT, utils::translate("app_desktop_calls")); auto hasNotifications = !app->notifications.notSeen.areEmpty(); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get("app_desktop_clear_all"), hasNotifications); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate("app_desktop_clear_all"), hasNotifications); inputCallback = [this, app, hasNotifications](Item &, const InputEvent &inputEvent) -> bool { if (!inputEvent.isShortPress()) { diff --git a/module-apps/application-desktop/windows/LockWindow.cpp b/module-apps/application-desktop/windows/LockWindow.cpp index 822d8f0c8..4a3dc0e27 100644 --- a/module-apps/application-desktop/windows/LockWindow.cpp +++ b/module-apps/application-desktop/windows/LockWindow.cpp @@ -80,11 +80,11 @@ namespace gui if (isReach) { TextFormat format(FontManager::getInstance().getFont(style::window::font::medium)); text::RichTextParser rtParser; - auto parsedText = rtParser.parse(utils::localize.get(value), &format, std::move(tokens)); + auto parsedText = rtParser.parse(utils::translate(value), &format, std::move(tokens)); text->setText(std::move(parsedText)); } else { - text->setText(utils::localize.get(value)); + text->setText(utils::translate(value)); } } @@ -102,8 +102,8 @@ namespace gui void LockWindow::buildBottomBar() { - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::confirm)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::confirm)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); } auto LockWindow::getText(TextType type) noexcept -> gui::Text * diff --git a/module-apps/application-desktop/windows/LockedInfoWindow.cpp b/module-apps/application-desktop/windows/LockedInfoWindow.cpp index 5a68a9849..9bdc3a099 100644 --- a/module-apps/application-desktop/windows/LockedInfoWindow.cpp +++ b/module-apps/application-desktop/windows/LockedInfoWindow.cpp @@ -69,8 +69,8 @@ void LockedInfoWindow::buildInterface() namespace lock_style = style::window::pin_lock; AppWindow::buildInterface(); - bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get("app_desktop_emergency")); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get("common_back")); + bottomBar->setText(BottomBar::Side::LEFT, utils::translate("app_desktop_emergency")); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate("common_back")); lockImage = new gui::Image(this, lock_style::image::x, lock_style::image::y, 0, 0, "pin_lock"); infoText = new Text(this, @@ -81,7 +81,7 @@ void LockedInfoWindow::buildInterface() TextFormat format(FontManager::getInstance().getFont(style::window::font::medium)); text::RichTextParser rtParser; - auto parsedText = rtParser.parse(utils::localize.get("app_desktop_press_to_unlock"), &format); + auto parsedText = rtParser.parse(utils::translate("app_desktop_press_to_unlock"), &format); infoText->setText(std::move(parsedText)); infoText->setAlignment(Alignment::Horizontal::Center); diff --git a/module-apps/application-desktop/windows/MenuWindow.cpp b/module-apps/application-desktop/windows/MenuWindow.cpp index defb6c0cb..eb15f19f6 100644 --- a/module-apps/application-desktop/windows/MenuWindow.cpp +++ b/module-apps/application-desktop/windows/MenuWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "MenuWindow.hpp" @@ -64,7 +64,7 @@ namespace gui desc->setPenWidth(style::window::default_border_no_focus_w); desc->setFont(style::window::font::verysmall); desc->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Bottom)); - desc->setText(utils::localize.get(title)); + desc->setText(utils::translate(title)); if (hasNotificationsCallback != nullptr) { onNotificationsChangeCallback = @@ -147,15 +147,15 @@ namespace gui AppWindow::buildInterface(); bottomBar->setActive(BottomBar::Side::CENTER, true); bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::open)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); auto app = dynamic_cast(application); assert(app); mainMenu = new MenuPage( this, - utils::localize.get("app_desktop_menu_title"), + utils::translate("app_desktop_menu_title"), { new gui::Tile{ @@ -239,7 +239,7 @@ namespace gui toolsMenu = new MenuPage( this, - utils::localize.get("app_desktop_tools_title"), + utils::translate("app_desktop_tools_title"), { new gui::Tile{"menu_tools_notes_W_G", "app_desktop_tools_notes", diff --git a/module-apps/application-desktop/windows/MmiInternalMsgWindow.cpp b/module-apps/application-desktop/windows/MmiInternalMsgWindow.cpp index 98ed62af6..6624083c5 100644 --- a/module-apps/application-desktop/windows/MmiInternalMsgWindow.cpp +++ b/module-apps/application-desktop/windows/MmiInternalMsgWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "MmiPushWindow.hpp" @@ -36,10 +36,10 @@ void MmiInternalMsgWindow::handleInternalMessages(mmiactions::MMIResultParams *m auto result = metadata->getData(); switch (result) { case mmiactions::MMIResultParams::MMIResult::Success: - text->setText(displayMessage + utils::localize.get("app_desktop_info_mmi_result_success")); + text->setText(displayMessage + utils::translate("app_desktop_info_mmi_result_success")); break; case mmiactions::MMIResultParams::MMIResult::Failed: - text->setText(displayMessage + utils::localize.get("app_desktop_info_mmi_result_failed")); + text->setText(displayMessage + utils::translate("app_desktop_info_mmi_result_failed")); break; default: text->clear(); diff --git a/module-apps/application-desktop/windows/MmiPullWindow.cpp b/module-apps/application-desktop/windows/MmiPullWindow.cpp index 092276040..8ac0991db 100644 --- a/module-apps/application-desktop/windows/MmiPullWindow.cpp +++ b/module-apps/application-desktop/windows/MmiPullWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "MmiPullWindow.hpp" @@ -37,8 +37,8 @@ MmiPullWindow::MmiPullWindow(app::Application *app, const std::string &name) : g { AppWindow::buildInterface(); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get("app_desktop_replay")); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate("app_desktop_replay")); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); text = new Text( this, style::desktop::text::x, style::desktop::text::y, style::desktop::text::w, style::desktop::text::h); text->setTextType(TextType::MultiLine); @@ -46,7 +46,7 @@ MmiPullWindow::MmiPullWindow(app::Application *app, const std::string &name) : g text->setEdges(RectangleEdge::None); text->setFont(style::window::font::medium); text->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Top)); - setTitle(utils::localize.get("app_desktop_info")); + setTitle(utils::translate("app_desktop_info")); InputBox = new DesktopInputWidget(application, this, diff --git a/module-apps/application-desktop/windows/MmiPushWindow.cpp b/module-apps/application-desktop/windows/MmiPushWindow.cpp index a936583b8..5a680746f 100644 --- a/module-apps/application-desktop/windows/MmiPushWindow.cpp +++ b/module-apps/application-desktop/windows/MmiPushWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "MmiPushWindow.hpp" @@ -31,7 +31,7 @@ namespace style::desktop MmiPushWindow::MmiPushWindow(app::Application *app, const std::string &name) : gui::AppWindow(app, name) { AppWindow::buildInterface(); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::ok)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::ok)); icon = new Image(this, style::desktop::image::x, style::desktop::image::y, ""); icon->set("info_big_circle_W_G"); text = new Text( @@ -41,7 +41,7 @@ MmiPushWindow::MmiPushWindow(app::Application *app, const std::string &name) : g text->setEdges(RectangleEdge::None); text->setFont(style::window::font::medium); text->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Top)); - setTitle(utils::localize.get("app_desktop_info")); + setTitle(utils::translate("app_desktop_info")); } void MmiPushWindow::onBeforeShow(ShowMode mode, SwitchData *data) diff --git a/module-apps/application-desktop/windows/PinLockBaseWindow.cpp b/module-apps/application-desktop/windows/PinLockBaseWindow.cpp index 03ca6ec90..5e51ccfa7 100644 --- a/module-apps/application-desktop/windows/PinLockBaseWindow.cpp +++ b/module-apps/application-desktop/windows/PinLockBaseWindow.cpp @@ -86,7 +86,7 @@ namespace gui iceText->activeItem = false; iceText->setAlignment(Alignment(Alignment::Horizontal::Left, Alignment::Vertical::Center)); iceText->setFont(style::window::font::verysmall); - iceText->setText(utils::localize.get("app_desktop_emergency")); + iceText->setText(utils::translate("app_desktop_emergency")); iceBox->addWidget(iceText); title = new gui::Text(this, title::x, title::y, title::w, title::h); diff --git a/module-apps/application-desktop/windows/PostUpdateWindow.cpp b/module-apps/application-desktop/windows/PostUpdateWindow.cpp index 2adfa1dd7..5c4c10025 100644 --- a/module-apps/application-desktop/windows/PostUpdateWindow.cpp +++ b/module-apps/application-desktop/windows/PostUpdateWindow.cpp @@ -36,7 +36,7 @@ void PostUpdateWindow::onBeforeShow(ShowMode mode, SwitchData *data) auto *item = dynamic_cast(data); if (item != nullptr) { currentOsVersion = item->getCurrentOsVersion(); - auto info = utils::localize.get("app_desktop_update_success"); + auto info = utils::translate("app_desktop_update_success"); utils::findAndReplaceAll(info, "$VERSION", currentOsVersion); infoText->setText(info); } @@ -83,9 +83,9 @@ void PostUpdateWindow::buildInterface() namespace post_update_style = style::window::pin_lock; AppWindow::buildInterface(); - setTitle(utils::localize.get("app_desktop_update_muditaos")); + setTitle(utils::translate("app_desktop_update_muditaos")); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get("common_ok")); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate("common_ok")); successImage = new gui::Image(this, post_update_style::image::x, post_update_style::image::y, 0, 0, "circle_success"); diff --git a/module-apps/application-desktop/windows/PowerOffWindow.cpp b/module-apps/application-desktop/windows/PowerOffWindow.cpp index 3151f96dd..bd629673b 100644 --- a/module-apps/application-desktop/windows/PowerOffWindow.cpp +++ b/module-apps/application-desktop/windows/PowerOffWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "InputEvent.hpp" @@ -47,8 +47,8 @@ namespace gui presenter->powerOff(); return true; }; - metadata.title = utils::localize.get("app_desktop_poweroff_title"); - metadata.text = utils::localize.get("app_desktop_poweroff_question"); + metadata.title = utils::translate("app_desktop_poweroff_title"); + metadata.text = utils::translate("app_desktop_poweroff_question"); metadata.icon = "turn_off_W_G"; auto msg = std::make_unique(std::move(metadata)); DialogYesNo::onBeforeShow(mode, msg.get()); diff --git a/module-apps/application-desktop/windows/Update.cpp b/module-apps/application-desktop/windows/Update.cpp index e0fe1863f..cdb35cd19 100644 --- a/module-apps/application-desktop/windows/Update.cpp +++ b/module-apps/application-desktop/windows/Update.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "log/log.hpp" @@ -46,8 +46,8 @@ namespace gui AppWindow::buildInterface(); bottomBar->setActive(BottomBar::Side::CENTER, true); bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::confirm)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::confirm)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); // title label titleLabel = new gui::Label(this, 0, 60, 480, 40); @@ -56,7 +56,7 @@ namespace gui titleLabel->setFont(style::header::font::title); titleLabel->setEdges(RectangleEdge::None); titleLabel->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Top)); - titleLabel->setText(utils::localize.get("app_desktop_update")); + titleLabel->setText(utils::translate("app_desktop_update")); // Update version information updateVersionInfo = new gui::Label(this, 10, 132, 480, 40); @@ -66,7 +66,7 @@ namespace gui updateVersionInfo->setEdges(RectangleEdge::None); updateVersionInfo->setAlignment( gui::Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Top)); - updateVersionInfo->setText(utils::localize.get("app_desktop_update")); + updateVersionInfo->setText(utils::translate("app_desktop_update")); // Update details updateDetails = new gui::Label(this, 40, 172, 440, 40); @@ -75,7 +75,7 @@ namespace gui updateDetails->setFont(style::window::font::verysmall); updateDetails->setEdges(RectangleEdge::None); updateDetails->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Top)); - updateDetails->setText(utils::localize.get("app_desktop_update")); + updateDetails->setText(utils::translate("app_desktop_update")); // Current version information currentVersionInfo = new gui::Label(this, 10, 222, 480, 40); @@ -85,7 +85,7 @@ namespace gui currentVersionInfo->setEdges(RectangleEdge::None); currentVersionInfo->setAlignment( gui::Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Top)); - currentVersionInfo->setText(utils::localize.get("app_desktop_update_current")); + currentVersionInfo->setText(utils::translate("app_desktop_update_current")); // Label Info infoLabel = new gui::Label(this, 20, 304, 440, 40); @@ -93,7 +93,7 @@ namespace gui infoLabel->setBorderColor(gui::ColorNoColor); infoLabel->setFont(style::window::font::medium); infoLabel->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Bottom)); - infoLabel->setText(utils::localize.get("app_desktop_update_apply")); + infoLabel->setText(utils::translate("app_desktop_update_apply")); // Details during update detailLabel = new gui::Label(this, 20, 354, 440, 20); @@ -126,8 +126,8 @@ namespace gui selectionLabels.push_back(label); pinLabelX += 193; } - selectionLabels[0]->setText(utils::localize.get(style::strings::common::no)); - selectionLabels[1]->setText(utils::localize.get(style::strings::common::yes)); + selectionLabels[0]->setText(utils::translate(style::strings::common::no)); + selectionLabels[1]->setText(utils::translate(style::strings::common::yes)); // define navigation between labels selectionLabels[0]->setNavigationItem(NavigationDirection::LEFT, selectionLabels[1]); @@ -174,7 +174,7 @@ namespace gui currentVersion << GIT_REV; currentVersion << ")"; - updateVersion << utils::localize.get("app_desktop_update_to"); + updateVersion << utils::translate("app_desktop_update_to"); updateVersion << ": "; updateVersion << msg.updateStats.versionInformation[boot::json::os_version][boot::json::version_string] .string_value(); @@ -183,7 +183,7 @@ namespace gui .string_value(); updateVersion << ")"; - updateFileDetails << utils::localize.get("app_desktop_update_size"); + updateFileDetails << utils::translate("app_desktop_update_size"); updateFileDetails << ": "; updateFileDetails << std::to_string(msg.updateStats.totalBytes / 1024); updateFileDetails << "Kb ("; @@ -225,7 +225,7 @@ namespace gui selectionLabels[1]->setVisible(false); percentLabel->setVisible(true); - percentLabel->setText(utils::localize.get("app_desktop_update_start")); + percentLabel->setText(utils::translate("app_desktop_update_start")); auto msgToSend = std::make_shared(updateFile.c_str(), 0); application->bus.sendUnicast(msgToSend, service::name::service_desktop); @@ -251,7 +251,7 @@ namespace gui static_cast((static_cast(item->getUpdateOsMessage().updateStats.currentExtractedBytes) / static_cast(item->getUpdateOsMessage().updateStats.totalBytes)) * 100.0); - ssi << utils::localize.get("app_desktop_update_unpacking"); + ssi << utils::translate("app_desktop_update_unpacking"); ssi << ": "; ssi << std::to_string(progressPercent); ssi << " %"; @@ -262,11 +262,11 @@ namespace gui percentLabel->setText(item->getUpdateOsMessage().updateStats.messageText); } - sizeStream << utils::localize.get("app_desktop_update_size"); + sizeStream << utils::translate("app_desktop_update_size"); sizeStream << ": "; sizeStream << std::to_string(item->getUpdateOsMessage().updateStats.fileExtractedSize); sizeStream << " "; - sizeStream << utils::localize.get("app_desktop_update_bytes"); + sizeStream << utils::translate("app_desktop_update_bytes"); detailLabel->setText(sizeStream.str()); this->application->refreshWindow(gui::RefreshModes::GUI_REFRESH_FAST); } diff --git a/module-apps/application-desktop/windows/UpdateProgress.cpp b/module-apps/application-desktop/windows/UpdateProgress.cpp index cc2bc782d..8a86c59bf 100644 --- a/module-apps/application-desktop/windows/UpdateProgress.cpp +++ b/module-apps/application-desktop/windows/UpdateProgress.cpp @@ -42,7 +42,7 @@ namespace gui msg.updateStats.versionInformation[boot::json::os_version][boot::json::version_string] .string_value(); if (text->getText().empty()) { - text->setText(utils::localize.get("app_desktop_update_preparing") + " " + updateVersion); + text->setText(utils::translate("app_desktop_update_preparing") + " " + updateVersion); } else { text->setText(textInfo); @@ -83,7 +83,7 @@ namespace gui { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_desktop_update_muditaos")); + setTitle(utils::translate("app_desktop_update_muditaos")); icon = new Image(this, style::desktop::image::x, style::desktop::image::y, "circle_update"); @@ -151,7 +151,7 @@ namespace gui progressPercent = 30; break; case updateos::UpdateState::ExtractingFiles: - textInfo = utils::localize.get("app_desktop_update_in_progress"); + textInfo = utils::translate("app_desktop_update_in_progress"); progressPercent = 40; break; case updateos::UpdateState::ChecksumVerification: @@ -163,7 +163,7 @@ namespace gui progressPercent = 80; break; case updateos::UpdateState::UpdatingBootloader: - textInfo = utils::localize.get("app_desktop_update_ready_for_reset"); + textInfo = utils::translate("app_desktop_update_ready_for_reset"); progressPercent = 99; break; case updateos::UpdateState::ReadyForReset: diff --git a/module-apps/application-meditation/widgets/IntervalBox.cpp b/module-apps/application-meditation/widgets/IntervalBox.cpp index c9882fa60..4644b75c1 100644 --- a/module-apps/application-meditation/widgets/IntervalBox.cpp +++ b/module-apps/application-meditation/widgets/IntervalBox.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "IntervalBox.hpp" @@ -36,7 +36,7 @@ void IntervalBox::build() boxStyle::topLabel::Y, boxStyle::topLabel::Width, boxStyle::topLabel::Height, - utils::localize.get("app_meditation_interval_chime")); + utils::translate("app_meditation_interval_chime")); topLabel->setAlignment(Alignment(Alignment::Horizontal::Left, Alignment::Vertical::Bottom)); topLabel->setFont(style::window::font::verysmall); topLabel->setEdges(RectangleEdge::None); @@ -156,10 +156,10 @@ bool IntervalBox::ChimeIntervalList::hasNext(Direction direction, std::chrono::m std::string IntervalBox::ChimeIntervalList::toPrintableInterval(std::chrono::minutes value) { if (value.count() == 0) { - return utils::localize.get("app_meditation_interval_none"); + return utils::translate("app_meditation_interval_none"); } const std::string toReplace = "%0"; - std::string temp = utils::localize.get("app_meditation_interval_every_x_minutes"); + std::string temp = utils::translate("app_meditation_interval_every_x_minutes"); temp.replace(temp.find(toReplace), toReplace.size(), std::to_string(static_cast(value.count()))); return temp; } diff --git a/module-apps/application-meditation/widgets/MeditationListItems.cpp b/module-apps/application-meditation/widgets/MeditationListItems.cpp index 9395b60b4..868f92696 100644 --- a/module-apps/application-meditation/widgets/MeditationListItems.cpp +++ b/module-apps/application-meditation/widgets/MeditationListItems.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "MeditationListItems.hpp" @@ -56,7 +56,7 @@ std::string PreparationTimeItem::convertToPrintable(std::chrono::seconds _durati } OptionItemMeditationCounter::OptionItemMeditationCounter(bool isCounterOn) - : MeditationListItem(utils::localize.get("app_meditation_option_show_counter")) + : MeditationListItem(utils::translate("app_meditation_option_show_counter")) { imageOptionOn = new gui::Image(this, listStyle::image::X, @@ -81,8 +81,7 @@ void OptionItemMeditationCounter::select(bool isSelected) imageOptionOff->setVisible(!isSelected); } -OptionItemPreparation::OptionItemPreparation() - : MeditationListItem(utils::localize.get("app_meditation_preparation_time")) +OptionItemPreparation::OptionItemPreparation() : MeditationListItem(utils::translate("app_meditation_preparation_time")) { image = new gui::Image(this, listStyle::image::X, diff --git a/module-apps/application-meditation/widgets/TimerProperty.cpp b/module-apps/application-meditation/widgets/TimerProperty.cpp index 262d1345a..9b82c5981 100644 --- a/module-apps/application-meditation/widgets/TimerProperty.cpp +++ b/module-apps/application-meditation/widgets/TimerProperty.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "TimerProperty.hpp" @@ -48,7 +48,7 @@ void TimerProperty::build() timeUnitLabel->setFont(style::window::font::verysmall); timeUnitLabel->setAlignment(Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Center)); timeUnitLabel->setEdges(RectangleEdge::None); - timeUnitLabel->setText(utils::localize.get("app_meditation_minutes")); + timeUnitLabel->setText(utils::translate("app_meditation_minutes")); } bool TimerProperty::onFocus(bool isFocused) @@ -93,10 +93,10 @@ void TimerProperty::setMeditationTime() const auto meditationTime = static_cast(state.getTime().count()); timeLabel->setText(utils::to_string(meditationTime)); if (meditationTime == 1) { - timeUnitLabel->setText(utils::localize.get("app_meditation_minute")); + timeUnitLabel->setText(utils::translate("app_meditation_minute")); } else { - timeUnitLabel->setText(utils::localize.get("app_meditation_minutes")); + timeUnitLabel->setText(utils::translate("app_meditation_minutes")); } } diff --git a/module-apps/application-meditation/windows/MeditationListViewWindows.cpp b/module-apps/application-meditation/windows/MeditationListViewWindows.cpp index a203840a4..bbd65dd91 100644 --- a/module-apps/application-meditation/windows/MeditationListViewWindows.cpp +++ b/module-apps/application-meditation/windows/MeditationListViewWindows.cpp @@ -30,7 +30,7 @@ void MeditationListViewWindow::buildInterface() model, gui::listview::ScrollBarType::Fixed); setFocusItem(list); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); } void MeditationListViewWindow::destroyInterface() @@ -67,8 +67,8 @@ MeditationOptionsWindow::MeditationOptionsWindow(app::Application *app) void MeditationOptionsWindow::buildInterface() { MeditationListViewWindow::buildInterface(); - setTitle(utils::localize.get("common_options")); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::Switch)); + setTitle(utils::translate("common_options")); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::Switch)); } PreparationTimeWindow::PreparationTimeWindow(app::Application *app) @@ -81,6 +81,6 @@ PreparationTimeWindow::PreparationTimeWindow(app::Application *app) void PreparationTimeWindow::buildInterface() { MeditationListViewWindow::buildInterface(); - setTitle(utils::localize.get("app_meditation_preparation_time")); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::select)); + setTitle(utils::translate("app_meditation_preparation_time")); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::select)); } diff --git a/module-apps/application-meditation/windows/MeditationTimerWindow.cpp b/module-apps/application-meditation/windows/MeditationTimerWindow.cpp index d80eda807..bc497c76e 100644 --- a/module-apps/application-meditation/windows/MeditationTimerWindow.cpp +++ b/module-apps/application-meditation/windows/MeditationTimerWindow.cpp @@ -33,7 +33,7 @@ void MeditationTimerWindow::buildInterface() assert(app != nullptr); // Pre-condition check. AppWindow::buildInterface(); - setTitle(utils::localize.get("app_meditation_title_main")); + setTitle(utils::translate("app_meditation_title_main")); timer = new MeditationTimer(style::meditation::timer::X, style::meditation::timer::Y, @@ -125,27 +125,27 @@ void MeditationTimerWindow::setWidgetVisible(bool tBar, bool bBar, bool counter) void MeditationTimerWindow::setVisibleRunning() { setWidgetVisible(false, true, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::pause)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::stop)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::pause)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::stop)); meditationInfo->setVisible(false); } void MeditationTimerWindow::setVisiblePaused() { setWidgetVisible(true, true, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::resume)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::stop)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::resume)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::stop)); } void MeditationTimerWindow::setVisiblePreparation() { setWidgetVisible(false, false, false); TextFormat format(FontManager::getInstance().getFont(style::window::font::biglight)); gui::text::RichTextParser parser; - auto textParsed = parser.parse(utils::localize.get("app_meditation_put_down_phone_and_wait"), &format); + auto textParsed = parser.parse(utils::translate("app_meditation_put_down_phone_and_wait"), &format); meditationInfo->setText(std::move(textParsed)); meditationInfo->setVisible(true); finished = false; - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); } void MeditationTimerWindow::setVisibleMeditationEnd() @@ -153,7 +153,7 @@ void MeditationTimerWindow::setVisibleMeditationEnd() setWidgetVisible(false, false, false); TextFormat format(FontManager::getInstance().getFont(style::window::font::biglight)); gui::text::RichTextParser parser; - auto textParsed = parser.parse(utils::localize.get("app_meditation_thank_you_for_session"), &format); + auto textParsed = parser.parse(utils::translate("app_meditation_thank_you_for_session"), &format); finished = true; meditationInfo->setText(std::move(textParsed)); meditationInfo->setVisible(true); diff --git a/module-apps/application-meditation/windows/MeditationWindow.cpp b/module-apps/application-meditation/windows/MeditationWindow.cpp index 4636acf32..ae6281e12 100644 --- a/module-apps/application-meditation/windows/MeditationWindow.cpp +++ b/module-apps/application-meditation/windows/MeditationWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "MeditationWindow.hpp" @@ -31,14 +31,14 @@ namespace gui void MeditationWindow::buildInterface() { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_meditation_title_main")); + setTitle(utils::translate("app_meditation_title_main")); bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); bottomBar->setActive(BottomBar::Side::LEFT, true); - bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get(style::strings::common::options)); + bottomBar->setText(BottomBar::Side::LEFT, utils::translate(style::strings::common::options)); bottomBar->setActive(BottomBar::Side::CENTER, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::start)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::start)); timeSetter = new TimerProperty(this, style::meditation::timer::X, diff --git a/module-apps/application-messages/ApplicationMessages.cpp b/module-apps/application-messages/ApplicationMessages.cpp index 92ebddb87..ae6b2645b 100644 --- a/module-apps/application-messages/ApplicationMessages.cpp +++ b/module-apps/application-messages/ApplicationMessages.cpp @@ -61,7 +61,7 @@ namespace app returnToPreviousWindow(); return true; }; - const auto notification = utils::localize.get("app_messages_no_sim"); + const auto notification = utils::translate("app_messages_no_sim"); showNotification(action, notification); return actionHandled(); }); @@ -70,7 +70,7 @@ namespace app returnToPreviousWindow(); return true; }; - const auto notification = utils::localize.get("app_sms_offline"); + const auto notification = utils::translate("app_sms_offline"); showNotification(action, notification); return actionHandled(); @@ -142,7 +142,7 @@ namespace app return std::make_unique(app); }); windowsFactory.attach( - utils::localize.get("app_phonebook_options_title"), + utils::translate("app_phonebook_options_title"), [](Application *app, const std::string &name) { return std::make_unique(app, name); }); windowsFactory.attach(gui::name::window::dialog, [](Application *app, const std::string &name) { return std::make_unique(app, name); @@ -210,7 +210,7 @@ namespace app auto metaData = std::make_unique( gui::DialogMetadata{contact.getFormattedName(), "phonebook_contact_delete_trashcan", - utils::localize.get("app_messages_thread_delete_confirmation"), + utils::translate("app_messages_thread_delete_confirmation"), "", [this, record]() { return onRemoveSmsThreadConfirmed(*record); }}); switchWindow(gui::name::window::dialog_yes_no, gui::ShowMode::GUI_SHOW_INIT, std::move(metaData)); @@ -248,7 +248,7 @@ namespace app auto metaData = std::make_unique( gui::DialogMetadata{record.body, "phonebook_contact_delete_trashcan", - utils::localize.get("app_messages_message_delete_confirmation"), + utils::translate("app_messages_message_delete_confirmation"), "", [this, record] { return onRemoveSmsConfirmed(record); }}); switchWindow(gui::name::window::dialog_yes_no, gui::ShowMode::GUI_SHOW_INIT, std::move(metaData)); @@ -297,8 +297,8 @@ namespace app { gui::DialogMetadata meta; meta.icon = "search_big"; - meta.text = utils::localize.get("app_messages_thread_no_result"); - meta.title = utils::localize.get("common_results_prefix") + query; + meta.text = utils::translate("app_messages_thread_no_result"); + meta.title = utils::translate("common_results_prefix") + query; auto data = std::make_unique(meta); data->ignoreCurrentWindowOnStack = true; switchWindow(gui::name::window::dialog, std::make_unique(meta)); @@ -409,7 +409,7 @@ namespace app { LOG_INFO("New message options for %s", requestingWindow.c_str()); auto opts = std::make_unique(newMessageWindowOptions(this, requestingWindow, text)); - switchWindow(utils::localize.get("app_phonebook_options_title"), std::move(opts)); + switchWindow(utils::translate("app_phonebook_options_title"), std::move(opts)); return true; } diff --git a/module-apps/application-messages/models/ThreadsModel.cpp b/module-apps/application-messages/models/ThreadsModel.cpp index 3d8ced582..5ea16e7f2 100644 --- a/module-apps/application-messages/models/ThreadsModel.cpp +++ b/module-apps/application-messages/models/ThreadsModel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "ThreadsModel.hpp" @@ -55,7 +55,7 @@ auto ThreadsModel::getItem(gui::Order order) -> gui::ListItem * } if (event.keyCode == gui::KeyCode::KEY_LF) { application->switchWindow( - utils::localize.get("app_phonebook_options_title"), + utils::translate("app_phonebook_options_title"), std::make_unique(threadWindowOptions(app, item->getThreadItem().get()))); } return false; diff --git a/module-apps/application-messages/widgets/SMSInputWidget.cpp b/module-apps/application-messages/widgets/SMSInputWidget.cpp index c0ab99347..f84dcb1d9 100644 --- a/module-apps/application-messages/widgets/SMSInputWidget.cpp +++ b/module-apps/application-messages/widgets/SMSInputWidget.cpp @@ -75,9 +75,9 @@ namespace gui if (inputText->focus) { application->getWindow(gui::name::window::thread_view) - ->setBottomBarText(utils::localize.get("sms_reply"), BottomBar::Side::CENTER); + ->setBottomBarText(utils::translate("sms_reply"), BottomBar::Side::CENTER); - if (inputText->getText() == utils::localize.get("sms_temp_reply")) { + if (inputText->getText() == utils::translate("sms_temp_reply")) { inputText->clear(); } } @@ -87,7 +87,7 @@ namespace gui // Temporary solution to be fixed when proper Text Color handling will be added. auto format = TextFormat(Font(27).raw(), Color(7, 0)); - for (auto &el : textToTextBlocks(utils::localize.get("sms_temp_reply"), format)) { + for (auto &el : textToTextBlocks(utils::translate("sms_temp_reply"), format)) { inputText->addText(el); } } @@ -116,7 +116,7 @@ namespace gui void SMSInputWidget::handleDraftMessage() { - if (const auto &text = inputText->getText(); text.empty() || (text == utils::localize.get("sms_temp_reply"))) { + if (const auto &text = inputText->getText(); text.empty() || (text == utils::translate("sms_temp_reply"))) { clearDraftMessage(); } else { diff --git a/module-apps/application-messages/widgets/SMSOutputWidget.cpp b/module-apps/application-messages/widgets/SMSOutputWidget.cpp index f3f5af56a..b3b8d73e6 100644 --- a/module-apps/application-messages/widgets/SMSOutputWidget.cpp +++ b/module-apps/application-messages/widgets/SMSOutputWidget.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include @@ -87,7 +87,7 @@ namespace gui LOG_INFO("Message activated!"); auto app = dynamic_cast(application); assert(app != nullptr); - app->switchWindow(utils::localize.get("app_phonebook_options_title"), + app->switchWindow(utils::translate("app_phonebook_options_title"), std::make_unique(smsWindowOptions(app, *record))); return true; } diff --git a/module-apps/application-messages/widgets/ThreadItem.cpp b/module-apps/application-messages/widgets/ThreadItem.cpp index bc100448a..043f54b61 100644 --- a/module-apps/application-messages/widgets/ThreadItem.cpp +++ b/module-apps/application-messages/widgets/ThreadItem.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "ThreadItem.hpp" @@ -30,14 +30,14 @@ namespace gui { switch (threadStruct->thread->type) { case SMSType::DRAFT: - snippetPrefix->setText(utils::localize.get("app_messages_thread_draft")); + snippetPrefix->setText(utils::translate("app_messages_thread_draft")); break; case SMSType::FAILED: - snippetPrefix->setText(utils::localize.get("app_messages_thread_not_sent")); + snippetPrefix->setText(utils::translate("app_messages_thread_not_sent")); break; case SMSType::OUTBOX: case SMSType::QUEUED: - snippetPrefix->setText(utils::localize.get("app_messages_thread_you")); + snippetPrefix->setText(utils::translate("app_messages_thread_you")); break; default: break; diff --git a/module-apps/application-messages/windows/MessagesMainWindow.cpp b/module-apps/application-messages/windows/MessagesMainWindow.cpp index 8607d0709..047fe2ce2 100644 --- a/module-apps/application-messages/windows/MessagesMainWindow.cpp +++ b/module-apps/application-messages/windows/MessagesMainWindow.cpp @@ -61,11 +61,11 @@ namespace gui bottomBar->setActive(BottomBar::Side::LEFT, true); bottomBar->setActive(BottomBar::Side::CENTER, true); bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get(style::strings::common::options)); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::open)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::LEFT, utils::translate(style::strings::common::options)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); - setTitle(utils::localize.get("app_messages_title_main")); + setTitle(utils::translate("app_messages_title_main")); leftArrowImage = new gui::Image(this, 30, 62, 0, 0, "arrow_left"); rightArrowImage = new gui::Image(this, 480 - 30 - 13, 62, 0, 0, "arrow_right"); @@ -78,7 +78,7 @@ namespace gui style::window_width, style::window_height - style::header::height - style::footer::height, "phonebook_empty_grey_circle_W_G", - utils::localize.get("app_messages_no_messages")); + utils::translate("app_messages_no_messages")); list->setVisible(true); list->focusChangedCallback = [this]([[maybe_unused]] gui::Item &item) { diff --git a/module-apps/application-messages/windows/NewMessage.cpp b/module-apps/application-messages/windows/NewMessage.cpp index 28aeefe89..5e0ff2dbd 100644 --- a/module-apps/application-messages/windows/NewMessage.cpp +++ b/module-apps/application-messages/windows/NewMessage.cpp @@ -166,7 +166,7 @@ namespace gui if (getFocusItem() == recipient) { bottomBar->setActive(BottomBar::Side::LEFT, false); if (recipient->getText().empty()) { - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::select)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::select)); return; } bottomBar->setActive(BottomBar::Side::CENTER, false); @@ -177,17 +177,17 @@ namespace gui { namespace msgStyle = style::messages::newMessage; AppWindow::buildInterface(); - bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get(style::strings::common::options)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::LEFT, utils::translate(style::strings::common::options)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); - setTitle(utils::localize.get("sms_title_message")); + setTitle(utils::translate("sms_title_message")); const uint32_t w = this->getWidth() - style::window::default_left_margin - style::window::default_right_margin; const uint32_t h = this->getHeight() - title->offset_h() - bottomBar->getHeight(); body = new gui::VBox(this, style::window::default_left_margin, (uint32_t)title->offset_h(), w, h); auto recipientLabel = new Label(body, 0, 0, body->getWidth(), msgStyle::recipientLabel::h); - recipientLabel->setText(utils::localize.get("sms_add_rec_num")); + recipientLabel->setText(utils::translate("sms_add_rec_num")); recipientLabel->activeItem = false; recipientLabel->setEdges(gui::RectangleEdge::None); recipientLabel->setFont(style::window::font::small); @@ -234,7 +234,7 @@ namespace gui img->activeItem = false; auto labelMessage = new Label(body, 0, 0, body->getWidth(), msgStyle::messageLabel::h); - labelMessage->setText(utils::localize.get("app_messages_message")); + labelMessage->setText(utils::translate("app_messages_message")); labelMessage->activeItem = false; labelMessage->setEdges(gui::RectangleEdge::None); labelMessage->setFont(style::window::font::small); @@ -260,7 +260,7 @@ namespace gui return true; }; message->focusChangedCallback = [=](Item &) -> bool { - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::send)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::send)); bottomBar->setActive(BottomBar::Side::LEFT, true); return true; }; diff --git a/module-apps/application-messages/windows/OptionsMessages.cpp b/module-apps/application-messages/windows/OptionsMessages.cpp index cfc8eb712..39fbea617 100644 --- a/module-apps/application-messages/windows/OptionsMessages.cpp +++ b/module-apps/application-messages/windows/OptionsMessages.cpp @@ -21,7 +21,7 @@ std::list smsWindowOptions(app::ApplicationMessages *app, const SMS std::list options; if (record.type == SMSType::FAILED) { - options.emplace_back(utils::localize.get("sms_resend_failed"), [=, &record](gui::Item &item) { + options.emplace_back(utils::translate("sms_resend_failed"), [=, &record](gui::Item &item) { app->resendSms(record); app->returnToPreviousWindow(); return true; @@ -34,19 +34,19 @@ std::list smsWindowOptions(app::ApplicationMessages *app, const SMS contact.isTemporary() ? gui::option::ContactOperation::Add : gui::option::ContactOperation::Details; options.emplace_back(gui::Option{std::make_unique(app, contactOperation, contact)}); - options.emplace_back(UTF8(utils::localize.get("sms_forward_message")), [=](gui::Item &item) { + options.emplace_back(UTF8(utils::translate("sms_forward_message")), [=](gui::Item &item) { std::unique_ptr data = std::make_unique(record.body); app->switchWindow(gui::name::window::new_sms, std::move(data)); return true; }); - options.emplace_back(UTF8(utils::localize.get("sms_copy")), [=](gui::Item &item) { + options.emplace_back(UTF8(utils::translate("sms_copy")), [=](gui::Item &item) { Clipboard::getInstance().copy(record.body); app->returnToPreviousWindow(); return true; }); - options.emplace_back(UTF8(utils::localize.get("sms_delete_message")), + options.emplace_back(UTF8(utils::translate("sms_delete_message")), [=](gui::Item &item) { return app->removeSms(record); }); return options; @@ -58,14 +58,14 @@ std::list newMessageWindowOptions(app::ApplicationMessages *app, { std::list options; - options.emplace_back(UTF8(utils::localize.get("sms_use_template")), [=](gui::Item &item) { + options.emplace_back(UTF8(utils::translate("sms_use_template")), [=](gui::Item &item) { std::unique_ptr data = std::make_unique(requestingWindow); app->switchWindow(gui::name::window::sms_templates, std::move(data)); return true; }); if (Clipboard::getInstance().gotData()) { - options.emplace_back(utils::localize.get("sms_paste"), [=](gui::Item &item) { + options.emplace_back(utils::translate("sms_paste"), [=](gui::Item &item) { text->addText(Clipboard::getInstance().paste()); app->returnToPreviousWindow(); return true; diff --git a/module-apps/application-messages/windows/SMSTemplatesWindow.cpp b/module-apps/application-messages/windows/SMSTemplatesWindow.cpp index 2bf165c45..849b92593 100644 --- a/module-apps/application-messages/windows/SMSTemplatesWindow.cpp +++ b/module-apps/application-messages/windows/SMSTemplatesWindow.cpp @@ -38,10 +38,10 @@ namespace gui { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_messages_templates")); + setTitle(utils::translate("app_messages_templates")); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::use)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::use)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); namespace style = style::messages::templates::list; diff --git a/module-apps/application-messages/windows/SMSThreadViewWindow.cpp b/module-apps/application-messages/windows/SMSThreadViewWindow.cpp index a5e51ae5a..60a124ac6 100644 --- a/module-apps/application-messages/windows/SMSThreadViewWindow.cpp +++ b/module-apps/application-messages/windows/SMSThreadViewWindow.cpp @@ -28,9 +28,9 @@ namespace gui smsModel{std::make_shared(app)} { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_messages_title_main")); - bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get(style::strings::common::options)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + setTitle(utils::translate("app_messages_title_main")); + bottomBar->setText(BottomBar::Side::LEFT, utils::translate(style::strings::common::options)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); smsList = new gui::ListView(this, style::messages::smsList::x, diff --git a/module-apps/application-messages/windows/SearchResults.cpp b/module-apps/application-messages/windows/SearchResults.cpp index 0606c079e..aadd44bae 100644 --- a/module-apps/application-messages/windows/SearchResults.cpp +++ b/module-apps/application-messages/windows/SearchResults.cpp @@ -19,11 +19,11 @@ namespace gui namespace msgThreadStyle = style::messages::threads; AppWindow::buildInterface(); - setTitle(utils::localize.get("app_messages_title_main")); + setTitle(utils::translate("app_messages_title_main")); bottomBar->setActive(BottomBar::Side::CENTER, true); bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::search)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::search)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); body = new gui::Item(); body->setBoundingBox(bodySize()); addWidget(body); diff --git a/module-apps/application-messages/windows/SearchStart.cpp b/module-apps/application-messages/windows/SearchStart.cpp index 4b4520987..e54c715fa 100644 --- a/module-apps/application-messages/windows/SearchStart.cpp +++ b/module-apps/application-messages/windows/SearchStart.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "SearchStart.hpp" @@ -13,15 +13,15 @@ namespace gui SMSSearch::SMSSearch(app::Application *app) : AppWindow(app, name::window::thread_sms_search) { buildInterface(); - setTitle(utils::localize.get("app_messages_title_main")); + setTitle(utils::translate("app_messages_title_main")); bottomBar->setActive(BottomBar::Side::CENTER, true); bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::search)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::search)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); body = new gui::Item(); body->setBoundingBox(bodySize()); addWidget(body); - auto text = inputBox(this, utils::localize.get("common_search_uc"), "search"); + auto text = inputBox(this, utils::translate("common_search_uc"), "search"); text->setInputMode(new InputMode( {InputMode::ABC, InputMode::abc, InputMode::digit}, [=](const UTF8 &Text) { application->getCurrentWindow()->bottomBarTemporaryMode(Text); }, @@ -36,7 +36,7 @@ namespace gui } if (inputEvent.keyCode == KeyCode::KEY_ENTER) { auto search_text = text->getText(); - app->showSearchResults(utils::localize.get("common_search_results") + ": " + std::string(search_text), + app->showSearchResults(utils::translate("common_search_results") + ": " + std::string(search_text), search_text); return true; } diff --git a/module-apps/application-messages/windows/ThreadWindowOptions.cpp b/module-apps/application-messages/windows/ThreadWindowOptions.cpp index 66711c8b2..dbde2d448 100644 --- a/module-apps/application-messages/windows/ThreadWindowOptions.cpp +++ b/module-apps/application-messages/windows/ThreadWindowOptions.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "ThreadWindowOptions.hpp" @@ -25,28 +25,28 @@ std::list threadWindowOptions(app::ApplicationMessages *app, const options.emplace_back(gui::Option{std::make_unique(app, contactOperation, contact)}); if (record->isUnread()) { - options.emplace_back(gui::Option{utils::localize.get("sms_mark_read"), [=](gui::Item &item) { + options.emplace_back(gui::Option{utils::translate("sms_mark_read"), [=](gui::Item &item) { app->markSmsThreadAsRead(record->ID); app->returnToPreviousWindow(); return true; }}); } else { - options.emplace_back(gui::Option{utils::localize.get("sms_mark_unread"), [=](gui::Item &item) { + options.emplace_back(gui::Option{utils::translate("sms_mark_unread"), [=](gui::Item &item) { app->markSmsThreadAsUnread(record->ID); app->returnToPreviousWindow(); return true; }}); } - options.emplace_back(gui::Option{utils::localize.get("sms_delete_conversation"), [=](gui::Item &item) { + options.emplace_back(gui::Option{utils::translate("sms_delete_conversation"), [=](gui::Item &item) { LOG_INFO("Removing sms thread!"); return app->removeSmsThread(record); }}); // TODO // shouldn't this be in show contact details actually? it would be much easier too - // {utils::localize.get("sms_add_to_contacts"), [=](gui::Item &item) { return true; }}, + // {utils::translate("sms_add_to_contacts"), [=](gui::Item &item) { return true; }}, return options; }; diff --git a/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp b/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp index 7b1bbae1e..241bcf0f4 100644 --- a/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp +++ b/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp @@ -30,10 +30,10 @@ namespace gui { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_music_player_all_songs")); + setTitle(utils::translate("app_music_player_all_songs")); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get("app_music_player_play")); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate("app_music_player_play")); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); songsList = new gui::ListView(this, musicPlayerStyle::allSongsWindow::x, diff --git a/module-apps/application-music-player/windows/MusicPlayerEmptyWindow.cpp b/module-apps/application-music-player/windows/MusicPlayerEmptyWindow.cpp index 3a0765231..ff9326662 100644 --- a/module-apps/application-music-player/windows/MusicPlayerEmptyWindow.cpp +++ b/module-apps/application-music-player/windows/MusicPlayerEmptyWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "MusicPlayerEmptyWindow.hpp" @@ -30,13 +30,13 @@ namespace gui { AppWindow::buildInterface(); - bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get("app_music_player_music_library")); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get("app_music_player_quit")); + bottomBar->setText(BottomBar::Side::LEFT, utils::translate("app_music_player_music_library")); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate("app_music_player_quit")); img = new gui::Image(this, noteImg::x, noteImg::y, "note"); text = new Text(this, infoText::x, infoText::y, infoText::w, infoText::h); - text->setText(utils::localize.get("app_music_player_music_empty_window_notification")); + text->setText(utils::translate("app_music_player_music_empty_window_notification")); text->setTextType(TextType::MultiLine); text->setEditMode(EditMode::Browse); text->setEdges(RectangleEdge::None); diff --git a/module-apps/application-notes/ApplicationNotes.cpp b/module-apps/application-notes/ApplicationNotes.cpp index 436da2350..1c85f3079 100644 --- a/module-apps/application-notes/ApplicationNotes.cpp +++ b/module-apps/application-notes/ApplicationNotes.cpp @@ -121,7 +121,7 @@ namespace app return std::make_unique(app, name); }); windowsFactory.attach( - utils::localize.get("app_phonebook_options_title"), + utils::translate("app_phonebook_options_title"), [](Application *app, const std::string &name) { return std::make_unique(app, name); }); attachPopups({gui::popup::ID::Volume, diff --git a/module-apps/application-notes/model/NotesListModel.cpp b/module-apps/application-notes/model/NotesListModel.cpp index ec438cca0..f444b929d 100644 --- a/module-apps/application-notes/model/NotesListModel.cpp +++ b/module-apps/application-notes/model/NotesListModel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "NotesListModel.hpp" @@ -53,7 +53,7 @@ namespace app::notes item->inputCallback = [this, note = note.get()](gui::Item &, const gui::InputEvent &event) { if (event.isShortPress() && event.is(gui::KeyCode::KEY_LF)) { application->switchWindow( - utils::localize.get("app_phonebook_options_title"), + utils::translate("app_phonebook_options_title"), std::make_unique(noteListOptions(application, *note, *notesRepository))); } return false; diff --git a/module-apps/application-notes/widgets/NotesItem.cpp b/module-apps/application-notes/widgets/NotesItem.cpp index df8f7b33a..6375c1596 100644 --- a/module-apps/application-notes/widgets/NotesItem.cpp +++ b/module-apps/application-notes/widgets/NotesItem.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "NotesItem.hpp" @@ -57,7 +57,7 @@ namespace gui void NotesItem::setDateText(std::uint32_t timestamp) { if (auto dt = utils::time::DateTime(timestamp); dt.isYesterday()) { - date->setText(utils::localize.get("common_yesterday")); + date->setText(utils::translate("common_yesterday")); } else { date->setText(dt); diff --git a/module-apps/application-notes/windows/NoteEditWindow.cpp b/module-apps/application-notes/windows/NoteEditWindow.cpp index db86a837f..d1c6d8259 100644 --- a/module-apps/application-notes/windows/NoteEditWindow.cpp +++ b/module-apps/application-notes/windows/NoteEditWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "NoteEditWindow.hpp" @@ -49,7 +49,7 @@ namespace app::notes { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_notes_edit_new_note")); + setTitle(utils::translate("app_notes_edit_new_note")); namespace editStyle = app::notes::style::edit; charactersCounter = new gui::Label( @@ -77,13 +77,13 @@ namespace app::notes edit->setTextLimitType(gui::TextLimitType::MaxSignsCount, MaxCharactersCount); bottomBar->setActive(gui::BottomBar::Side::LEFT, true); - bottomBar->setText(gui::BottomBar::Side::LEFT, utils::localize.get(::style::strings::common::options)); + bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate(::style::strings::common::options)); bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(::style::strings::common::save)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(::style::strings::common::save)); bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(::style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(::style::strings::common::back)); setFocusItem(edit); } @@ -129,7 +129,7 @@ namespace app::notes } if (inputEvent.is(gui::KeyCode::KEY_LF)) { application->switchWindow( - utils::localize.get("app_phonebook_options_title"), + utils::translate("app_phonebook_options_title"), std::make_unique(noteEditOptions(application, *notesRecord, edit))); } } diff --git a/module-apps/application-notes/windows/NoteMainWindow.cpp b/module-apps/application-notes/windows/NoteMainWindow.cpp index 8f376f07a..87c5376ea 100644 --- a/module-apps/application-notes/windows/NoteMainWindow.cpp +++ b/module-apps/application-notes/windows/NoteMainWindow.cpp @@ -45,14 +45,14 @@ namespace app::notes { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_notes_title_main")); + setTitle(utils::translate("app_notes_title_main")); bottomBar->setActive(gui::BottomBar::Side::LEFT, true); - bottomBar->setText(gui::BottomBar::Side::LEFT, utils::localize.get(::style::strings::common::options)); + bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate(::style::strings::common::options)); bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(::style::strings::common::open)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(::style::strings::common::open)); bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(::style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(::style::strings::common::back)); namespace windowStyle = app::notes::style::main_window; leftArrowImage = new gui::Image(this, @@ -103,7 +103,7 @@ namespace app::notes ::style::window_width, ::style::window_height - ::style::header::height - ::style::footer::height, "phonebook_empty_grey_circle_W_G", - utils::localize.get("app_notes_no_notes")); + utils::translate("app_notes_no_notes")); emptyListIcon->focusChangedCallback = [this]([[maybe_unused]] gui::Item &item) { onEmptyList(); return true; diff --git a/module-apps/application-notes/windows/NotePreviewWindow.cpp b/module-apps/application-notes/windows/NotePreviewWindow.cpp index b8cdd4d37..0ead81d42 100644 --- a/module-apps/application-notes/windows/NotePreviewWindow.cpp +++ b/module-apps/application-notes/windows/NotePreviewWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "NotePreviewWindow.hpp" @@ -49,7 +49,7 @@ namespace app::notes { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_notes_title_main")); + setTitle(utils::translate("app_notes_title_main")); namespace previewStyle = app::notes::style::preview; date = new gui::Label( @@ -71,13 +71,13 @@ namespace app::notes note->setCursorStartPosition(gui::CursorStartPosition::DocumentBegin); bottomBar->setActive(gui::BottomBar::Side::LEFT, true); - bottomBar->setText(gui::BottomBar::Side::LEFT, utils::localize.get(::style::strings::common::options)); + bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate(::style::strings::common::options)); bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get("app_notes_edit")); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate("app_notes_edit")); bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(::style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(::style::strings::common::back)); setFocusItem(note); } @@ -98,12 +98,12 @@ namespace app::notes { utils::time::DateTime dt{timestamp}; std::ostringstream dateText; - dateText << utils::localize.get("app_notes_edited") << ": "; + dateText << utils::translate("app_notes_edited") << ": "; if (dt.isToday()) { - dateText << utils::localize.get("common_today") << ", "; + dateText << utils::translate("common_today") << ", "; } else if (dt.isYesterday()) { - dateText << utils::localize.get("common_yesterday") << ", "; + dateText << utils::translate("common_yesterday") << ", "; } dateText << dt; date->setText(dateText.str()); @@ -116,7 +116,7 @@ namespace app::notes application->switchWindow(gui::name::window::note_edit, std::make_unique(*notesRecord)); } else if (inputEvent.is(gui::KeyCode::KEY_LF)) { - application->switchWindow(utils::localize.get("app_phonebook_options_title"), + application->switchWindow(utils::translate("app_phonebook_options_title"), std::make_unique(notePreviewOptions( application, *notesRecord, presenter->getRepository(), note))); } diff --git a/module-apps/application-notes/windows/NotesOptions.cpp b/module-apps/application-notes/windows/NotesOptions.cpp index f873b08ee..154e183b9 100644 --- a/module-apps/application-notes/windows/NotesOptions.cpp +++ b/module-apps/application-notes/windows/NotesOptions.cpp @@ -21,15 +21,15 @@ namespace app::notes std::function onClickCallback, std::list &options) { - options.emplace_back(utils::localize.get(translationId), onClickCallback); + options.emplace_back(utils::translate(translationId), onClickCallback); } void removeNote(const NotesRecord &record, Application *application, AbstractNotesRepository ¬esRepository) { auto metaData = std::make_unique( - gui::DialogMetadata{utils::localize.get("app_alarm_clock_title_main"), + gui::DialogMetadata{utils::translate("app_alarm_clock_title_main"), "phonebook_contact_delete_trashcan", - utils::localize.get("app_notes_note_delete_confirmation"), + utils::translate("app_notes_note_delete_confirmation"), "", [record, application, ¬esRepository] { notesRepository.remove(record, [application](bool) { diff --git a/module-apps/application-notes/windows/SearchEngineWindow.cpp b/module-apps/application-notes/windows/SearchEngineWindow.cpp index f42ddd01c..3ebb909d7 100644 --- a/module-apps/application-notes/windows/SearchEngineWindow.cpp +++ b/module-apps/application-notes/windows/SearchEngineWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "SearchEngineWindow.hpp" @@ -27,14 +27,14 @@ namespace app::notes void SearchEngineWindow::buildInterface() { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_notes_title_main")); + setTitle(utils::translate("app_notes_title_main")); bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(style::strings::common::search)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::search)); bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); - input = gui::inputBox(this, utils::localize.get("common_search_uc"), "search"); + input = gui::inputBox(this, utils::translate("common_search_uc"), "search"); setFocusItem(input); } diff --git a/module-apps/application-notes/windows/SearchResultsWindow.cpp b/module-apps/application-notes/windows/SearchResultsWindow.cpp index 944cec0e3..1c5a24d3f 100644 --- a/module-apps/application-notes/windows/SearchResultsWindow.cpp +++ b/module-apps/application-notes/windows/SearchResultsWindow.cpp @@ -27,12 +27,12 @@ namespace app::notes void SearchResultsWindow::buildInterface() { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_notes_title_main")); + setTitle(utils::translate("app_notes_title_main")); bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(::style::strings::common::open)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(::style::strings::common::open)); bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(::style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(::style::strings::common::back)); list = new gui::ListView(this, style::list::X, @@ -71,9 +71,9 @@ namespace app::notes void SearchResultsWindow::onNothingFound(const std::string &searchText) { - gui::DialogMetadata meta{utils::localize.get("common_results_prefix") + searchText, + gui::DialogMetadata meta{utils::translate("common_results_prefix") + searchText, "search_big", - utils::localize.get("app_notes_search_no_results")}; + utils::translate("app_notes_search_no_results")}; auto data = std::make_unique(meta); data->ignoreCurrentWindowOnStack = true; application->switchWindow(gui::name::window::note_dialog, std::move(data)); diff --git a/module-apps/application-onboarding/model/EULARepository.cpp b/module-apps/application-onboarding/model/EULARepository.cpp index e5de9a2d1..7f9ef4590 100644 --- a/module-apps/application-onboarding/model/EULARepository.cpp +++ b/module-apps/application-onboarding/model/EULARepository.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include @@ -16,12 +16,12 @@ namespace app::onBoarding std::string EULARepository::getEulaText() { - auto displayLanguageName = utils::localize.getDisplayLanguage(); + const auto &displayLanguageName = utils::getDisplayLanguage(); auto eulaFile = std::ifstream(licensesPath / displayLanguageName / fileName); auto fileHandlerCleanup = gsl::finally([&eulaFile]() { eulaFile.close(); }); if (!eulaFile.is_open()) { - eulaFile.open(licensesPath / utils::i18n::DefaultLanguage / fileName); + eulaFile.open(licensesPath / utils::getDefaultLanguage() / fileName); if (!eulaFile.is_open()) { throw std::runtime_error("EULA assets missing in system!"); diff --git a/module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.cpp b/module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.cpp index d471ee2f0..76f2460a4 100644 --- a/module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.cpp +++ b/module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.cpp @@ -15,7 +15,7 @@ namespace app::onBoarding ConfigurationSuccessfulDialogWindow::ConfigurationSuccessfulDialogWindow(app::Application *app) : gui::Dialog(app, gui::window::name::onBoarding_configuration_successful) { - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(style::strings::common::start)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::start)); bottomBar->setActive(gui::BottomBar::Side::RIGHT, false); } @@ -24,9 +24,9 @@ namespace app::onBoarding if (inputEvent.isShortPress()) { if (inputEvent.is(gui::KeyCode::KEY_ENTER)) { auto metaData = std::make_unique( - gui::DialogMetadata{utils::localize.get("app_onboarding_title_update_info"), + gui::DialogMetadata{utils::translate("app_onboarding_title_update_info"), "update_icon_W_G", - utils::localize.get("app_onboarding_update_info"), + utils::translate("app_onboarding_update_info"), "", [=]() -> bool { return true; }}); application->switchWindow( diff --git a/module-apps/application-onboarding/windows/ConfigurePasscodeWindow.cpp b/module-apps/application-onboarding/windows/ConfigurePasscodeWindow.cpp index 0147201d2..cd9e5a4ad 100644 --- a/module-apps/application-onboarding/windows/ConfigurePasscodeWindow.cpp +++ b/module-apps/application-onboarding/windows/ConfigurePasscodeWindow.cpp @@ -41,14 +41,14 @@ namespace gui void ConfigurePasscodeWindow::buildBottomBar() { - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::confirm)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); - bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get(style::strings::common::skip)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::confirm)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::LEFT, utils::translate(style::strings::common::skip)); } void ConfigurePasscodeWindow::buildTitleBar() { - setTitle(utils::localize.get("app_onboarding_passcode_configuration")); + setTitle(utils::translate("app_onboarding_passcode_configuration")); } void ConfigurePasscodeWindow::processPasscode() @@ -74,9 +74,9 @@ namespace gui case PinLock::LockState::NewPasscodeInvalid: { auto metaData = std::make_unique( - gui::DialogMetadata{utils::localize.get("app_onboarding_passcode_configuration"), + gui::DialogMetadata{utils::translate("app_onboarding_passcode_configuration"), "info_big_circle_W_G", - utils::localize.get("app_onboarding_wrong_password"), + utils::translate("app_onboarding_wrong_password"), "", [this]() { application->switchWindow(gui::window::name::onBoarding_configure_passcode, diff --git a/module-apps/application-onboarding/windows/EULALicenseWindow.cpp b/module-apps/application-onboarding/windows/EULALicenseWindow.cpp index ee85fcf94..82b935c5a 100644 --- a/module-apps/application-onboarding/windows/EULALicenseWindow.cpp +++ b/module-apps/application-onboarding/windows/EULALicenseWindow.cpp @@ -40,7 +40,7 @@ namespace app::onBoarding { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_onboarding_eula_license")); + setTitle(utils::translate("app_onboarding_eula_license")); namespace previewStyle = app::notes::style::preview; eulaText = new gui::Text( @@ -56,10 +56,10 @@ namespace app::onBoarding bottomBar->setActive(gui::BottomBar::Side::LEFT, true); bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(::style::strings::common::accept)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(::style::strings::common::accept)); bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(::style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(::style::strings::common::back)); setFocusItem(eulaText); } diff --git a/module-apps/application-onboarding/windows/NoConfigurationDialogWindow.cpp b/module-apps/application-onboarding/windows/NoConfigurationDialogWindow.cpp index 8599a1e41..8fa556f46 100644 --- a/module-apps/application-onboarding/windows/NoConfigurationDialogWindow.cpp +++ b/module-apps/application-onboarding/windows/NoConfigurationDialogWindow.cpp @@ -15,7 +15,7 @@ namespace app::onBoarding NoConfigurationDialogWindow::NoConfigurationDialogWindow(app::Application *app) : gui::Dialog(app, gui::window::name::onBoarding_no_configuration) { - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(style::strings::common::start)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::start)); bottomBar->setActive(gui::BottomBar::Side::RIGHT, false); } @@ -24,9 +24,9 @@ namespace app::onBoarding if (inputEvent.isShortPress()) { if (inputEvent.is(gui::KeyCode::KEY_ENTER)) { auto metaData = std::make_unique( - gui::DialogMetadata{utils::localize.get("app_onboarding_title_update_info"), + gui::DialogMetadata{utils::translate("app_onboarding_title_update_info"), "update_icon_W_G", - utils::localize.get("app_onboarding_update_info"), + utils::translate("app_onboarding_update_info"), "", [=]() -> bool { return true; }}); application->switchWindow( diff --git a/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.cpp b/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.cpp index 8de827cdd..f157329db 100644 --- a/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.cpp +++ b/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.cpp @@ -24,9 +24,9 @@ namespace app::onBoarding { DateAndTimeMainWindow::onBeforeShow(mode, data); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(style::strings::common::save)); - bottomBar->setText(gui::BottomBar::Side::LEFT, utils::localize.get(style::strings::common::Switch)); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::save)); + bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate(style::strings::common::Switch)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); } bool OnBoardingDateAndTimeWindow::onInput(const gui::InputEvent &inputEvent) @@ -43,9 +43,9 @@ namespace app::onBoarding } else if (inputEvent.isShortPress() && inputEvent.is(gui::KeyCode::KEY_ENTER)) { auto metaData = std::make_unique( - gui::DialogMetadata{utils::localize.get("app_onboarding_title_configuration"), + gui::DialogMetadata{utils::translate("app_onboarding_title_configuration"), "success_icon_W_G", - utils::localize.get("app_onboarding_configuration_successful"), + utils::translate("app_onboarding_configuration_successful"), "", [=]() -> bool { return true; }}); application->switchWindow(gui::window::name::onBoarding_configuration_successful, @@ -60,13 +60,13 @@ namespace app::onBoarding bool OnBoardingDateAndTimeWindow::bottomBarCallback(gui::Item &item) { - setBottomBarText(utils::localize.get(style::strings::common::save), gui::BottomBar::Side::CENTER); + setBottomBarText(utils::translate(style::strings::common::save), gui::BottomBar::Side::CENTER); if (item.focus) { - setBottomBarText(utils::localize.get(style::strings::common::Switch), gui::BottomBar::Side::LEFT); + setBottomBarText(utils::translate(style::strings::common::Switch), gui::BottomBar::Side::LEFT); } else { - setBottomBarText(utils::localize.get(style::strings::common::select), gui::BottomBar::Side::LEFT); + setBottomBarText(utils::translate(style::strings::common::select), gui::BottomBar::Side::LEFT); } return true; } diff --git a/module-apps/application-onboarding/windows/OnBoardingMainWindow.cpp b/module-apps/application-onboarding/windows/OnBoardingMainWindow.cpp index 20f05ebf8..b44601935 100644 --- a/module-apps/application-onboarding/windows/OnBoardingMainWindow.cpp +++ b/module-apps/application-onboarding/windows/OnBoardingMainWindow.cpp @@ -23,7 +23,7 @@ namespace app::onBoarding AppWindow::buildInterface(); bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(::style::strings::common::start)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(::style::strings::common::start)); new gui::Image(this, 0, 0, 0, 0, "logo"); } diff --git a/module-apps/application-onboarding/windows/StartConfigurationWindow.cpp b/module-apps/application-onboarding/windows/StartConfigurationWindow.cpp index 8a346615e..5697a1b64 100644 --- a/module-apps/application-onboarding/windows/StartConfigurationWindow.cpp +++ b/module-apps/application-onboarding/windows/StartConfigurationWindow.cpp @@ -27,11 +27,11 @@ namespace app::onBoarding AppWindow::buildInterface(); bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(::style::strings::common::start)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(::style::strings::common::start)); bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::localize.get(::style::strings::common::back)); + bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(::style::strings::common::back)); bottomBar->setActive(gui::BottomBar::Side::LEFT, true); - bottomBar->setText(gui::BottomBar::Side::LEFT, utils::localize.get(::style::strings::common::skip)); + bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate(::style::strings::common::skip)); new gui::Icon(this, 0, @@ -39,7 +39,7 @@ namespace app::onBoarding style::window_width, style::window::default_body_height, "logo_no_text", - utils::localize.get("app_onboarding_start_configuration")); + utils::translate("app_onboarding_start_configuration")); } bool StartConfigurationWindow::onInput(const gui::InputEvent &inputEvent) @@ -58,15 +58,15 @@ namespace app::onBoarding if (inputEvent.is(gui::KeyCode::KEY_LF)) { auto metaData = std::make_unique(gui::DialogMetadata{ - utils::localize.get("app_onboarding_title"), + utils::translate("app_onboarding_title"), "info_icon_W_G", - utils::localize.get("app_onboarding_skip_confirm"), + utils::translate("app_onboarding_skip_confirm"), "", [=]() -> bool { auto metaData = std::make_unique( - gui::DialogMetadata{utils::localize.get("app_onboarding_title_configuration"), + gui::DialogMetadata{utils::translate("app_onboarding_title_configuration"), "info_icon_W_G", - utils::localize.get("app_onboarding_no_configuration"), + utils::translate("app_onboarding_no_configuration"), "", [=]() -> bool { return true; }}); diff --git a/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp b/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp index 689ccc390..03b900f98 100644 --- a/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp +++ b/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp @@ -15,7 +15,7 @@ namespace app::onBoarding UpdateDialogWindow::UpdateDialogWindow(app::Application *app) : gui::Dialog(app, gui::window::name::onBoarding_update) { - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::localize.get(style::strings::common::ok)); + bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::ok)); bottomBar->setActive(gui::BottomBar::Side::RIGHT, false); } diff --git a/module-apps/application-phonebook/ApplicationPhonebook.cpp b/module-apps/application-phonebook/ApplicationPhonebook.cpp index c5de98416..0160e986a 100644 --- a/module-apps/application-phonebook/ApplicationPhonebook.cpp +++ b/module-apps/application-phonebook/ApplicationPhonebook.cpp @@ -193,8 +193,8 @@ namespace app { gui::DialogMetadata meta; meta.icon = "search_big"; - meta.text = utils::localize.get("app_phonebook_search_no_results"); - meta.title = utils::localize.get("common_results_prefix") + "\"" + query + "\""; + meta.text = utils::translate("app_phonebook_search_no_results"); + meta.title = utils::translate("common_results_prefix") + "\"" + query + "\""; auto data = std::make_unique(meta); data->ignoreCurrentWindowOnStack = true; LOG_DEBUG("Switching to app_phonebook_search_no_results window."); diff --git a/module-apps/application-phonebook/widgets/ContactFlagsWidget.cpp b/module-apps/application-phonebook/widgets/ContactFlagsWidget.cpp index 4d1f035e2..6b2e21f2d 100644 --- a/module-apps/application-phonebook/widgets/ContactFlagsWidget.cpp +++ b/module-apps/application-phonebook/widgets/ContactFlagsWidget.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "ContactFlagsWidget.hpp" @@ -65,10 +65,10 @@ namespace gui void ContactFlagsWidget::initGUIIcons() { - favouritesIcon = new ContactFlagIconWidget("small_heart_W_M", utils::localize.get("FAVOURITES"), this); - speedDialIcon = new ContactFlagIconWidget(speedDialPos, utils::localize.get("SPEED DIAL"), this); - iceIcon = new ContactFlagIconWidget("ice", utils::localize.get("ICE"), this); - blockedIcon = new ContactFlagIconWidget("block", utils::localize.get("BLOCKED"), this); + favouritesIcon = new ContactFlagIconWidget("small_heart_W_M", utils::translate("FAVOURITES"), this); + speedDialIcon = new ContactFlagIconWidget(speedDialPos, utils::translate("SPEED DIAL"), this); + iceIcon = new ContactFlagIconWidget("ice", utils::translate("ICE"), this); + blockedIcon = new ContactFlagIconWidget("block", utils::translate("BLOCKED"), this); } void ContactFlagsWidget::buildWidget() diff --git a/module-apps/application-phonebook/widgets/InformationWidget.cpp b/module-apps/application-phonebook/widgets/InformationWidget.cpp index d8fd02ed3..cf5be06bf 100644 --- a/module-apps/application-phonebook/widgets/InformationWidget.cpp +++ b/module-apps/application-phonebook/widgets/InformationWidget.cpp @@ -23,7 +23,7 @@ namespace gui vBox = new VBox(this, 0, 0, 0, 0); vBox->setEdges(RectangleEdge::None); - titleLabel = new Label(vBox, 0, 0, 0, 0, utils::localize.get("app_phonebook_contact_information")); + titleLabel = new Label(vBox, 0, 0, 0, 0, utils::translate("app_phonebook_contact_information")); titleLabel->setMinimumSize(phonebookStyle::informationWidget::w, phonebookStyle::informationWidget::title_label_h); titleLabel->setEdges(RectangleEdge::None); diff --git a/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp b/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp index c4007c9d6..6af44ba79 100644 --- a/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp +++ b/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "InputBoxWithLabelAndIconWidget.hpp" @@ -96,7 +96,7 @@ namespace gui void InputBoxWithLabelAndIconWidget::speedDialKeyHandler() { - descriptionLabel->setText(utils::localize.get("app_phonebook_new_speed_dial_key")); + descriptionLabel->setText(utils::translate("app_phonebook_new_speed_dial_key")); iconImage->set("speed_dial_empty_W_M"); focusChangedCallback = [&](gui::Item &item) { @@ -130,7 +130,7 @@ namespace gui void InputBoxWithLabelAndIconWidget::addToFavouritesHandler() { - descriptionLabel->setText(utils::localize.get("app_phonebook_new_add_to_fav")); + descriptionLabel->setText(utils::translate("app_phonebook_new_add_to_fav")); iconImage->set("small_heart_W_M"); tickImage->set("small_tick_W_M"); @@ -138,10 +138,10 @@ namespace gui if (focus) { setFocusItem(inputBoxLabel); if (tickImage->visible) { - bottomBarTemporaryMode(utils::localize.get("app_phonebook_uncheck")); + bottomBarTemporaryMode(utils::translate("app_phonebook_uncheck")); } else { - bottomBarTemporaryMode(utils::localize.get("app_phonebook_check")); + bottomBarTemporaryMode(utils::translate("app_phonebook_check")); } } else { @@ -158,10 +158,10 @@ namespace gui if (event.keyCode == gui::KeyCode::KEY_LF) { tickImage->setVisible(!tickImage->visible); if (tickImage->visible) { - bottomBarTemporaryMode(utils::localize.get("app_phonebook_uncheck")); + bottomBarTemporaryMode(utils::translate("app_phonebook_uncheck")); } else { - bottomBarTemporaryMode(utils::localize.get("app_phonebook_check")); + bottomBarTemporaryMode(utils::translate("app_phonebook_check")); } hBox->resizeItems(); return true; @@ -176,7 +176,7 @@ namespace gui } void InputBoxWithLabelAndIconWidget::addToICEHandler() { - descriptionLabel->setText(utils::localize.get("app_phonebook_new_add_to_ice")); + descriptionLabel->setText(utils::translate("app_phonebook_new_add_to_ice")); iconImage->set("ice"); tickImage->set("small_tick_W_M"); @@ -184,10 +184,10 @@ namespace gui if (focus) { setFocusItem(inputBoxLabel); if (tickImage->visible) { - bottomBarTemporaryMode(utils::localize.get("app_phonebook_uncheck")); + bottomBarTemporaryMode(utils::translate("app_phonebook_uncheck")); } else { - bottomBarTemporaryMode(utils::localize.get("app_phonebook_check")); + bottomBarTemporaryMode(utils::translate("app_phonebook_check")); } } else { @@ -205,10 +205,10 @@ namespace gui if (event.keyCode == gui::KeyCode::KEY_LF) { tickImage->setVisible(!tickImage->visible); if (tickImage->visible) { - bottomBarTemporaryMode(utils::localize.get("app_phonebook_uncheck")); + bottomBarTemporaryMode(utils::translate("app_phonebook_uncheck")); } else { - bottomBarTemporaryMode(utils::localize.get("app_phonebook_check")); + bottomBarTemporaryMode(utils::translate("app_phonebook_check")); } hBox->resizeItems(); return true; diff --git a/module-apps/application-phonebook/widgets/InputLinesWithLabelIWidget.cpp b/module-apps/application-phonebook/widgets/InputLinesWithLabelIWidget.cpp index dd3342952..1e1101942 100644 --- a/module-apps/application-phonebook/widgets/InputLinesWithLabelIWidget.cpp +++ b/module-apps/application-phonebook/widgets/InputLinesWithLabelIWidget.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "InputLinesWithLabelIWidget.hpp" @@ -127,7 +127,7 @@ namespace gui } void InputLinesWithLabelIWidget::firstNameHandler() { - titleLabel->setText(utils::localize.get("app_phonebook_new_contact_first_name")); + titleLabel->setText(utils::translate("app_phonebook_new_contact_first_name")); inputText->setTextType(TextType::SingleLine); onSaveCallback = [&](std::shared_ptr contact) { contact->primaryName = inputText->getText(); }; @@ -136,7 +136,7 @@ namespace gui } void InputLinesWithLabelIWidget::secondNameHandler() { - titleLabel->setText(utils::localize.get("app_phonebook_new_contact_second_name")); + titleLabel->setText(utils::translate("app_phonebook_new_contact_second_name")); inputText->setTextType(TextType::SingleLine); onSaveCallback = [&](std::shared_ptr contact) { @@ -147,7 +147,7 @@ namespace gui } void InputLinesWithLabelIWidget::numberHandler() { - titleLabel->setText(utils::localize.get("app_phonebook_new_contact_number")); + titleLabel->setText(utils::translate("app_phonebook_new_contact_number")); inputText->setTextType(TextType::SingleLine); inputText->setInputMode(new InputMode({InputMode::phone})); @@ -166,7 +166,7 @@ namespace gui } void InputLinesWithLabelIWidget::secondNumberHandler() { - titleLabel->setText(utils::localize.get("app_phonebook_new_contact_second_number")); + titleLabel->setText(utils::translate("app_phonebook_new_contact_second_number")); inputText->setTextType(TextType::SingleLine); inputText->setInputMode(new InputMode({InputMode::phone})); @@ -185,7 +185,7 @@ namespace gui } void InputLinesWithLabelIWidget::emailHandler() { - titleLabel->setText(utils::localize.get("app_phonebook_new_contact_email")); + titleLabel->setText(utils::translate("app_phonebook_new_contact_email")); inputText->setTextType(TextType::SingleLine); onSaveCallback = [&](std::shared_ptr contact) { contact->mail = inputText->getText(); }; @@ -194,7 +194,7 @@ namespace gui } void InputLinesWithLabelIWidget::addressHandler() { - titleLabel->setText(utils::localize.get("app_phonebook_new_contact_address")); + titleLabel->setText(utils::translate("app_phonebook_new_contact_address")); inputText->setTextType(TextType::SingleLine); onSaveCallback = [&](std::shared_ptr contact) { contact->address = inputText->getText(); }; @@ -202,7 +202,7 @@ namespace gui } void InputLinesWithLabelIWidget::noteHandler() { - titleLabel->setText(utils::localize.get("app_phonebook_new_contact_note")); + titleLabel->setText(utils::translate("app_phonebook_new_contact_note")); inputText->setTextType(TextType::SingleLine); onSaveCallback = [&](std::shared_ptr contact) { contact->note = inputText->getText(); }; diff --git a/module-apps/application-phonebook/widgets/OutputLinesTextWithLabelWidget.cpp b/module-apps/application-phonebook/widgets/OutputLinesTextWithLabelWidget.cpp index 9104733eb..137d84485 100644 --- a/module-apps/application-phonebook/widgets/OutputLinesTextWithLabelWidget.cpp +++ b/module-apps/application-phonebook/widgets/OutputLinesTextWithLabelWidget.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "OutputLinesTextWithLabelWidget.hpp" @@ -74,14 +74,14 @@ namespace gui void OutputLinesTextWithLabelWidget::addressHandler() { - titleLabel->setText(utils::localize.get("app_phonebook_new_contact_address")); + titleLabel->setText(utils::translate("app_phonebook_new_contact_address")); onLoadCallback = [&](std::shared_ptr contact) { multilineText->setText(contact->address); }; } void OutputLinesTextWithLabelWidget::noteHandler() { - titleLabel->setText(utils::localize.get("app_phonebook_new_contact_note")); + titleLabel->setText(utils::translate("app_phonebook_new_contact_note")); onLoadCallback = [&](std::shared_ptr contact) { multilineText->setText(contact->note); }; } diff --git a/module-apps/application-phonebook/windows/PhonebookContactDetails.cpp b/module-apps/application-phonebook/windows/PhonebookContactDetails.cpp index d6ca21c9a..cd995d0de 100644 --- a/module-apps/application-phonebook/windows/PhonebookContactDetails.cpp +++ b/module-apps/application-phonebook/windows/PhonebookContactDetails.cpp @@ -26,8 +26,8 @@ namespace gui { AppWindow::buildInterface(); - bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get(style::strings::common::options)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::LEFT, utils::translate(style::strings::common::options)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); contactFlagsWidget = new ContactFlagsWidget(this); diff --git a/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp b/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp index 83ad2e9d3..2452cbc9f 100644 --- a/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp +++ b/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp @@ -37,7 +37,7 @@ namespace gui auto PhonebookContactOptions::contactOptionsList() -> std::list { std::list options; - options.emplace_back(gui::Option{utils::localize.get("app_phonebook_options_edit"), [=](gui::Item &item) { + options.emplace_back(gui::Option{utils::translate("app_phonebook_options_edit"), [=](gui::Item &item) { LOG_INFO("Editing contact!"); std::unique_ptr data = std::make_unique(contact); @@ -46,7 +46,7 @@ namespace gui std::move(data)); return true; }}); - options.emplace_back(gui::Option{utils::localize.get("app_phonebook_options_forward_namecard"), + options.emplace_back(gui::Option{utils::translate("app_phonebook_options_forward_namecard"), [=](gui::Item &item) { LOG_INFO("Forwarding namecard!"); std::unique_ptr data = @@ -58,19 +58,18 @@ namespace gui }, gui::option::Arrow::Enabled}); if (contact->isOnBlocked()) { - options.emplace_back( - gui::Option{utils::localize.get("app_phonebook_options_unblock"), [=](gui::Item &item) { - LOG_INFO("Unblocking contact!"); - return contactBlock(false); - }}); + options.emplace_back(gui::Option{utils::translate("app_phonebook_options_unblock"), [=](gui::Item &item) { + LOG_INFO("Unblocking contact!"); + return contactBlock(false); + }}); } else { - options.emplace_back(gui::Option{utils::localize.get("app_phonebook_options_block"), [=](gui::Item &item) { + options.emplace_back(gui::Option{utils::translate("app_phonebook_options_block"), [=](gui::Item &item) { LOG_INFO("Blocking contact!"); return contactBlock(true); }}); } - options.emplace_back(gui::Option{utils::localize.get("app_phonebook_options_delete"), [=](gui::Item &item) { + options.emplace_back(gui::Option{utils::translate("app_phonebook_options_delete"), [=](gui::Item &item) { LOG_INFO("Deleting contact!"); return contactRemove(); }}); @@ -83,10 +82,10 @@ namespace gui std::string dialogText; if (shouldBeBlocked) { - dialogText = utils::localize.get("app_phonebook_options_block_confirm"); + dialogText = utils::translate("app_phonebook_options_block_confirm"); } else { - dialogText = utils::localize.get("app_phonebook_options_unblock_confirm"); + dialogText = utils::translate("app_phonebook_options_unblock_confirm"); } auto contactRec = DBServiceAPI::ContactGetByID(this->application, contact->ID); @@ -120,7 +119,7 @@ namespace gui auto metaData = std::make_unique( gui::DialogMetadata{cont.getFormattedName(), "phonebook_contact_delete_trashcan", - utils::localize.get("app_phonebook_options_delete_confirm"), + utils::translate("app_phonebook_options_delete_confirm"), "", [=]() -> bool { if (!DBServiceAPI::ContactRemove(this->application, contact->ID)) { @@ -141,13 +140,13 @@ namespace gui switch (notificationType) { case NotificationType::Block: - dialogText = utils::localize.get("app_phonebook_options_block_notification"); + dialogText = utils::translate("app_phonebook_options_block_notification"); break; case NotificationType::Delete: - dialogText = utils::localize.get("app_phonebook_options_delete_notification"); + dialogText = utils::translate("app_phonebook_options_delete_notification"); break; case NotificationType::Unblock: - dialogText = utils::localize.get("app_phonebook_options_unblock_notification"); + dialogText = utils::translate("app_phonebook_options_unblock_notification"); break; } diff --git a/module-apps/application-phonebook/windows/PhonebookIceContacts.cpp b/module-apps/application-phonebook/windows/PhonebookIceContacts.cpp index 0cc077083..3426a691c 100644 --- a/module-apps/application-phonebook/windows/PhonebookIceContacts.cpp +++ b/module-apps/application-phonebook/windows/PhonebookIceContacts.cpp @@ -25,7 +25,7 @@ namespace gui { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_phonebook_ice_contacts_title")); + setTitle(utils::translate("app_phonebook_ice_contacts_title")); contactsListIce = new gui::ListView(this, phonebookStyle::iceContactsWindow::contactsListIce::x, @@ -39,8 +39,8 @@ namespace gui bottomBar->setActive(BottomBar::Side::LEFT, true); bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get(style::strings::common::call)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::LEFT, utils::translate(style::strings::common::call)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); } void PhonebookIceContacts::destroyInterface() diff --git a/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp b/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp index 13f497b70..2088f3792 100644 --- a/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp +++ b/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp @@ -30,7 +30,7 @@ namespace gui { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_phonebook_title_main")); + setTitle(utils::translate("app_phonebook_title_main")); leftArrowImage = new gui::Image(this, phonebookStyle::mainWindow::leftArrowImage::x, phonebookStyle::mainWindow::leftArrowImage::y, @@ -71,9 +71,9 @@ namespace gui bottomBar->setActive(BottomBar::Side::LEFT, true); bottomBar->setActive(BottomBar::Side::CENTER, true); bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get(style::strings::common::call)); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::open)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::LEFT, utils::translate(style::strings::common::call)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); auto app = application; inputMode = std::make_unique( diff --git a/module-apps/application-phonebook/windows/PhonebookNamecardOptions.cpp b/module-apps/application-phonebook/windows/PhonebookNamecardOptions.cpp index cbfd95cc9..599389060 100644 --- a/module-apps/application-phonebook/windows/PhonebookNamecardOptions.cpp +++ b/module-apps/application-phonebook/windows/PhonebookNamecardOptions.cpp @@ -61,12 +61,12 @@ namespace gui { std::list l; - l.emplace_back(gui::Option{utils::localize.get("app_phonebook_options_send_bt"), [=](gui::Item &item) { + l.emplace_back(gui::Option{utils::translate("app_phonebook_options_send_bt"), [=](gui::Item &item) { LOG_INFO("Sending namecard via bluetooth!"); sendViaBluetooth(); return true; }}); - l.emplace_back(gui::Option{utils::localize.get("app_phonebook_options_send_sms"), [=](gui::Item &item) { + l.emplace_back(gui::Option{utils::translate("app_phonebook_options_send_sms"), [=](gui::Item &item) { LOG_INFO("Sending namecard via SMS!"); sendViaSms(); return true; diff --git a/module-apps/application-phonebook/windows/PhonebookNewContact.cpp b/module-apps/application-phonebook/windows/PhonebookNewContact.cpp index 7c093866a..0ab51836e 100644 --- a/module-apps/application-phonebook/windows/PhonebookNewContact.cpp +++ b/module-apps/application-phonebook/windows/PhonebookNewContact.cpp @@ -30,10 +30,10 @@ namespace gui { AppWindow::buildInterface(); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::save)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::save)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); - setTitle(utils::localize.get("app_phonebook_contact_title")); + setTitle(utils::translate("app_phonebook_contact_title")); list = new gui::ListView(this, phonebookStyle::newContactWindow::newContactsList::x, @@ -65,10 +65,10 @@ namespace gui break; case ContactAction::Add: case ContactAction::EditTemporary: - setTitle(utils::localize.get("app_phonebook_contact_title")); + setTitle(utils::translate("app_phonebook_contact_title")); break; case ContactAction::Edit: - setTitle(utils::localize.get("app_phonebook_options_edit")); + setTitle(utils::translate("app_phonebook_options_edit")); break; } @@ -211,7 +211,7 @@ namespace gui contact->ID = oldContactRecord.ID; } - std::string duplicatedNumberPhrase = utils::localize.get("app_phonebook_duplicate_numbers"); + std::string duplicatedNumberPhrase = utils::translate("app_phonebook_duplicate_numbers"); phonebookUtils::fillContactData(duplicatedNumberPhrase, oldContactRecord); auto metaData = std::make_unique(gui::DialogMetadata{ @@ -235,9 +235,9 @@ namespace gui contact->ID = oldContactRecord.ID; } - std::string duplicatedSpeedDialPhrase = utils::localize.get("app_phonebook_duplicate_numbers"); + std::string duplicatedSpeedDialPhrase = utils::translate("app_phonebook_duplicate_numbers"); phonebookUtils::fillContactData(duplicatedSpeedDialPhrase, oldContactRecord); - std::string duplicatedSpeedDialTitle = utils::localize.get("app_phonebook_duplicate_speed_dial_title"); + std::string duplicatedSpeedDialTitle = utils::translate("app_phonebook_duplicate_speed_dial_title"); phonebookUtils::fillContactData(duplicatedSpeedDialTitle, oldContactRecord); auto metaData = std::make_unique( diff --git a/module-apps/application-phonebook/windows/PhonebookSearch.cpp b/module-apps/application-phonebook/windows/PhonebookSearch.cpp index 9efc785e9..ccca34c6c 100644 --- a/module-apps/application-phonebook/windows/PhonebookSearch.cpp +++ b/module-apps/application-phonebook/windows/PhonebookSearch.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "PhonebookSearch.hpp" @@ -17,9 +17,9 @@ namespace gui { AppWindow::buildInterface(); - setTitle(utils::localize.get("app_phonebook_title_main")); + setTitle(utils::translate("app_phonebook_title_main")); - inputField = inputBox(this, utils::localize.get("common_search_uc"), "search"); + inputField = inputBox(this, utils::translate("common_search_uc"), "search"); inputField->setInputMode(new InputMode( {InputMode::ABC, InputMode::abc, InputMode::digit}, [=](const UTF8 &Text) { application->getCurrentWindow()->bottomBarTemporaryMode(Text); }, @@ -30,8 +30,8 @@ namespace gui bottomBar->setActive(BottomBar::Side::CENTER, true); bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::search)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::search)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); setFocusItem(inputField); } diff --git a/module-apps/application-phonebook/windows/PhonebookSearchResults.cpp b/module-apps/application-phonebook/windows/PhonebookSearchResults.cpp index 1da2a5e96..0bf8887c7 100644 --- a/module-apps/application-phonebook/windows/PhonebookSearchResults.cpp +++ b/module-apps/application-phonebook/windows/PhonebookSearchResults.cpp @@ -38,9 +38,9 @@ namespace gui bottomBar->setActive(BottomBar::Side::CENTER, true); bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); - setTitle(utils::localize.get("common_results_prefix")); + setTitle(utils::translate("common_results_prefix")); } void PhonebookSearchResults::destroyInterface() @@ -70,18 +70,18 @@ namespace gui assert(searchResultsData != nullptr); searchResultsModel = searchResultsData->consumeSearchResultsModel(); - setTitle(utils::localize.get("common_results_prefix") + "\"" + searchResultsModel->getFilter() + "\""); + setTitle(utils::translate("common_results_prefix") + "\"" + searchResultsModel->getFilter() + "\""); searchResultList->setProvider(searchResultsModel); if (searchResultsModel->messagesSelectCallback) { bottomBar->setActive(BottomBar::Side::LEFT, false); bottomBar->setText(BottomBar::Side::LEFT, ""); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::select)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::select)); } else { bottomBar->setActive(BottomBar::Side::LEFT, true); - bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get(style::strings::common::call)); - bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::open)); + bottomBar->setText(BottomBar::Side::LEFT, utils::translate(style::strings::common::call)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); } return true; diff --git a/module-apps/application-settings-new/ApplicationSettings.cpp b/module-apps/application-settings-new/ApplicationSettings.cpp index bf46fa200..e89463476 100644 --- a/module-apps/application-settings-new/ApplicationSettings.cpp +++ b/module-apps/application-settings-new/ApplicationSettings.cpp @@ -207,9 +207,9 @@ namespace app switchWindow(gui::window::name::dialog_retry, gui::ShowMode::GUI_SHOW_INIT, std::make_unique( - gui::DialogMetadata{utils::localize.get("app_settings_bt"), + gui::DialogMetadata{utils::translate("app_settings_bt"), "info_big_circle_W_G", - utils::localize.get("app_settings_bluetooth_pairing_error_message"), + utils::translate("app_settings_bluetooth_pairing_error_message"), "", [=]() -> bool { bus.sendUnicast(std::make_shared(addr), @@ -237,9 +237,9 @@ namespace app switchWindow(gui::window::name::dialog_retry, gui::ShowMode::GUI_SHOW_INIT, std::make_unique( - gui::DialogMetadata{utils::localize.get("app_settings_bt"), + gui::DialogMetadata{utils::translate("app_settings_bt"), "info_big_circle_W_G", - utils::localize.get("app_settings_bluetooth_unpairing_error_message"), + utils::translate("app_settings_bluetooth_unpairing_error_message"), "", [=]() -> bool { bus.sendUnicast(std::make_shared(addr), @@ -261,9 +261,9 @@ namespace app switchWindow(gui::window::name::dialog_retry, gui::ShowMode::GUI_SHOW_INIT, std::make_unique(gui::DialogMetadata{ - utils::localize.get("app_settings_bt"), + utils::translate("app_settings_bt"), "info_big_circle_W_G", - utils::localize.get("app_settings_bluetooth_connecting_error_message"), + utils::translate("app_settings_bluetooth_connecting_error_message"), "", [=]() -> bool { bus.sendUnicast(std::make_shared(addr), @@ -283,9 +283,9 @@ namespace app switchWindow(gui::window::name::dialog_confirm, gui::ShowMode::GUI_SHOW_INIT, std::make_unique( - gui::DialogMetadata{utils::localize.get("app_settings_bt"), + gui::DialogMetadata{utils::translate("app_settings_bt"), "info_big_circle_W_G", - utils::localize.get("app_settings_bluetooth_init_error_message"), + utils::translate("app_settings_bluetooth_init_error_message"), "", [=]() -> bool { switchWindow(gui::window::name::bluetooth); @@ -371,7 +371,7 @@ namespace app { windowsFactory.attach(gui::name::window::main_window, [](Application *app, const std::string &name) { return std::make_unique( - app, utils::localize.get("app_settings_title_main_new"), mainWindowOptionsNew(app)); + app, utils::translate("app_settings_title_main_new"), mainWindowOptionsNew(app)); }); windowsFactory.attach(gui::window::name::bluetooth, [](Application *app, const std::string &name) { return std::make_unique(app); diff --git a/module-apps/application-settings-new/models/DateAndTimeModel.cpp b/module-apps/application-settings-new/models/DateAndTimeModel.cpp index c4c1bf47d..90c7e290b 100644 --- a/module-apps/application-settings-new/models/DateAndTimeModel.cpp +++ b/module-apps/application-settings-new/models/DateAndTimeModel.cpp @@ -62,7 +62,7 @@ void DateAndTimeModel::createData() dateItem = new gui::SettingsDateItem(); timeItem = new gui::SettingsTimeItem( - utils::localize.get("app_settings_title_time"), + utils::translate("app_settings_title_time"), gui::TimeWidget::Type::Start, [&](const UTF8 &text) { app->getCurrentWindow()->bottomBarTemporaryMode(text, false); }, [&]() { app->getCurrentWindow()->bottomBarRestoreFromTemporaryMode(); }); diff --git a/module-apps/application-settings-new/models/FromTimeToTimeModel.cpp b/module-apps/application-settings-new/models/FromTimeToTimeModel.cpp index 7452f82fd..1225977cb 100644 --- a/module-apps/application-settings-new/models/FromTimeToTimeModel.cpp +++ b/module-apps/application-settings-new/models/FromTimeToTimeModel.cpp @@ -60,13 +60,13 @@ unsigned int FromTimeToTimeModel::requestRecordsCount() void FromTimeToTimeModel::createData() { fromTimeItem = new gui::SettingsTimeItem( - utils::localize.get("app_settings_nightshift_from"), + utils::translate("app_settings_nightshift_from"), gui::TimeWidget::Type::Start, [&](const UTF8 &text) { app->getCurrentWindow()->bottomBarTemporaryMode(text, false); }, [&]() { app->getCurrentWindow()->bottomBarRestoreFromTemporaryMode(); }); toTimeItem = new gui::SettingsTimeItem( - utils::localize.get("app_settings_nightshift_to"), + utils::translate("app_settings_nightshift_to"), gui::TimeWidget::Type::End, [&](const UTF8 &text) { app->getCurrentWindow()->bottomBarTemporaryMode(text, false); }, [&]() { app->getCurrentWindow()->bottomBarRestoreFromTemporaryMode(); }); diff --git a/module-apps/application-settings-new/models/SARInfoRepository.cpp b/module-apps/application-settings-new/models/SARInfoRepository.cpp index 9b20b006c..da0fa2a4f 100644 --- a/module-apps/application-settings-new/models/SARInfoRepository.cpp +++ b/module-apps/application-settings-new/models/SARInfoRepository.cpp @@ -14,11 +14,11 @@ SARInfoRepository::SARInfoRepository(std::filesystem::path certificationInfoPath std::string SARInfoRepository::getSarInfoText() { - auto displayLanguageName = utils::localize.getDisplayLanguage(); + const auto &displayLanguageName = utils::getDisplayLanguage(); auto sarInfoFile = std::ifstream(certificationInfoPath / displayLanguageName / fileName); if (!sarInfoFile.is_open()) { - sarInfoFile.open(certificationInfoPath / utils::i18n::DefaultLanguage / fileName); + sarInfoFile.open(certificationInfoPath / utils::getDefaultLanguage() / fileName); if (!sarInfoFile.is_open()) { throw std::runtime_error("SAR info assets are missing in the system!"); diff --git a/module-apps/application-settings-new/widgets/ApnInputWidget.cpp b/module-apps/application-settings-new/widgets/ApnInputWidget.cpp index 1c3f05eab..b7cbde8f4 100644 --- a/module-apps/application-settings-new/widgets/ApnInputWidget.cpp +++ b/module-apps/application-settings-new/widgets/ApnInputWidget.cpp @@ -128,7 +128,7 @@ namespace gui void ApnInputWidget::nameHandler() { - titleLabel->setText(utils::localize.get("app_settings_apn_name")); + titleLabel->setText(utils::translate("app_settings_apn_name")); inputText->setTextType(TextType::SingleLine); onSaveCallback = [&](std::shared_ptr apnRecord) { apnRecord->apn = inputText->getText(); @@ -141,7 +141,7 @@ namespace gui void ApnInputWidget::apnHandler() { - titleLabel->setText(utils::localize.get("app_settings_apn_APN")); + titleLabel->setText(utils::translate("app_settings_apn_APN")); inputText->setTextType(TextType::SingleLine); onSaveCallback = [&](std::shared_ptr apnRecord) { apnRecord->ip = inputText->getText(); @@ -154,7 +154,7 @@ namespace gui void ApnInputWidget::usernameHandler() { - titleLabel->setText(utils::localize.get("app_settings_apn_username")); + titleLabel->setText(utils::translate("app_settings_apn_username")); inputText->setTextType(TextType::SingleLine); onSaveCallback = [&](std::shared_ptr apnRecord) { apnRecord->username = inputText->getText(); @@ -167,7 +167,7 @@ namespace gui void ApnInputWidget::passwordNumberHandler() { - titleLabel->setText(utils::localize.get("app_settings_apn_password")); + titleLabel->setText(utils::translate("app_settings_apn_password")); inputText->setTextType(TextType::SingleLine); onSaveCallback = [&](std::shared_ptr apnRecord) { apnRecord->password = inputText->getText(); @@ -180,7 +180,7 @@ namespace gui void ApnInputWidget::authtypeHandler() { - titleLabel->setText(utils::localize.get("app_settings_apn_authtype")); + titleLabel->setText(utils::translate("app_settings_apn_authtype")); inputText->setTextType(TextType::SingleLine); onSaveCallback = [&](std::shared_ptr apnRecord) { apnRecord->setAuthMethod(inputText->getText()); @@ -193,7 +193,7 @@ namespace gui void ApnInputWidget::apntypeHandler() { - titleLabel->setText(utils::localize.get("app_settings_apn_apntype")); + titleLabel->setText(utils::translate("app_settings_apn_apntype")); inputText->setTextType(TextType::SingleLine); onSaveCallback = [&](std::shared_ptr apnRecord) { apnRecord->setApnType(inputText->getText()); @@ -205,7 +205,7 @@ namespace gui } void ApnInputWidget::protocolHandler() { - titleLabel->setText(utils::localize.get("app_settings_apn_apnprotocol")); + titleLabel->setText(utils::translate("app_settings_apn_apnprotocol")); inputText->setTextType(TextType::SingleLine); onSaveCallback = [&](std::shared_ptr apnRecord) { apnRecord->setApnProtocol(inputText->getText()); diff --git a/module-apps/application-settings-new/widgets/CategoryWidget.cpp b/module-apps/application-settings-new/widgets/CategoryWidget.cpp index 1cbaf17dc..644f4a93f 100644 --- a/module-apps/application-settings-new/widgets/CategoryWidget.cpp +++ b/module-apps/application-settings-new/widgets/CategoryWidget.cpp @@ -84,7 +84,7 @@ namespace gui descriptionLabel->setFont(style::window::font::mediumbold); setFocusItem(inputBoxLabel); auto bottorBarText = - category.enabled ? utils::localize.get("common_uncheck") : utils::localize.get("common_check"); + category.enabled ? utils::translate("common_uncheck") : utils::translate("common_check"); this->bottomBarTemporaryMode(bottorBarText); } else { @@ -100,7 +100,7 @@ namespace gui enableCategory(category.enabled); tickImage->setVisible(category.enabled); auto bottorBarText = - category.enabled ? utils::localize.get("common_uncheck") : utils::localize.get("common_check"); + category.enabled ? utils::translate("common_uncheck") : utils::translate("common_check"); this->bottomBarTemporaryMode(bottorBarText); hBox->resizeItems(); return true; diff --git a/module-apps/application-settings-new/widgets/QuoteWidget.cpp b/module-apps/application-settings-new/widgets/QuoteWidget.cpp index 87913ee79..d4f272296 100644 --- a/module-apps/application-settings-new/widgets/QuoteWidget.cpp +++ b/module-apps/application-settings-new/widgets/QuoteWidget.cpp @@ -71,7 +71,7 @@ namespace gui if (item.focus) { descriptionLabel->setFont(style::window::font::mediumbold); auto bottorBarText = - quote.enabled ? utils::localize.get("common_uncheck") : utils::localize.get("common_check"); + quote.enabled ? utils::translate("common_uncheck") : utils::translate("common_check"); this->bottomBarTemporaryMode(bottorBarText); } else { @@ -86,8 +86,7 @@ namespace gui quote.enabled = !quote.enabled; enableQuote(quote.enabled); tickImage->showImage(quote.enabled); - auto bottorBarText = - quote.enabled ? utils::localize.get("common_uncheck") : utils::localize.get("common_check"); + auto bottorBarText = quote.enabled ? utils::translate("common_uncheck") : utils::translate("common_check"); this->bottomBarTemporaryMode(bottorBarText); hBox->resizeItems(); return true; diff --git a/module-apps/application-settings-new/windows/AboutYourPureWindow.cpp b/module-apps/application-settings-new/windows/AboutYourPureWindow.cpp index 3b1bcb189..686a63357 100644 --- a/module-apps/application-settings-new/windows/AboutYourPureWindow.cpp +++ b/module-apps/application-settings-new/windows/AboutYourPureWindow.cpp @@ -10,7 +10,7 @@ namespace gui AboutYourPureWindow::AboutYourPureWindow(app::Application *app) : BaseSettingsWindow(app, window::name::about_your_pure) { - setTitle(utils::localize.get("app_settings_about_your_pure")); + setTitle(utils::translate("app_settings_about_your_pure")); } auto AboutYourPureWindow::buildOptionsList() -> std::list