[freenet-cvs] r13159 - in trunk/freenet/src/freenet: l10n node/useralerts

[toad at freenetproject.org]

Author: toad
Date: 2007-05-05 22:13:56 +0000 (Sat, 05 May 2007)
New Revision: 13159

Modified:
   trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
   trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
   trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
Log:
Another one

Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties	2007-05-05 21:01:33 UTC (rev 13158)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties	2007-05-05 22:13:56 UTC (rev 13159)
@@ -737,4 +737,8 @@
 IPUndetectedUserAlert.unknownAddressWithConfigLink=Freenet was unable to determine your external IP address (or the IP address of your NAT-device or firewall). You can still exchange references with other people, however this will only work if the other user is not behind a NAT-device or firewall. As soon as you have connected to one other user in this way, Freenet will be able to determine your external IP address. You can determine your current IP address and tell your node with the 'Temporary IP address hint' ${link}configuration parameter${/link}. Also, it would be a good idea to forward the port ${port} on your router for UDP to make it easy to connect to your node.
 MeaningfulNodeNameUserAlert.noNodeNickTitle=Your node name isn't defined.
 MeaningfulNodeNameUserAlert.noNodeNick=It seems that your node doesn't know your nickname. Putting your e-mail address or IRC nickname here is generally speaking a good idea and helps your friends to identify your node (note that only your darknet peers listed on the friends page can see your node name, it will not be displayed to opennet peers).
+N2NTMUserAlert.title=Node to Node Text Message ${number} from ${peername} (${peer})
+N2NTMUserAlert.header=From: ${from} (composed ${composed} | sent ${sent} | received ${received})
+N2NTMUserAlert.reply=Reply
+N2NTMUserAlert.delete=Delete
 End

Modified: trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java	2007-05-05 21:01:33 UTC (rev 13158)
+++ trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java	2007-05-05 22:13:56 UTC (rev 13159)
@@ -65,7 +65,7 @@
 	}
 	
 	public String dismissButtonText(){
-		return "Hide";
+		return L10n.getString("UserAlert.hide");
 	}
 	
 	public boolean shouldUnregisterOnDismiss() {

Modified: trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java	2007-05-05 21:01:33 UTC (rev 13158)
+++ trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java	2007-05-05 22:13:56 UTC (rev 13159)
@@ -6,6 +6,7 @@
 import java.text.DateFormat;
 import java.util.Date;
 
+import freenet.l10n.L10n;
 import freenet.node.PeerNode;
 import freenet.support.HTMLEncoder;
 import freenet.support.HTMLNode;
@@ -39,34 +40,29 @@
 	}
 
 	public String getTitle() {
-		return "Node To Node Text Message "+fileNumber+" from "+sourcePeerNode.getName()+" ("+sourcePeerNode.getPeer()+ ')';
+		return l10n("title", new String[] { "number", "peername", "peer" },
+				new String[] { Integer.toString(fileNumber), sourcePeerNode.getName(), sourcePeerNode.getPeer().toString() });
 	}
 	
 	public String getText() {
-	  String messageTextBuf = HTMLEncoder.encode(messageText);
-	  int j = messageTextBuf.length();
-		StringBuffer messageTextBuf2 = new StringBuffer(j);
-		for (int i = 0; i < j; i++) {
-		  char ch = messageTextBuf.charAt(i);
-		  if(ch == '\n')
-		    messageTextBuf2.append("<br />");
-		  else
-		    messageTextBuf2.append(ch);
-		}
-		String replyString = "<a href=\"/send_n2ntm/?peernode_hashcode="+sourcePeerNode.hashCode()+"\">Reply</a><br /><br />";
-		String s;
-		s = "From: &lt;"+HTMLEncoder.encode(sourceNodename)+"&gt;<br />To: &lt;"+HTMLEncoder.encode(targetNodename)+"&gt;<hr /><br /><br />"+messageTextBuf2+"<br /><br />"+replyString;
-		return s;
+		return 
+			l10n("header", new String[] { "from", "composed", "sent", "received" },
+					new String[] { sourceNodename, DateFormat.getInstance().format(new Date(composedTime)), 
+					DateFormat.getInstance().format(new Date(sentTime)), DateFormat.getInstance().format(new Date(receivedTime)) }) + "\n" +
+			messageText;
 	}
 
 	public HTMLNode getHTMLText() {
 		HTMLNode alertNode = new HTMLNode("div");
-		alertNode.addChild("p", "From: " + sourceNodename + " (composed: " + DateFormat.getInstance().format(new Date(composedTime)) + " | sent: " + DateFormat.getInstance().format(new Date(sentTime)) + " | received: " + DateFormat.getInstance().format(new Date(receivedTime)) + ')');
+		alertNode.addChild("p",
+				l10n("header", new String[] { "from", "composed", "sent", "received" },
+						new String[] { sourceNodename, DateFormat.getInstance().format(new Date(composedTime)), 
+						DateFormat.getInstance().format(new Date(sentTime)), DateFormat.getInstance().format(new Date(receivedTime)) }));
 		String[] lines = messageText.split("\n");
 		for (int i = 0, c = lines.length; i < c; i++) {
 			alertNode.addChild("div", lines[i]);
 		}
-		alertNode.addChild("p").addChild("a", "href", "/send_n2ntm/?peernode_hashcode=" + sourcePeerNode.hashCode(), "Reply");
+		alertNode.addChild("p").addChild("a", "href", "/send_n2ntm/?peernode_hashcode=" + sourcePeerNode.hashCode(), l10n("reply"));
 		return alertNode;
 	}
 
@@ -83,9 +79,17 @@
 	}
 	
 	public String dismissButtonText(){
-		return "Delete";
+		return l10n("delete");
 	}
 	
+	private String l10n(String key) {
+		return L10n.getString("N2NTMUserAlert."+key);
+	}
+
+	private String l10n(String key, String[] patterns, String[] values) {
+		return L10n.getString("N2NTMUserAlert."+key, patterns, values);
+	}
+
 	public boolean shouldUnregisterOnDismiss() {
 		return true;
 	}