arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

Library installer: made messages play nicer with i18n

Browse Source
This commit is contained in:
Federico Fissore
2015-04-09 15:30:40 +02:00
parent 81876495c9
commit f0cc644d8f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java
View File

@ -33,6 +33,7 @@ import cc.arduino.utils.ArchiveExtractor;
import cc.arduino.utils.MultiStepProgress; import cc.arduino.utils.MultiStepProgress;
import cc.arduino.utils.Progress; import cc.arduino.utils.Progress;
import processing.app.BaseNoGui; import processing.app.BaseNoGui;
import processing.app.I18n;
import processing.app.helpers.FileUtils; import processing.app.helpers.FileUtils;
import java.io.File; import java.io.File;
@ -97,9 +98,9 @@ public class LibraryInstaller {
rescanLibraryIndex(progress); rescanLibraryIndex(progress);
} }
public void install(ContributedLibrary lib, ContributedLibrary replacedLib) { public void install(ContributedLibrary lib, ContributedLibrary replacedLib) throws Exception {
if (lib.isInstalled()) { if (lib.isInstalled()) {
System.out.println(_("Library is already installed: \"" + lib.getName() + "\"")); System.out.println(I18n.format(_("Library is already installed: \"{0}\""), lib.getName() + " " + lib.getParsedVersion()));
return; return;
} }
@ -107,7 +108,7 @@ public class LibraryInstaller {
// Step 1: Download library // Step 1: Download library
try { try {
downloader.download(lib, progress, _("Downloading library: \"" + lib.getName() + "\"")); downloader.download(lib, progress, I18n.format(_("Downloading library: \"{0}\""), lib.getName()));
} catch (InterruptedException e) { } catch (InterruptedException e) {
// Download interrupted... just exit // Download interrupted... just exit
return; return;
@ -118,7 +119,7 @@ public class LibraryInstaller {
// all the temporary folders and abort installation. // all the temporary folders and abort installation.
// Step 2: Unpack library on the correct location // Step 2: Unpack library on the correct location
progress.setStatus(_("Installing library: \"" + lib.getName() + "\"")); progress.setStatus(I18n.format(_("Installing library: \"{0}\""), lib.getName()));
onProgress(progress); onProgress(progress);
File libsFolder = indexer.getSketchbookLibrariesFolder(); File libsFolder = indexer.getSketchbookLibrariesFolder();
File tmpFolder = FileUtils.createTempFolderIn(libsFolder); File tmpFolder = FileUtils.createTempFolderIn(libsFolder);
@ -149,7 +150,7 @@ public class LibraryInstaller {
final MultiStepProgress progress = new MultiStepProgress(2); final MultiStepProgress progress = new MultiStepProgress(2);
// Step 1: Remove library // Step 1: Remove library
progress.setStatus(_("Removing library: \"" + lib.getName() + "\"")); progress.setStatus(I18n.format(_("Removing library: \"{0}\""), lib.getName()));
onProgress(progress); onProgress(progress);
FileUtils.recursiveDelete(lib.getInstalledFolder()); FileUtils.recursiveDelete(lib.getInstalledFolder());
progress.stepDone(); progress.stepDone();