diff --git a/backup-module/backup_controller.php b/backup-module/backup_controller.php index 02266ee..644d135 100644 --- a/backup-module/backup_controller.php +++ b/backup-module/backup_controller.php @@ -19,7 +19,7 @@ function backup_controller() // This module is only to be ran by the admin user if (!$session['write'] && !$session['admin']) { $route->format = "html"; - return "
Error: backup module requires admin access
"; + return "
".tr("Error:")." ".tr("backup module requires admin access")."
"; } if (file_exists("$linked_modules_dir/backup/config.cfg")) { $ini_string = file_get_contents("$linked_modules_dir/backup/config.cfg"); @@ -33,7 +33,7 @@ function backup_controller() $parsed_ini = parse_ini_string(implode("\n",$ini_string_lines), true); } else { - return "
Error: missing backup config.cfg
"; + return "
".tr("Error:")." ".tr("missing backup config.cfg")."
"; } $export_flag = "/tmp/emoncms-flag-export"; @@ -113,7 +113,7 @@ function backup_controller() // Allow certain file formats if($imageFileType != "gz") { - $result="Sorry, only .tar.gz files are allowed."; + $result = tr("Sorry, only .tar.gz files are allowed."); $uploadOk = 0; } @@ -122,13 +122,13 @@ function backup_controller() $redis->rpush("service-runner","$import_script $import_flag>$import_logfile"); header('Location: '.$path.'backup#import-archive'); } else { - return "
Error: Import archive not selected
"; + return "
".tr("Error:")." ".tr("Import archive not selected")."
"; } } if ($route->action == "usbimport") { $route->format = "text"; - $result = "Starting USB import"; + $result = tr("Starting USB import"); $redis->rpush("service-runner","$usb_import_script $usb_import_flag>$usb_import_logfile"); } diff --git a/backup-module/backup_view.php b/backup-module/backup_view.php index 271ba8a..ae2af22 100644 --- a/backup-module/backup_view.php +++ b/backup-module/backup_view.php @@ -18,70 +18,78 @@
-

Import from USB drive

-

Import emoncms account data from old emonSD card mounted as a USB drive.

-

Place your old emonPi or emonBase SD card in a USB SD card reader and plug into one of the raspberry pi USB ports.
This importer will then find and import all emoncms account data without the need to export and import an archive.

- CAUTION ALL EMONCMS ACCOUNT DATA WILL BE OVERWRITTEN BY THE IMPORTED DATA

-

Note: Before import update to latest version of Emoncms & emonHub.

- +

+

+

This importer will then find and import all emoncms account data without the need to export and import an archive."); ?>

+ + +

+

+


-

Refresh page if log window does not update.

-

After import is complete logout then login using the new imported account login details.

+

+

-

Import from Archive

-

Import an emoncms backup archive.

- CAUTION ALL EMONCMS ACCOUNT DATA WILL BE OVERWRITTEN BY THE IMPORTED DATA

-

Note: Before import update to latest version of Emoncms & emonHub.

+

+

+ + +

+



- + ">


-

Note: If browser upload fails for large backup files follow manual import instructions.

+

+ + +


-

Refresh page if log window does not update.

-

After import is complete logout then login using the new imported account login details.

+

+

-

Export

-

Export a compressed archive containing:

+

+

-

These files contain all Emoncms data including:

+

-

The compressed archive can be used to migrate data to another emonPi / emonBase.

- +

+


Right Click > Download:
'.$backup_filename.''; + echo '

'.tr("Right Click > Download:"); + echo '
'.$backup_filename.''; } ?>

-

Once export is complete refresh page to see download link.

-

Note: Export can take a long time; please be patient.

+

+

