improve internationalization and localization in greek

This commit is contained in:
mtsio
2015-04-17 05:06:54 +03:00
parent 59d32321fd
commit 0ca72d4cc6
13 changed files with 224 additions and 38 deletions

View File

@@ -210,7 +210,11 @@ public class DebugTray extends JFrame {
rootNode = new DefaultMutableTreeNode("root");
builtins = new DefaultMutableTreeNode("Processing");
treeModel = new DefaultTreeModel(rootNode); // model for the tree column
model = DefaultOutlineModel.createOutlineModel(treeModel, new VariableRowModel(), true, "Name"); // model for all columns
// model for all columns
model =
DefaultOutlineModel.createOutlineModel(treeModel, new VariableRowModel(),
true,
Language.text("debugger.name"));
ExpansionHandler expansionHandler = new ExpansionHandler();
model.getTreePathSupport().addTreeWillExpandListener(expansionHandler);
@@ -318,7 +322,9 @@ public class DebugTray extends JFrame {
* http://kickjava.com/src/org/netbeans/swing/outline/DefaultOutlineCellRenderer.java.htm
*/
protected class VariableRowModel implements RowModel {
final String[] columnNames = { "Value", "Type" };
final String column0 = Language.text("debugger.value");
final String column1 = Language.text("debugger.type");
final String[] columnNames = { column0, column1 };
final int[] editableTypes = {
VariableNode.TYPE_BOOLEAN,
VariableNode.TYPE_FLOAT,

View File

@@ -41,6 +41,7 @@ import processing.app.SketchCode;
import processing.mode.java.pdex.ErrorCheckerService;
import processing.mode.java.pdex.ErrorMarker;
import processing.mode.java.pdex.Problem;
import processing.app.Language;
/**
* The bar on the left of the text area which displays all errors as rectangles. <br>
@@ -287,7 +288,11 @@ public class ErrorBar extends JPanel {
if (evt.getY() >= eMarker.getY() - 2 &&
evt.getY() <= eMarker.getY() + 2 + errorMarkerHeight) {
Problem p = eMarker.getProblem();
String msg = (p.isError() ? "Error: " : "Warning: ") + p.getMessage();
String msg = ((p.isError()
? Language.text("editor.status.error")
: Language.text("editor.status.warning")) + ": "
+ p.getMessage());
setToolTipText(msg);
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
break;

View File

@@ -1388,7 +1388,9 @@ public class JavaEditor extends Editor {
JMenuItem item;
// "use the debugger" sounds too colloquial, and "enable" sounds too technical
enableDebug = Toolkit.newJCheckBoxMenuItem("Enable Debugger", KeyEvent.VK_D);
enableDebug =
Toolkit.newJCheckBoxMenuItem(Language.text("menu.debug.enable"),
KeyEvent.VK_D);
//new JCheckBoxMenuItem(Language.text("menu.debug.show_debug_toolbar"));
enableDebug.setSelected(false);
enableDebug.addActionListener(new ActionListener() {
@@ -2378,12 +2380,12 @@ public class JavaEditor extends Editor {
public void statusBusy() {
statusNotice("Debugger busy...");
statusNotice(Language.text("editor.status.debug.busy"));
}
public void statusHalted() {
statusNotice("Debugger halted.");
statusNotice(Language.text("editor.status.debug.halt"));
}
@@ -2584,9 +2586,10 @@ public class JavaEditor extends Editor {
if (modified) {
// ask to keep the values
int ret = Base.showYesNoQuestion(this, "Tweak Mode",
"Keep the changes?",
"You changed some values in your sketch. Would you like to keep the changes?");
int ret =
Base.showYesNoQuestion(this, Language.text("tweak_mode"),
Language.text("tweak_mode.keep_changes.line1"),
Language.text("tweak_mode.keep_changes.line2"));
if (ret == 1) {
// NO! don't keep changes
loadSavedCode();

View File

@@ -171,7 +171,8 @@ public class JavaMode extends Mode {
if (isSketchModified(sketch)) {
editor.deactivateRun();
Base.showMessage("Save", "Please save the sketch before running in Tweak Mode.");
Base.showMessage(Language.text("menu.file.save"),
Language.text("tweak_mode.save_before_tweak"));
return null;
}
@@ -403,4 +404,4 @@ public class JavaMode extends Mode {
static public void main(String[] args) {
processing.app.Base.main(args);
}
}
}

View File

@@ -226,6 +226,27 @@ public class ErrorMessageSimplifier {
result = result.replace("typeB", q(args[1]));
}
break;
case IProblem.LocalVariableIsNeverUsed:
if (args.length > 0) {
result = Language.text("editor.status.unused_variable");
result = result.replace("varname", q(args[0]));
}
break;
case IProblem.UninitializedLocalVariable:
if (args.length > 0) {
result = Language.text("editor.status.uninitialized_variable");
result = result.replace("varname", q(args[0]));
}
break;
case IProblem.AssignmentHasNoEffect:
if (args.length > 0) {
result = Language.text("editor.status.no_effect_assignment");
result = result.replace("varname", q(args[0]));
}
break;
}
//log("Simplified Error Msg: " + result);