[settings] Enable exam mode reactivation

numworks · Dec 11, 2019 · 002e746 · 002e746
1 parent df4a1f4
commit 002e746
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/apps/settings/base.de.i18n b/apps/settings/base.de.i18n
@@ -7,8 +7,8 @@ EditionLinear = "Linear "
 Edition2D = "Natürlich "
 ComplexFormat = "Komplex"
 ExamMode = "Testmodus"
-ActivateExamMode = "Start Testmodus"
-ExamModeActive = "Testmodus: aktiv"
+ActivateExamMode = "Starten Testmodus"
+ExamModeActive = "Wieder starten Testmodus"
 About = "Über"
 Degrees = "Grad "
 Gradians = "Gone "

diff --git a/apps/settings/base.en.i18n b/apps/settings/base.en.i18n
@@ -8,7 +8,7 @@ Edition2D = "Natural "
 ComplexFormat = "Complex format"
 ExamMode = "Exam mode"
 ActivateExamMode = "Activate exam mode"
-ExamModeActive = "Exam mode: active"
+ExamModeActive = "Reactivate exam mode"
 About = "About"
 Degrees = "Degrees "
 Gradians = "Gradians "

diff --git a/apps/settings/base.es.i18n b/apps/settings/base.es.i18n
@@ -8,7 +8,7 @@ Edition2D = "Natural "
 ComplexFormat = "Forma compleja"
 ExamMode = "Modo examen"
 ActivateExamMode = "Activar el modo examen"
-ExamModeActive = "Modo examen: activo"
+ExamModeActive = "Reactivar el modo examen"
 About = "Acerca"
 Degrees = "Grados "
 Gradians = "Gradianes "

diff --git a/apps/settings/base.fr.i18n b/apps/settings/base.fr.i18n
@@ -8,7 +8,7 @@ Edition2D = "Naturelle "
 ComplexFormat = "Forme complexe"
 ExamMode = "Mode examen"
 ActivateExamMode = "Activer le mode examen"
-ExamModeActive = "Mode examen: actif"
+ExamModeActive = "Réactiver le mode examen"
 About = "À propos"
 Degrees = "Degrés "
 Gradians = "Grades "

diff --git a/apps/settings/base.pt.i18n b/apps/settings/base.pt.i18n
@@ -6,9 +6,9 @@ EditionMode = "Formato escrita "
 EditionLinear = "Em linha "
 Edition2D = "Natural "
 ComplexFormat = "Complexos"
-ExamMode = "Modo de Exame"
-ActivateExamMode = "Inicio modo de exame"
-ExamModeActive = "Modo de exame : ativo"
+ExamMode = "Modo de exame"
+ActivateExamMode = "Ativar o modo de exame"
+ExamModeActive = "Reativar o modo de exame"
 About = "Acerca"
 Degrees = "Graus "
 Gradians = "Grados "

diff --git a/apps/settings/sub_menu/exam_mode_controller.cpp b/apps/settings/sub_menu/exam_mode_controller.cpp
@@ -21,9 +21,6 @@ void ExamModeController::didEnterResponderChain(Responder * previousFirstRespond
 
 bool ExamModeController::handleEvent(Ion::Events::Event event) {
   if (event == Ion::Events::OK || event == Ion::Events::EXE) {
-    if (GlobalPreferences::sharedGlobalPreferences()->examMode() == GlobalPreferences::ExamMode::Activate) {
-      return false;
-    }
     AppsContainer::sharedAppsContainer()->displayExamModePopUp(true);
     return true;
   }