X-Git-Url: http://git.nikiroo.be/?p=jvcard.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2FMainWindow.java;h=236289904a07297401e35754a8f0d1babc98e12e;hp=8dc860dcb3f75212de68187a778cc183e94bc888;hb=7da41ecd30228908bf2afcd07ff7943ab59d4c01;hpb=f720df72028ac616d569d4584e3684cd7134105d

diff --git a/src/be/nikiroo/jvcard/tui/MainWindow.java b/src/be/nikiroo/jvcard/tui/MainWindow.java
index 8dc860d..2362899 100644
--- a/src/be/nikiroo/jvcard/tui/MainWindow.java
+++ b/src/be/nikiroo/jvcard/tui/MainWindow.java
@@ -5,8 +5,9 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-import be.nikiroo.jvcard.i18n.Trans;
-import be.nikiroo.jvcard.i18n.Trans.StringId;
+import be.nikiroo.jvcard.launcher.Main;
+import be.nikiroo.jvcard.resources.StringUtils;
+import be.nikiroo.jvcard.resources.Trans.StringId;
 import be.nikiroo.jvcard.tui.KeyAction.Mode;
 import be.nikiroo.jvcard.tui.UiColors.Element;
 import be.nikiroo.jvcard.tui.panes.ContactDetails;
@@ -408,8 +409,7 @@ public class MainWindow extends BasicWindow {
 
 		if (title.length() > 0) {
 			prefix = prefix + ": ";
-			title = StringUtils.sanitize(title, UiColors.getInstance()
-					.isUnicode());
+			title = StringUtils.sanitize(title, Main.isUnicode());
 		}
 
 		String countStr = "";
@@ -497,12 +497,12 @@ public class MainWindow extends BasicWindow {
 
 		actionPanel.removeAllComponents();
 		for (KeyAction action : this.actions) {
-			String trans = " " + action.getStringId().trans() + " ";
+			String trans = " " + Main.trans(action.getStringId()) + " ";
 
 			if ("  ".equals(trans))
 				continue;
 
-			String keyTrans = Trans.getInstance().trans(action.getKey());
+			String keyTrans = KeyAction.trans(action.getKey());
 
 			Panel kPane = new Panel();
 			LinearLayout layout = new LinearLayout(Direction.HORIZONTAL);