Fix some incorrect I18n.format()/tr() usage

arduino · Jan 18, 2016 · d05b375 · d05b375
1 parent c71004f
commit d05b375
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
@@ -2549,7 +2549,7 @@ public void handleSerial() {
  if(serialPlotter.isClosed()) {
  serialPlotter = null;
  } else {
- statusError(I18n.format("Serial monitor not available while plotter is open"));
+ statusError(tr("Serial monitor not available while plotter is open"));
  return;
  }
  }
@@ -2578,7 +2578,7 @@ public void handleSerial() {
  BoardPort port = Base.getDiscoveryManager().find(PreferencesData.get("serial.port"));
 
  if (port == null) {
- statusError(I18n.format("Board at {0} is not available", PreferencesData.get("serial.port")));
+ statusError(I18n.format(tr("Board at {0} is not available"), PreferencesData.get("serial.port")));
  return;
  }
 
@@ -2646,7 +2646,7 @@ public void handlePlotter() {
  if(serialMonitor.isClosed()) {
  serialMonitor = null;
  } else {
- statusError(I18n.format("Plotter not available while serial monitor is open"));
+ statusError(tr("Plotter not available while serial monitor is open"));
  return;
  }
  }
@@ -2674,7 +2674,7 @@ public void handlePlotter() {
  BoardPort port = Base.getDiscoveryManager().find(PreferencesData.get("serial.port"));
 
  if (port == null) {
- statusError(I18n.format("Board at {0} is not available", PreferencesData.get("serial.port")));
+ statusError(I18n.format(tr("Board at {0} is not available"), PreferencesData.get("serial.port")));
  return;
  }
 

diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java
@@ -139,7 +139,7 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
  return false;
  }
  if (e.getMessage().contains("Connection refused")) {
- throw new RunnerException(I18n.format("Unable to connect to {0}", port.getAddress()));
+ throw new RunnerException(I18n.format(tr("Unable to connect to {0}"), port.getAddress()));
  }
  throw new RunnerException(e);
  } catch (Exception e) {

diff --git a/arduino-core/src/processing/app/SketchData.java b/arduino-core/src/processing/app/SketchData.java
@@ -136,7 +136,7 @@ protected void load() throws IOException {
  if (BaseNoGui.isSanitaryName(base)) {
  addCode(new SketchCode(new File(folder, filename)));
  } else {
- System.err.println(I18n.format("File name {0} is invalid: ignored", filename));
+ System.err.println(I18n.format(tr("File name {0} is invalid: ignored"), filename));
  }
  }
  }