aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Etienne2012-09-12 15:15:59 +0200
committerMichel Etienne2012-09-12 15:15:59 +0200
commitb9441c11fa2acc6f5c2b03da06a6b9556d1ebc70 (patch)
tree84eeae59287f87451ec9b4a1e8df80fb168c210a
parente31f257f845ef7aa6243a1f5949bb1385e779aa9 (diff)
downloadchouette-core-b9441c11fa2acc6f5c2b03da06a6b9556d1ebc70.tar.bz2
update import export messages
-rw-r--r--app/views/test_sheet/1_2.html9
-rw-r--r--config/locales/exports.yml4
-rw-r--r--config/locales/imports.yml2
3 files changed, 12 insertions, 3 deletions
diff --git a/app/views/test_sheet/1_2.html b/app/views/test_sheet/1_2.html
index dae76e7aa..ff1b8ad93 100644
--- a/app/views/test_sheet/1_2.html
+++ b/app/views/test_sheet/1_2.html
@@ -140,10 +140,13 @@ du point de contr&ocirc;le N&deg; 1.2</span></p>
6.0pt;margin-left:0cm;text-align:justify'><span style='font-size:11.0pt;
font-family:"Tahoma","sans-serif"'>La v&eacute;rification de la conformit&eacute; XSD
permet de valider, entre autre :</span></p>
- <p class=MsoNormal style='margin-top:14.0pt;margin-right:0cm;margin-bottom:
- 0cm;margin-left:36.0pt;margin-bottom:.0001pt;text-indent:-18.0pt'><span
+ <p class=MsoNormal style='margin-left:36.0pt;text-indent:-18.0pt'><span
+ style='font-size:10.0pt;font-family:Symbol'>·<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+ </span></span><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>que
+ l'encodage est bien ISO-8859-1</span></p>
+ <p class=MsoNormal style='margin-left:36.0pt;text-indent:-18.0pt'><span
style='font-size:10.0pt;font-family:Symbol'>·<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- </span></span><span style='font-size:11.0pt;font-family:"Tahoma","sans-serif"'>que
+ </span></span><span style='font-size:11.0pt;font-family:"Arial","sans-serif"'>que
les balises utilis&eacute;es sont bien connues (d&eacute;finies dans l'XSD)</span></p>
<p class=MsoNormal style='margin-left:36.0pt;text-indent:-18.0pt'><span
style='font-size:10.0pt;font-family:Symbol'>·<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
diff --git a/config/locales/exports.yml b/config/locales/exports.yml
index 8744a9fde..fa7fdfb8e 100644
--- a/config/locales/exports.yml
+++ b/config/locales/exports.yml
@@ -38,6 +38,8 @@ en:
GTFS_INVALID_DATA: "%{0} %{1} : invalid data %{2}=%{3}"
GTFS_MISSING_DATA: "%{0} %{1} : missing value for : %{2}"
CSV_EXPORT: CSV Export
+ CSV_OK_LINE: Line %{0} exported
+ CSV_TOO_MUCH_ROUTES: "Line %{0} rejected : more than 2 routes"
severities:
info: Information
ok: Ok
@@ -108,6 +110,8 @@ fr:
GTFS_INVALID_DATA: "%{0} %{1} : attribut %{2}=%{3} invalide"
GTFS_MISSING_DATA: "%{0} %{1} : valeur manquante : %{2}"
CSV_EXPORT: Export CSV
+ CSV_OK_LINE: Ligne %{0} exportée
+ CSV_TOO_MUCH_ROUTES: "Ligne %{0} non exportable : plus de 2 séquences d'arrêt"
severities:
info: Information
ok: Ok
diff --git a/config/locales/imports.yml b/config/locales/imports.yml
index a713893ca..aa8d26a08 100644
--- a/config/locales/imports.yml
+++ b/config/locales/imports.yml
@@ -56,6 +56,7 @@ en:
CSV_UNUSED_TIMETABLE: Unused timetable %{0} (%{1})
SAVE: Save
SAVE_OK: %{0} saved
+ SAVE_ERROR: "%{0} save failed : %{1}"
severities:
info: Information
uncheck: Unchecked
@@ -144,6 +145,7 @@ fr:
CSV_UNUSED_TIMETABLE: "Tableau de marche %{0} (%{1}) inutilisé"
SAVE: Sauvegarde
SAVE_OK: %{0} enregistré
+ SAVE_ERROR: "Echec de l'enregistrement de %{0} : %{1}"
severities:
info: Information
uncheck: Non testé