X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FContactList.java;h=a68efa249c6c502d4f6b071ef21d35b870ee00ff;hb=9b8cb729d5105f34eb4b1e5975166c6c5f867fa2;hp=2e6db5259f19185b030dc577f0cf98d7dd47b2b6;hpb=26d2bd0591901a8d52bd24802a8d6827d0e9b833;p=jvcard.git diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactList.java b/src/be/nikiroo/jvcard/tui/panes/ContactList.java index 2e6db52..a68efa2 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; @@ -92,7 +92,8 @@ public class ContactList extends MainContentList { List actions = new LinkedList(); // 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; @@ -100,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 @@ -125,8 +125,12 @@ 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 @@ -138,8 +142,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; @@ -254,7 +262,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));