M image/assets/lang/Deutsch.json => image/assets/lang/Deutsch.json +2 -0
@@ 266,7 266,9 @@
"sim_wrong_pin_confirmation": "Falscher PIN-Code.",
"sim_pin_changed_successfully": "PIN-Code erfolgreich geändert",
"sim_card_changed_successfully": "SIM-Karte erfolgreich geändert.",
+ "sim_card_select_successfully": "SIM-Karte erfolgreich ausgewählt.",
"sim_card_change_in_progress": "<text>SIM-Wechselvorgang läuft.<br></br>Es dauert bis zu ein paar Sekunden.</text>",
+ "sim_card_select_in_progress": "<text>SIM-Auswahlvorgang läuft.<br></br>Es dauert bis zu ein paar Sekunden.</text>",
"sim_cme_error": "<text>SIM-Karte<br></br>CME-Fehler:<token>$CMECODE</token></text>",
"sim_puk_blocked": "<text>Die SIM-Karte ist gesperrt.<br></br>Bitte kontaktieren Sie den Betreiber.</text>",
"sim_setup_enter_puk": "<text>Die SIM-Karte ist gesperrt.<br></br>Zum Entsperren PUK-Code eingeben:</text>",
M image/assets/lang/English.json => image/assets/lang/English.json +2 -0
@@ 233,7 233,9 @@
"sim_wrong_pin_confirmation": "Wrong PIN code.",
"sim_pin_changed_successfully": "PIN code changed successfully",
"sim_card_changed_successfully": "SIM card changed successfully.",
+ "sim_card_select_successfully": "<text>SIM select process<br></br>has been successfully.</text>",
"sim_card_change_in_progress": "<text>SIM change process in progress.<br></br>It will take up to a few seconds.</text>",
+ "sim_card_select_in_progress": "<text>SIM select process in progress.<br></br>It will take up to a few seconds.</text>",
"sim_cme_error": "<text>SIM card<br></br>CME error:<token>$CMECODE</token></text>",
"sim_puk_blocked": "<text>The SIM card is blocked.<br></br>Please, contact the operator.</text>",
"sim_setup_enter_puk": "<text>The SIM card is blocked.<br></br>To unblock it, type the PUK code:</text>",
M image/assets/lang/Espanol.json => image/assets/lang/Espanol.json +2 -0
@@ 266,7 266,9 @@
"sim_wrong_pin_confirmation": "Código PIN incorrecto.",
"sim_pin_changed_successfully": "El código PIN se ha cambiado con éxito.",
"sim_card_changed_successfully": "La tarjeta SIM se ha cambiado con éxito.",
+ "sim_card_select_successfully": "Tarjeta SIM seleccionada con éxito.",
"sim_card_change_in_progress": "<text>Proceso de cambio de SIM en curso.<br></br>Tarda unos segundos.</text>",
+ "sim_card_select_in_progress": "<text>Proceso de selección de SIM en curso.<br></br>Tarda unos segundos.</text>",
"sim_cme_error": "<text>Tarjeta SIM<br></br>Error CME:<token>$CMECODE</token></text>",
"sim_puk_blocked": "<text>La tarjeta SIM está bloqueada.<br></br>Ponte en contacto con tu operador.</text>",
"sim_setup_enter_puk": "<text>La tarjeta SIM está bloqueada.<br></br>Para desbloquearla, introduce el código PUK:</text>",
M image/assets/lang/Francais.json => image/assets/lang/Francais.json +2 -0
@@ 235,7 235,9 @@
"sim_wrong_pin_confirmation": "Mauvais code.",
"sim_pin_changed_successfully": "Le code a bien été modifié.",
"sim_card_changed_successfully": "La carte SIM a bien été modifié.",
+ "sim_card_select_successfully": "Carte SIM sélectionnée avec succès.",
"sim_card_change_in_progress": "<text>Processus de changement de carte SIM en cours.<br></br>Cela prend quelques secondes.</text>",
+ "sim_card_select_in_progress": "<text>Processus de sélection de la carte SIM en cours.<br></br>Cela prend quelques secondes.</text>",
"sim_cme_error": "<text>SIM card<br></br>CME error:<token>$CMECODE</token></text>",
"sim_puk_blocked": "<text>La carte SIM est bloquée.<br></br>Veuillez contacter l'opérateur.</text>",
"sim_setup_enter_puk": "<text>La carte SIM est bloquée.<br></br>Pour la débloquer, saisissez le code PUK :</text>",
M image/assets/lang/Polski.json => image/assets/lang/Polski.json +2 -0
@@ 277,7 277,9 @@
"sim_wrong_pin_confirmation": "Błędny kod PIN.",
"sim_pin_changed_successfully": "Pomyślnie zmieniono kod PIN",
"sim_card_changed_successfully": "Pomyślnie zmieniono kartę SIM.",
+ "sim_card_select_successfully": "<text>Proces wyboru karty SIM<br></br>zakończył się pomyślnie.</text>",
"sim_card_change_in_progress": "<text>Proces zmiany karty SIM w toku.<br></br>Może to potrwać kilka sekund.</text>",
+ "sim_card_select_in_progress": "<text>Proces wyboru karty SIM w toku.<br></br>Może to potrwać kilka sekund.</text>",
"sim_cme_error": "<text>Błąd CME<br></br>karty SIM:<token>$CMECODE</token></text>",
"sim_puk_blocked": "<text>Karta SIM jest zablokowana.<br></br>Skontaktuj się z operatorem.</text>",
"sim_setup_enter_puk": "<text>Karta SIM jest zablokowana.<br></br>Aby odblokować, wprowadź kod PUK:</text>",
M module-apps/application-onboarding/ApplicationOnBoarding.hpp => module-apps/application-onboarding/ApplicationOnBoarding.hpp +1 -2
@@ 4,6 4,7 @@
#pragma once
#include "Application.hpp"
+#include "Constants.hpp"
namespace gui::window::name
{
@@ 22,8 23,6 @@ namespace gui::window::name
namespace app
{
- inline constexpr auto name_onboarding = "ApplicationOnBoarding";
-
class ApplicationOnBoarding : public Application
{
public:
M module-apps/application-onboarding/CMakeLists.txt => module-apps/application-onboarding/CMakeLists.txt +1 -0
@@ 28,6 28,7 @@ target_sources(application-onboarding
"${CMAKE_CURRENT_LIST_DIR}/windows/NoSimSelectedDialogWindow.cpp"
PUBLIC
"${CMAKE_CURRENT_LIST_DIR}/ApplicationOnBoarding.hpp"
+ "${CMAKE_CURRENT_LIST_DIR}/Constants.hpp"
"${CMAKE_CURRENT_LIST_DIR}/windows/StartConfigurationWindow.hpp"
"${CMAKE_CURRENT_LIST_DIR}/windows/OnBoardingLanguagesWindow.hpp"
"${CMAKE_CURRENT_LIST_DIR}/data/OnBoardingSwitchData.hpp"
A module-apps/application-onboarding/Constants.hpp => module-apps/application-onboarding/Constants.hpp +9 -0
@@ 0,0 1,9 @@
+// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+namespace app
+{
+ inline constexpr auto name_onboarding = "ApplicationOnBoarding";
+}
M => +15 -9
@@ 5,6 5,7 @@
#include <Application.hpp>
#include <EventStore.hpp>
#include <application-onboarding/Constants.hpp>
namespace constants
{
@@ 66,23 67,28 @@ namespace gui
void SimSwitchingWindow::buildInterface()
{
bool isOnboardingInProgress = application->GetName() == app::name_onboarding;
AppWindow::buildInterface();
setTitle(utils::translate("app_settings_network_sim_cards"));
infoIcon = new gui::Icon(this,
style::window::default_left_margin,
style::window::default_vertical_pos,
style::window::default_body_width,
style::window::default_body_height,
"progress_128px_W_G",
utils::translate("sim_card_change_in_progress"));
infoIcon = new gui::Icon(
this,
style::window::default_left_margin,
style::window::default_vertical_pos,
style::window::default_body_width,
style::window::default_body_height,
"progress_128px_W_G",
utils::translate(isOnboardingInProgress ? "sim_card_select_in_progress" : "sim_card_change_in_progress"));
infoIcon->setAlignment(Alignment::Horizontal::Center);
}
void SimSwitchingWindow::updateInterface()
{
bool isOnboardingInProgress = application->GetName() == app::name_onboarding;
setTitle(utils::translate(switchedSuccessful ? "app_settings_net" : "app_settings_network_sim_cards"));
infoIcon->text->setRichText(
utils::translate(switchedSuccessful ? "sim_card_changed_successfully" : "sim_card_change_in_progress"));
infoIcon->text->setRichText(utils::translate(
switchedSuccessful
? (isOnboardingInProgress ? "sim_card_select_successfully" : "sim_card_changed_successfully")
: "sim_card_change_in_progress"));
infoIcon->image->set(switchedSuccessful ? "success_128px_W_G" : "progress_128px_W_G");
}