message cleanup
This commit is contained in:
@ -247,8 +247,8 @@ public class AddressbookBean
|
||||
//message = _("This addressbook is empty.");
|
||||
message = "";
|
||||
else
|
||||
message = ngettext("Addressbook contains 1 entry.",
|
||||
"Addressbook contains {0} entries.",
|
||||
message = ngettext("Address book contains 1 entry.",
|
||||
"Address book contains {0} entries.",
|
||||
resultCount);
|
||||
}
|
||||
if (resultCount <= 0) {
|
||||
@ -294,9 +294,9 @@ public class AddressbookBean
|
||||
|
||||
String oldDest = (String) addressbook.get(host);
|
||||
if (destination.equals(oldDest)) {
|
||||
message = _("Host name {0} is already in addressbook, unchanged.", displayHost);
|
||||
message = _("Host name {0} is already in address book, unchanged.", displayHost);
|
||||
} else if (oldDest != null && !action.equals(_("Replace"))) {
|
||||
message = _("Host name {0} is already in addressbook with a different destination. Click \"Replace\" to overwrite.", displayHost);
|
||||
message = _("Host name {0} is already in address book with a different destination. Click \"Replace\" to overwrite.", displayHost);
|
||||
} else {
|
||||
boolean valid = true;
|
||||
try {
|
||||
@ -357,7 +357,7 @@ public class AddressbookBean
|
||||
if( changed ) {
|
||||
try {
|
||||
save();
|
||||
message += "<br>" + _("Addressbook saved.");
|
||||
message += "<br>" + _("Address book saved.");
|
||||
} catch (Exception e) {
|
||||
Debug.debug( e.getClass().getName() + ": " + e.getMessage() );
|
||||
message += "<br>" + _("ERROR: Could not write addressbook file.");
|
||||
|
@ -239,9 +239,9 @@ public class NamingServiceBean extends AddressbookBean
|
||||
Properties outProperties= new Properties();
|
||||
Destination oldDest = getNamingService().lookup(host, nsOptions, outProperties);
|
||||
if (oldDest != null && destination.equals(oldDest.toBase64())) {
|
||||
message = _("Host name {0} is already in addressbook, unchanged.", displayHost);
|
||||
message = _("Host name {0} is already in address book, unchanged.", displayHost);
|
||||
} else if (oldDest != null && !action.equals(_("Replace"))) {
|
||||
message = _("Host name {0} is already in addressbook with a different destination. Click \"Replace\" to overwrite.", displayHost);
|
||||
message = _("Host name {0} is already in address book with a different destination. Click \"Replace\" to overwrite.", displayHost);
|
||||
} else {
|
||||
try {
|
||||
Destination dest = new Destination(destination);
|
||||
@ -308,7 +308,7 @@ public class NamingServiceBean extends AddressbookBean
|
||||
search = null;
|
||||
}
|
||||
if( changed ) {
|
||||
message += "<br>" + _("Addressbook saved.");
|
||||
message += "<br>" + _("Address book saved.");
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
@ -43,7 +43,7 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||
<title>${book.book} <%=intl._("addressbook")%> - susidns</title>
|
||||
<title>${book.book} <%=intl._("address book")%> - susidns</title>
|
||||
<link rel="stylesheet" type="text/css" href="css.css">
|
||||
</head>
|
||||
<body>
|
||||
@ -177,7 +177,7 @@ ${book.loadBookMessages}
|
||||
|
||||
<c:if test="${book.isEmpty}">
|
||||
<div id="book">
|
||||
<p class="book"><%=intl._("This addressbook is empty.")%></p>
|
||||
<p class="book"><%=intl._("This address book is empty.")%></p>
|
||||
</div>
|
||||
</c:if>
|
||||
|
||||
|
@ -88,7 +88,7 @@
|
||||
<%
|
||||
if (addr.isIDN()) {
|
||||
%>
|
||||
<td><%=intl._("Punycode Name")%></td>
|
||||
<td><%=intl._("Encoded Name")%></td>
|
||||
<td><a href="http://<%=addr.getName()%>/"><%=addr.getName()%></a></td>
|
||||
</tr><tr class="list${book.trClass}">
|
||||
<%
|
||||
|
Reference in New Issue
Block a user