zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

message cleanup

Browse Source
This commit is contained in:
zzz
2011-03-30 00:42:08 +00:00
parent 7020bfd521
commit 6dd7431ccd
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
View File

@@ -247,8 +247,8 @@ public class AddressbookBean
//message = _("This addressbook is empty."); //message = _("This addressbook is empty.");
message = ""; message = "";
else else
message = ngettext("Addressbook contains 1 entry.", message = ngettext("Address book contains 1 entry.",
"Addressbook contains {0} entries.", "Address book contains {0} entries.",
resultCount); resultCount);
} }
if (resultCount <= 0) { if (resultCount <= 0) {
@@ -294,9 +294,9 @@ public class AddressbookBean
String oldDest = (String) addressbook.get(host); String oldDest = (String) addressbook.get(host);
if (destination.equals(oldDest)) { 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"))) { } 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 { } else {
boolean valid = true; boolean valid = true;
try { try {
@@ -357,7 +357,7 @@ public class AddressbookBean
if( changed ) { if( changed ) {
try { try {
save(); save();
message += "<br>" + _("Addressbook saved."); message += "<br>" + _("Address book saved.");
} catch (Exception e) { } catch (Exception e) {
Debug.debug( e.getClass().getName() + ": " + e.getMessage() ); Debug.debug( e.getClass().getName() + ": " + e.getMessage() );
message += "<br>" + _("ERROR: Could not write addressbook file."); message += "<br>" + _("ERROR: Could not write addressbook file.");

6
apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java
View File

@@ -239,9 +239,9 @@ public class NamingServiceBean extends AddressbookBean
Properties outProperties= new Properties(); Properties outProperties= new Properties();
Destination oldDest = getNamingService().lookup(host, nsOptions, outProperties); Destination oldDest = getNamingService().lookup(host, nsOptions, outProperties);
if (oldDest != null && destination.equals(oldDest.toBase64())) { 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"))) { } 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 { } else {
try { try {
Destination dest = new Destination(destination); Destination dest = new Destination(destination);
@@ -308,7 +308,7 @@ public class NamingServiceBean extends AddressbookBean
search = null; search = null;
} }
if( changed ) { if( changed ) {
message += "<br>" + _("Addressbook saved."); message += "<br>" + _("Address book saved.");
} }
} }
else { else {

4
apps/susidns/src/jsp/addressbook.jsp
View File

@@ -43,7 +43,7 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <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"> <link rel="stylesheet" type="text/css" href="css.css">
</head> </head>
<body> <body>
@@ -177,7 +177,7 @@ ${book.loadBookMessages}
<c:if test="${book.isEmpty}"> <c:if test="${book.isEmpty}">
<div id="book"> <div id="book">
<p class="book"><%=intl._("This addressbook is empty.")%></p> <p class="book"><%=intl._("This address book is empty.")%></p>
</div> </div>
</c:if> </c:if>

2
apps/susidns/src/jsp/details.jsp
View File

@@ -88,7 +88,7 @@
<% <%
if (addr.isIDN()) { if (addr.isIDN()) {
%> %>
<td><%=intl._("Punycode Name")%></td> <td><%=intl._("Encoded Name")%></td>
<td><a href="http://<%=addr.getName()%>/"><%=addr.getName()%></a></td> <td><a href="http://<%=addr.getName()%>/"><%=addr.getName()%></a></td>
</tr><tr class="list${book.trClass}"> </tr><tr class="list${book.trClass}">
<% <%