X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FContactList.java;h=600f90ca9931bfc8b108b99c00ee88e5cff92023;hb=26d254a3ac6cddbd3583cbbcbf8d43aa15c6a32e;hp=3cec44e0dafcd989e8ac472c562ec023e7ba8b93;hpb=176a83279a5aafb7e44cc7c34bf78f0bc35225fe;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactList.java b/src/be/nikiroo/jvcard/tui/panes/ContactList.java
index 3cec44e..600f90c 100644
--- a/src/be/nikiroo/jvcard/tui/panes/ContactList.java
+++ b/src/be/nikiroo/jvcard/tui/panes/ContactList.java
@@ -7,12 +7,12 @@ import java.util.List;
 import be.nikiroo.jvcard.Card;
 import be.nikiroo.jvcard.Contact;
 import be.nikiroo.jvcard.Data;
-import be.nikiroo.jvcard.i18n.Trans;
+import be.nikiroo.jvcard.launcher.Main;
 import be.nikiroo.jvcard.resources.Bundles;
+import be.nikiroo.jvcard.resources.Trans;
 import be.nikiroo.jvcard.tui.KeyAction;
 import be.nikiroo.jvcard.tui.KeyAction.DataType;
 import be.nikiroo.jvcard.tui.KeyAction.Mode;
-import be.nikiroo.jvcard.tui.UiColors;
 import be.nikiroo.jvcard.tui.UiColors.Element;
 
 import com.googlecode.lanterna.input.KeyType;
@@ -54,10 +54,9 @@ public class ContactList extends MainContentList {
 		this.contacts = new LinkedList<Contact>();
 
 		if (card != null) {
-			for (int i = 0; i < card.size(); i++) {
-				Contact c = card.get(i);
+			for (Contact c : card) {
 				if (filter == null
-						|| c.toString(format).toLowerCase()
+						|| c.toString(format, "|").toLowerCase()
 								.contains(filter.toLowerCase())) {
 					addItem("x");
 					contacts.add(c);
@@ -93,7 +92,8 @@ public class ContactList extends MainContentList {
 		List<KeyAction> actions = new LinkedList<KeyAction>();
 
 		// TODO ui
-		actions.add(new KeyAction(Mode.ASK_USER, 'a', Trans.StringId.DUMMY) {
+		actions.add(new KeyAction(Mode.ASK_USER, 'a',
+				Trans.StringId.KEY_ACTION_ADD) {
 			@Override
 			public Object getObject() {
 				return card;
@@ -101,8 +101,7 @@ public class ContactList extends MainContentList {
 
 			@Override
 			public String getQuestion() {
-				// TODO i18n
-				return "new contact name: ";
+				return Main.trans(Trans.StringId.ASK_USER_CONTACT_NAME);
 			}
 
 			@Override
@@ -126,8 +125,13 @@ public class ContactList extends MainContentList {
 
 			@Override
 			public String getQuestion() {
-				// TODO i18n
-				return "Delete contact? [Y/N]";
+				Contact contact = getSelectedContact();
+				String contactName = "null";
+				if (contact != null)
+					contactName = "" + contact.getPreferredDataValue("FN");
+
+				return Main.trans(Trans.StringId.CONFIRM_USER_DELETE_CONTACT,
+						contactName);
 			}
 
 			@Override
@@ -139,8 +143,12 @@ public class ContactList extends MainContentList {
 						return null;
 					}
 
-					// TODO i18n
-					return "Cannot delete contact";
+					String contactName = "null";
+					if (contact != null)
+						contactName = "" + contact.getPreferredDataValue("FN");
+
+					return Main.trans(Trans.StringId.ERR_CANNOT_DELETE_CONTACT,
+							contactName);
 				}
 
 				return null;
@@ -255,7 +263,7 @@ public class ContactList extends MainContentList {
 		width -= 2; // dirty mark space
 
 		String[] array = contact.toStringArray(format, getSeparator(), " ",
-				width, UiColors.getInstance().isUnicode());
+				width, Main.isUnicode());
 
 		if (contact.isDirty()) {
 			parts.add(new TextPart(" ", el));