From de5cc75ac33250dfd92d2c3f133d01de89daa54a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Saviot?= <lea.saviot@numworks.com>
Date: Mon, 11 Jun 2018 17:49:24 +0200
Subject: [PATCH] [apps/stats/reg] Data not suitable message

---
 apps/shared.de.i18n              | 2 +-
 apps/shared.en.i18n              | 2 +-
 apps/shared.es.i18n              | 2 +-
 apps/shared.fr.i18n              | 2 +-
 apps/shared.pt.i18n              | 2 +-
 apps/shared/store_controller.cpp | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/shared.de.i18n b/apps/shared.de.i18n
index be4a61637..fa42b7a50 100644
--- a/apps/shared.de.i18n
+++ b/apps/shared.de.i18n
@@ -7,6 +7,7 @@ Cancel = "Abbrechen"
 ClearColumn = "Spalte loschen"
 ColumnOptions = "Optionen Spalte"
 CopyColumnInList = "Die Spalte in einer Liste kopieren"
+DataNotSuitable = "Daten nicht geeignet"
 DataTab = "Daten"
 DefaultSetting = "Grundeinstellungen"
 Deg = "gra"
@@ -33,7 +34,6 @@ Move = " Verschieben: "
 Next = "Nachste"
 NoDataToPlot = "Keine Daten zu zeichnen"
 NoFunctionToDelete = "Keine Funktion zu loschen"
-NonCompliantFormula = "Die Formel kann für diese Daten nicht verwendet werden"
 NoValueToCompute = "Keine Grosse zu berechnen"
 Ok = "Bestatigen"
 Or = " oder "
diff --git a/apps/shared.en.i18n b/apps/shared.en.i18n
index a1c2da5f2..0f79756a6 100644
--- a/apps/shared.en.i18n
+++ b/apps/shared.en.i18n
@@ -7,6 +7,7 @@ Cancel = "Cancel"
 ClearColumn = "Clear column"
 ColumnOptions = "Column options"
 CopyColumnInList = "Export the column to a list"
+DataNotSuitable = "Data not suitable"
 DataTab = "Data"
 DefaultSetting = "Basic settings"
 Deg = "deg"
@@ -33,7 +34,6 @@ Move = " Move: "
 Next = "Next"
 NoDataToPlot = "No data to draw"
 NoFunctionToDelete = "No function to delete"
-NonCompliantFormula = "The formula cannot be used for these data"
 NoValueToCompute = "No values to calculate"
 Ok = "Confirm"
 Or = " or "
diff --git a/apps/shared.es.i18n b/apps/shared.es.i18n
index 246259752..1b75c1c2d 100644
--- a/apps/shared.es.i18n
+++ b/apps/shared.es.i18n
@@ -7,6 +7,7 @@ Cancel = "Cancelar"
 ClearColumn = "Borrar la columna"
 ColumnOptions = "Opciones de la columna"
 CopyColumnInList = "Copiar la columna en una lista"
+DataNotSuitable = "Datos no adecuados"
 DataTab = "Datos"
 DefaultSetting = "Ajustes basicos"
 Deg = "gra"
@@ -33,7 +34,6 @@ Move = " Mover : "
 Next = "Siguiente"
 NoDataToPlot = "Ningunos datos que dibujar"
 NoFunctionToDelete = "Ninguna funcion que eliminar"
-NonCompliantFormula = "La fórmula no se puede utilizar para estos datos"
 NoValueToCompute = "Ninguna medida que calcular"
 Ok = "Confirmar"
 Or = " o "
diff --git a/apps/shared.fr.i18n b/apps/shared.fr.i18n
index 146efe9a4..7e2b8c770 100644
--- a/apps/shared.fr.i18n
+++ b/apps/shared.fr.i18n
@@ -7,6 +7,7 @@ Cancel = "Annuler"
 ClearColumn = "Effacer la colonne"
 ColumnOptions = "Options de la colonne"
 CopyColumnInList = "Copier la colonne dans une liste"
+DataNotSuitable = "Les données ne conviennent pas"
 DataTab = "Donnees"
 DefaultSetting = "Reglages de base"
 Deg = "deg"
@@ -33,7 +34,6 @@ Move = " Deplacer : "
 Next = "Suivant"
 NoDataToPlot = "Aucune donnee a tracer"
 NoFunctionToDelete = "Pas de fonction a supprimer"
-NonCompliantFormula = "La formule ne peut pas s'appliquer à ces données"
 NoValueToCompute = "Aucune grandeur a calculer"
 Ok = "Valider"
 Or = " ou "
diff --git a/apps/shared.pt.i18n b/apps/shared.pt.i18n
index 39da61127..92132d19a 100644
--- a/apps/shared.pt.i18n
+++ b/apps/shared.pt.i18n
@@ -7,6 +7,7 @@ Cancel = "Cancelar"
 ClearColumn = "Excluir coluna"
 ColumnOptions = "Opcoes de coluna"
 CopyColumnInList = "Copie a coluna em uma lista"
+DataNotSuitable = "Dados não adequados"
 DataTab = "Dados"
 DefaultSetting = "Configuracoes basicas"
 Deg = "gra"
@@ -33,7 +34,6 @@ Move = " Mover : "
 Next = "Seguinte"
 NoDataToPlot = "Nao ha dados para desenhar"
 NoFunctionToDelete = "Sem funcao para eliminar"
-NonCompliantFormula = "A fórmula não pode ser usada para esses dados"
 NoValueToCompute = "Nenhuma quantidade para calcular"
 Ok = "Confirmar"
 Or = " ou "
diff --git a/apps/shared/store_controller.cpp b/apps/shared/store_controller.cpp
index 179c4eeeb..dc8c1c2f5 100644
--- a/apps/shared/store_controller.cpp
+++ b/apps/shared/store_controller.cpp
@@ -301,7 +301,7 @@ bool StoreController::privateFillColumnWithFormula(Expression * formula, Express
     // Compute the new value using the formula
     double evaluation = formula->approximateToScalar<double>(*store);
     if (std::isnan(evaluation) || std::isinf(evaluation)) {
-      app()->displayWarning(I18n::Message::NonCompliantFormula);
+      app()->displayWarning(I18n::Message::DataNotSuitable);
       return false;
     }
   }