git clone of logicmail with some fixes/features added
Added localization for the local account name, local/special folder names, and the default identity name (fixes #267)
git-svn-id: https://logicmail.svn.sourceforge.net/svnroot/logicmail/trunk@938 5c734088-3d25-0410-9155-b3c3832efda5
+63
-5
+7
LogicMail/res/org/logicprobe/LogicMail/LogicMail.rrc
+7
LogicMail/res/org/logicprobe/LogicMail/LogicMail.rrc
···
16
16
ABOUT_LICENSE_ACCEPT#0="Click \"Accept\" to accept the terms of the license agreement, or \"Decline\" to decline the agreement and exit LogicMail.";
17
17
ABOUT_TITLE#0="About";
18
18
ABOUT_URL#0="http://logicmail.org/";
19
+
ACCOUNT_LOCAL_FOLDERS#0="Local Folders";
19
20
APPNAME#0="LogicMail";
20
21
BASE_CLOSEANDEXIT#0="Close active connections and exit?";
21
22
COMPOSITION_PROMPT_DISCARD_UNSENT#0="Discard unsent message?";
···
105
106
CONFIG_GLOBAL_TRANSPORT_WIFI_ONLY#0="WiFi only";
106
107
CONFIG_GLOBAL_UNICODE_NORMALIZATION#0="Unicode normalization";
107
108
CONFIG_IDENTITIES#0="Identities";
109
+
CONFIG_IDENTITY_DEFAULT_NAME#0="Default";
108
110
CONFIG_IDENTITY_EMAIL_ADDRESS#0="E-Mail address:";
109
111
CONFIG_IDENTITY_FULL_NAME#0="Full name:";
110
112
CONFIG_IDENTITY_IDENTITY#0="Identity:";
···
129
131
FILESAVEDIALOG_TITLE#0="Save file";
130
132
FOLDERSELECTIONDIALOG_SELECT_FOLDER#0="Use folder";
131
133
FOLDERSELECTIONDIALOG_TITLE#0="Select folder:";
134
+
FOLDER_NAME_DRAFTS#0="Drafts";
135
+
FOLDER_NAME_INBOX#0="Inbox";
136
+
FOLDER_NAME_OUTBOX#0="Outbox";
137
+
FOLDER_NAME_SENT#0="Sent";
138
+
FOLDER_NAME_TRASH#0="Trash";
132
139
LOGIN_TITLE#0="Authentication";
133
140
MAILBOX_DELETE_PROMPT#0="Are you sure you want to delete this message?";
134
141
MAILBOX_DRAFT_MULTIPLE_ACCOUNTS#0="Which account would you like this message to be sent from?";
+7
LogicMail/res/org/logicprobe/LogicMail/LogicMail.rrh
+7
LogicMail/res/org/logicprobe/LogicMail/LogicMail.rrh
···
278
278
MAILBOX_MARK_ALL_PRIOR_ITEMS_OPENED_PROMPT#0=282;
279
279
CONFIG_GLOBAL_AUTO_STARTUP#0=283;
280
280
MESSAGE_NOT_LOADED#0=284;
281
+
ACCOUNT_LOCAL_FOLDERS#0=285;
282
+
FOLDER_NAME_INBOX#0=286;
283
+
FOLDER_NAME_OUTBOX#0=287;
284
+
FOLDER_NAME_SENT#0=288;
285
+
FOLDER_NAME_DRAFTS#0=289;
286
+
FOLDER_NAME_TRASH#0=290;
287
+
CONFIG_IDENTITY_DEFAULT_NAME#0=291;
+16
LogicMail/src/org/logicprobe/LogicMail/conf/IdentityConfig.java
+16
LogicMail/src/org/logicprobe/LogicMail/conf/IdentityConfig.java
···
34
34
import java.io.DataInput;
35
35
import java.io.DataOutput;
36
36
import java.io.IOException;
37
+
38
+
import net.rim.device.api.i18n.ResourceBundle;
39
+
40
+
import org.logicprobe.LogicMail.LogicMailResource;
37
41
import org.logicprobe.LogicMail.util.Serializable;
38
42
import org.logicprobe.LogicMail.util.SerializableHashtable;
39
43
import org.logicprobe.LogicMail.util.UniqueIdGenerator;
···
84
88
replyToAddress = "";
85
89
msgSignature = "";
86
90
changeType = 0;
91
+
}
92
+
93
+
/**
94
+
* Gets the default name of an identity configuration.
95
+
*
96
+
* @return The default identity name
97
+
*/
98
+
public static String getDefaultName() {
99
+
ResourceBundle resources = ResourceBundle.getBundle(
100
+
LogicMailResource.BUNDLE_ID,
101
+
LogicMailResource.BUNDLE_NAME);
102
+
return resources.getString(LogicMailResource.CONFIG_IDENTITY_DEFAULT_NAME);
87
103
}
88
104
89
105
/* (non-Javadoc)
+6
-2
LogicMail/src/org/logicprobe/LogicMail/model/LocalAccountNode.java
+6
-2
LogicMail/src/org/logicprobe/LogicMail/model/LocalAccountNode.java
···
30
30
*/
31
31
package org.logicprobe.LogicMail.model;
32
32
33
+
import net.rim.device.api.i18n.ResourceBundle;
34
+
35
+
import org.logicprobe.LogicMail.LogicMailResource;
33
36
import org.logicprobe.LogicMail.mail.FolderTreeItem;
34
37
import org.logicprobe.LogicMail.util.DataStore;
35
38
import org.logicprobe.LogicMail.util.DataStoreFactory;
36
39
37
40
public class LocalAccountNode extends AccountNode {
38
-
41
+
private static ResourceBundle resources = ResourceBundle.getBundle(LogicMailResource.BUNDLE_ID, LogicMailResource.BUNDLE_NAME);
42
+
39
43
LocalAccountNode(LocalMailStoreServices mailStore) {
40
44
super(mailStore);
41
45
···
48
52
* @return The name.
49
53
*/
50
54
public String toString() {
51
-
return "Local Folders";
55
+
return resources.getString(LogicMailResource.ACCOUNT_LOCAL_FOLDERS);
52
56
}
53
57
54
58
public String getProtocolName() {
+25
-1
LogicMail/src/org/logicprobe/LogicMail/model/MailboxNode.java
+25
-1
LogicMail/src/org/logicprobe/LogicMail/model/MailboxNode.java
···
40
40
41
41
import net.rim.device.api.collection.util.BigIntVector;
42
42
import net.rim.device.api.collection.util.BigVector;
43
+
import net.rim.device.api.i18n.ResourceBundle;
43
44
import net.rim.device.api.util.Comparator;
44
45
import net.rim.device.api.util.IntHashtable;
45
46
import net.rim.device.api.util.SimpleSortingVector;
46
47
import net.rim.device.api.util.ToIntHashtable;
47
48
49
+
import org.logicprobe.LogicMail.LogicMailResource;
48
50
import org.logicprobe.LogicMail.mail.FolderEvent;
49
51
import org.logicprobe.LogicMail.mail.FolderExpungedEvent;
50
52
import org.logicprobe.LogicMail.mail.FolderMessagesEvent;
···
66
68
* <tt>MessageNode</tt> instances as its children.
67
69
*/
68
70
public class MailboxNode implements Node, Serializable {
71
+
private static ResourceBundle resources = ResourceBundle.getBundle(LogicMailResource.BUNDLE_ID, LogicMailResource.BUNDLE_NAME);
69
72
private long uniqueId;
70
73
private AccountNode parentAccount;
71
74
private MailboxNode parentMailbox;
···
654
657
* @return The name.
655
658
*/
656
659
public String toString() {
657
-
return this.folderTreeItem.getName();
660
+
String name;
661
+
switch(type) {
662
+
case TYPE_INBOX:
663
+
name = resources.getString(LogicMailResource.FOLDER_NAME_INBOX);
664
+
break;
665
+
case TYPE_OUTBOX:
666
+
name = resources.getString(LogicMailResource.FOLDER_NAME_OUTBOX);
667
+
break;
668
+
case TYPE_SENT:
669
+
name = resources.getString(LogicMailResource.FOLDER_NAME_SENT);
670
+
break;
671
+
case TYPE_DRAFTS:
672
+
name = resources.getString(LogicMailResource.FOLDER_NAME_DRAFTS);
673
+
break;
674
+
case TYPE_TRASH:
675
+
name = resources.getString(LogicMailResource.FOLDER_NAME_TRASH);
676
+
break;
677
+
case TYPE_NORMAL:
678
+
default:
679
+
name = this.folderTreeItem.getName();;
680
+
}
681
+
return name;
658
682
}
659
683
660
684
/**
+1
-1
LogicMail/src/org/logicprobe/LogicMail/ui/AccountConfigScreen.java
+1
-1
LogicMail/src/org/logicprobe/LogicMail/ui/AccountConfigScreen.java
···
168
168
else {
169
169
identityConfigs = new IdentityConfig[1];
170
170
identityConfigs[0] = new IdentityConfig();
171
-
identityConfigs[0].setIdentityName("Default");
171
+
identityConfigs[0].setIdentityName(IdentityConfig.getDefaultName());
172
172
createDefaultIdentity = true;
173
173
this.setDirty(true);
174
174
}
+1
-1
LogicMail/src/org/logicprobe/LogicMail/ui/AccountConfigWizard.java
+1
-1
LogicMail/src/org/logicprobe/LogicMail/ui/AccountConfigWizard.java