sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Moves NotInContactList group name string into language resources.

Browse Source
cusax-fix
Damian Minkov 15 years ago
parent 563ad52126
commit 41ff4810ac
10 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File

1
resources/languages/resources.properties
Unescape View File

@ -324,6 +324,7 @@ service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE=No accounts, supporting multi user c
service.gui.NO_ONLINE_TELEPHONY_ACCOUNT=At least one online telephony account is needed in order to make a call. Please login to one of your telephony accounts and try again.
service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=You're trying to close a chat with a non-sent message. Are you sure you want to close this chat?
service.gui.NON_EXISTING_USER_ID=The {0} server does not recognize specified user id.
service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=NotInContactList
service.gui.SD_QUALITY=Standard quality
service.gui.OFFLINE=Offline
service.gui.OK=&OK

3
src/net/java/sip/communicator/impl/protocol/dict/OperationSetPersistentPresenceDictImpl.java
Unescape View File

@ -953,7 +953,8 @@ public ContactDictImpl createVolatileContact(String contactAddress)
if (theVolatileGroup == null)
{
theVolatileGroup = new ContactGroupDictImpl(
"NotInContactList"
DictActivator.getResources().getI18NString(
"service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME")
, parentProvider);
theVolatileGroup.setResolved(false);
theVolatileGroup.setPersistent(false);

3
src/net/java/sip/communicator/impl/protocol/gibberish/OperationSetPersistentPresenceGibberishImpl.java
Unescape View File

@ -988,7 +988,8 @@ public ContactGibberishImpl createVolatileContact(String contactAddress)
if (theVolatileGroup == null)
{
theVolatileGroup = new ContactGroupGibberishImpl(
"NotInContactList"
GibberishActivator.getResources().getI18NString(
"service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME")
, parentProvider);
theVolatileGroup.setResolved(false);
theVolatileGroup.setPersistent(false);

3
src/net/java/sip/communicator/impl/protocol/icq/VolatileGroup.java
Unescape View File

@ -21,7 +21,8 @@ class VolatileGroup
VolatileGroup()
{
this("NotInContactList");
this(IcqActivator.getResources()
.getI18NString("service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME"));
}
VolatileGroup(String groupName)

8
src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java
Unescape View File

@ -37,10 +37,6 @@ public class ServerStoredContactListJabberImpl
private static final Logger logger =
Logger.getLogger(ServerStoredContactListJabberImpl.class);
/**
* The name of the Volatile group
*/
private static final String VOLATILE_GROUP_NAME = "NotInContactList";
/**
* The jabber list that we encapsulate
*/
@ -498,7 +494,9 @@ ContactJabberImpl createVolatileContact(String id)
if (theVolatileGroup == null)
{
theVolatileGroup = new VolatileContactGroupJabberImpl(
VOLATILE_GROUP_NAME, this);
JabberActivator.getResources().getI18NString(
"service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME"),
this);
theVolatileGroup.addContact(newVolatileContact);

8
src/net/java/sip/communicator/impl/protocol/msn/ServerStoredContactListMsnImpl.java
Unescape View File

@ -665,7 +665,9 @@ public void moveContact(ContactMsnImpl contact,
catch (OperationFailedException ex)
{
logger.error("Failed to add contact from " +
"NotInContactList group to new group: " + newParent, ex);
MsnActivator.getResources().getI18NString(
"service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME") +
" group to new group: " + newParent, ex);
}
return;
@ -682,7 +684,9 @@ public void moveContact(ContactMsnImpl contact,
catch (OperationFailedException ex)
{
logger.error("Failed to add contact from " +
"NotInContactList group to new group: " + newParent, ex);
MsnActivator.getResources().getI18NString(
"service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME") +
" group to new group: " + newParent, ex);
}
}
else

3
src/net/java/sip/communicator/impl/protocol/msn/VolatileGroup.java
Unescape View File

@ -16,7 +16,8 @@
public class VolatileGroup
implements MsnGroup
{
private String groupName = new String("NotInContactList");
private String groupName = MsnActivator.getResources().getI18NString(
"service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME");
VolatileGroup(){}

5
src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java
Unescape View File

@ -1725,7 +1725,10 @@ public ContactSipImpl createVolatileContact(String contactAddress,
ContactGroupSipImpl rootGroup =
this.ssContactList.getRootGroup();
volatileGroup = ssContactList
.createGroup(rootGroup, "NotInContactList", false);
.createGroup(rootGroup,
SipActivator.getResources().getI18NString(
"service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME"),
false);
}
if (displayName != null)

3
src/net/java/sip/communicator/impl/protocol/ssh/OperationSetPersistentPresenceSSHImpl.java
Unescape View File

@ -937,7 +937,8 @@ public ContactSSHImpl createVolatileContact(String contactAddress)
if (theVolatileGroup == null)
{
theVolatileGroup = new ContactGroupSSHImpl(
"NotInContactList"
SSHActivator.getResources().getI18NString(
"service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME")
, parentProvider);
theVolatileGroup.setResolved(false);
theVolatileGroup.setPersistent(false);

9
src/net/java/sip/communicator/impl/protocol/yahoo/ServerStoredContactListYahooImpl.java
Unescape View File

@ -30,11 +30,6 @@ public class ServerStoredContactListYahooImpl
private static final Logger logger =
Logger.getLogger(ServerStoredContactListYahooImpl.class);
/**
* The name of the Volatile group
*/
private static final String VOLATILE_GROUP_NAME = "NotInContactList";
/**
* If there is no group and we add contact with no parent
* a default group is created with name : DEFAULT_GROUP_NAME
@ -427,7 +422,9 @@ ContactYahooImpl createVolatileContact(String id)
if (theVolatileGroup == null)
{
theVolatileGroup = new VolatileContactGroupYahooImpl(
VOLATILE_GROUP_NAME, this);
YahooActivator.getResources().getI18NString(
"service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME"),
this);
theVolatileGroup.addContact(newVolatileContact);

Write Preview
Loading…
Cancel
Save