Skip to content

Some i18n/text fixes #4381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 5, 2016
Merged

Some i18n/text fixes #4381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
531248a
Make editor statusline text translatable
hasso Jan 3, 2016
d2277fc
Convert message to single string to ease a translation
hasso Jan 3, 2016
503cbbd
Use formatted i18n string to ease a translation
hasso Jan 3, 2016
7d7a654
Make "Retired" translatable
hasso Jan 3, 2016
7aa384d
Add necessary spaces
hasso Jan 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/processing/app/EditorLineStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

import processing.app.helpers.OSUtils;
import processing.app.helpers.PreferencesMap;
import static processing.app.I18n.tr;


/**
Expand Down Expand Up @@ -105,7 +106,7 @@ public void paintComponent(Graphics g) {
g.drawString(text, 6, baseline);

g.setColor(messageForeground);
String tmp = name + " on " + serialport;
String tmp = I18n.format(tr("{0} on {1}"), name, serialport);

Rectangle2D bounds = g.getFontMetrics().getStringBounds(tmp, null);

Expand Down
6 changes: 3 additions & 3 deletions app/src/processing/app/EditorStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,9 @@ public void keyTyped(KeyEvent event) {
message1 += editor.console.getText();
if (!(PreferencesData.getBoolean("build.verbose"))) {
message1 += "\n\n";
message1 += " " + tr("This report would have more information with") + "\n";
message1 += " \"" + tr("Show verbose output during compilation") + "\"\n";
message1 += " " + tr("enabled in File > Preferences.") + "\n";
message1 += tr(" This report would have more information with\n" +
" \"Show verbose output during compilation\"\n" +
" enabled in File -> Preferences.\n");
}
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
StringSelection data = new StringSelection(message1);
Expand Down
2 changes: 1 addition & 1 deletion arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ private boolean canUploadWWWFiles(File sourcePath, SSH ssh, List<String> warning
return false;
}
if (!www.canExecute()) {
warningsAccumulator.add(tr("Problem accessing files in folder ") + www);
warningsAccumulator.add(I18n.format(tr("Problem accessing files in folder \"{0}\""), www));
return false;
}
if (!ssh.execSyncCommand("special-storage-available")) {
Expand Down
1 change: 1 addition & 0 deletions arduino-core/src/processing/app/I18n.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public class I18n {
tr("Partner");
tr("Recommended");
tr("Contributed");
tr("Retired");

tr("Display");
tr("Communication");
Expand Down
8 changes: 4 additions & 4 deletions arduino-core/src/processing/app/SketchCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,10 @@ private void load() throws IOException {
if (program.indexOf('\uFFFD') != -1) {
System.err.println(
I18n.format(
tr("\"{0}\" contains unrecognized characters." +
"If this code was created with an older version of Arduino," +
"you may need to use Tools -> Fix Encoding & Reload to update" +
"the sketch to use UTF-8 encoding. If not, you may need to" +
tr("\"{0}\" contains unrecognized characters. " +
"If this code was created with an older version of Arduino, " +
"you may need to use Tools -> Fix Encoding & Reload to update " +
"the sketch to use UTF-8 encoding. If not, you may need to " +
"delete the bad characters to get rid of this warning."),
file.getName()
)
Expand Down