rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-15 12:29:26 +01:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Hasso Tepper 2016-01-18 09:44:35 +02:00
parent c71004fdc8
commit d05b375810
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/processing/app/Editor.java
View File

@ -2549,7 +2549,7 @@ public class Editor extends JFrame implements RunnerListener {
if(serialPlotter.isClosed()) { if(serialPlotter.isClosed()) {
serialPlotter = null; serialPlotter = null;
} else { } else {
statusError(I18n.format("Serial monitor not available while plotter is open")); statusError(tr("Serial monitor not available while plotter is open"));
return; return;
} }
} }
@ -2578,7 +2578,7 @@ public class Editor extends JFrame implements RunnerListener {
BoardPort port = Base.getDiscoveryManager().find(PreferencesData.get("serial.port")); BoardPort port = Base.getDiscoveryManager().find(PreferencesData.get("serial.port"));
if (port == null) { 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; return;
} }
@ -2646,7 +2646,7 @@ public class Editor extends JFrame implements RunnerListener {
if(serialMonitor.isClosed()) { if(serialMonitor.isClosed()) {
serialMonitor = null; serialMonitor = null;
} else { } else {
statusError(I18n.format("Plotter not available while serial monitor is open")); statusError(tr("Plotter not available while serial monitor is open"));
return; return;
} }
} }
@ -2674,7 +2674,7 @@ public class Editor extends JFrame implements RunnerListener {
BoardPort port = Base.getDiscoveryManager().find(PreferencesData.get("serial.port")); BoardPort port = Base.getDiscoveryManager().find(PreferencesData.get("serial.port"));
if (port == null) { 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; return;
} }

2
arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java
View File

@ -139,7 +139,7 @@ public class SSHUploader extends Uploader {
return false; return false;
} }
if (e.getMessage().contains("Connection refused")) { 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); throw new RunnerException(e);
} catch (Exception e) { } catch (Exception e) {

2
arduino-core/src/processing/app/SketchData.java
View File

@ -136,7 +136,7 @@ public class SketchData {
if (BaseNoGui.isSanitaryName(base)) { if (BaseNoGui.isSanitaryName(base)) {
addCode(new SketchCode(new File(folder, filename))); addCode(new SketchCode(new File(folder, filename)));
} else { } 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));
} }
} }
} }