@@ -123,7 +131,10 @@ function selectTab(hash) { Warning: service-runner is not running and is required. To install service-runner see service-runner installation"; + echo "
".tr("Warning:"); + echo " ".tr("service-runner is not running and is required. To install service-runner see"); + echo " "; + echo tr("service-runner installation")."
"; } ?> diff --git a/backup-module/locale/fr_FR.json b/backup-module/locale/fr_FR.json index 9e26dfe..7a53ad1 100644 --- a/backup-module/locale/fr_FR.json +++ b/backup-module/locale/fr_FR.json @@ -1 +1,41 @@ -{} \ No newline at end of file +{ + "Import from USB drive": "Importer depuis un périphérique USB", + "Import USB": "Import USB", + "Import Archive": "Import archive existante", + "Export Archive": "Export vers une archive", + "Export": "Exporter", + "Import emoncms account data from old emonSD card mounted as a USB drive.": "Importer les données de compte emoncms depuis une ancienne carte emonSD montée comme périphérique USB.", + "Place your old emonPi or emonBase SD card in a USB SD card reader and plug into one of the raspberry pi USB ports.
This importer will then find and import all emoncms account data without the need to export and import an archive.": "Placez votre ancienne carte SD emonPi ou emonBase dans un lecteur de carte SD USB et connectez-le à un des ports USB du Raspberry Pi.
Ce module trouvera et importera alors toutes les données de compte emoncms sans nécessiter ni export ni import manuel.", + "CAUTION ALL EMONCMS ACCOUNT DATA WILL BE OVERWRITTEN BY THE IMPORTED DATA": "ATTENTION : TOUTES LES DONNÉES DE COMPTE EMONCMS SERONT ÉCRASÉES PAR LES DONNÉES IMPORTÉES", + "Note: Before import update to latest version of Emoncms & EmonHub.": "Remarque : avant tout import, mettez à jour vers la dernière version de Emoncms et EmonHub.", + "Refresh page if log window does not update.": "Actualisez la page si la fenêtre de journal ne se met pas à jour.", + "After import is complete logout then login using the new imported account login details.": "Une fois les données importées, déconnectez-vous puis reconnectez-vous avec les identifiants du compte importé.", + "Import from Archive": "Importer depuis une archive", + "Import an emoncms backup archive.": "Importer une archive de sauvegarde emoncms.", + "Import Backup": "Importer une sauvegarde", + "Note: If browser upload fails for large backup files": "Remarque : si le téléversement échoue en raison de la taille de la sauvegarde", + "follow manual import instructions.": "suivez les instructions pour réaliser une importation manuelle.", + "Export a compressed archive containing:": "Exporter une archive compressée contenant :", + "Emoncms MYSQL database": "Base de données MYSQL", + "PHPFina data files": "Fichiers de données PHPFina", + "PHPTimeSeries data files": "Fichiers de données PHPTimeSeries", + "EmonHub Config": "Configuration EmonHub", + "These files contain all Emoncms data including:": "Ces fichiers contiennent toutes les données Emoncms, y compris :", + "Input processes": "Sources de données et processus de traitement associés", + "Feed data": "Flux de données", + "Dashboards": "Tableaux de bord", + "The compressed archive can be used to migrate data to another emonPi / emonBase.": "Cette archive compressée peut servir pour migrer les données vers un autre emonPi \/ emonBase.", + "Right Click > Download:": "Clic droit > Télécharger :", + "Once export is complete refresh page to see download link.": "Après tout export terminé avec succès, actualisez la page pour voir le lien de téléchargement.", + "Note: Export can take a long time; please be patient.": "Remarque : un export peut prendre du temps, veuillez patienter.", + "Warning:": "Avertissement :", + "service-runner is not running and is required. To install service-runner see": "Le process service-runner est requis. Consulter ", + "service-runner installation": "la procédure pour installer service-runner", + "Error:": "Erreur :", + "backup module requires admin access": "le module de sauvegarde nécessite un accès administrateur", + "missing backup config.cfg": "fichier config.cfg de sauvegarde manquant", + "Sorry, only .tar.gz files are allowed.": "Désolé, seuls les fichiers .tar.gz sont autorisés.", + "Import archive not selected": "Archive à importer non sélectionnée", + "Starting USB import": "importer depuis le port USB", + "Create backup": "Démarrer la sauvegarde" +}