Author: jflesch
Date: 2007-04-23 22:28:38 +0000 (Mon, 23 Apr 2007)
New Revision: 12907
Modified:
trunk/apps/Thaw/src/thaw/fcp/FreenetURIHelper.java
trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java
Log:
Fix key cleaning
Modified: trunk/apps/Thaw/src/thaw/fcp/FreenetURIHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FreenetURIHelper.java 2007-04-23 22:15:05 UTC
(rev 12906)
+++ trunk/apps/Thaw/src/thaw/fcp/FreenetURIHelper.java 2007-04-23 22:28:38 UTC
(rev 12907)
@@ -30,8 +30,9 @@
if (uri == null)
return uri;
+ uri = uri.trim();
uri = uri.replaceFirst("http://127.0.0.1:8888/";, "");
- uri = uri.replaceFirst("http://localhost/";, "");
+ uri = uri.replaceFirst("http://localhost:8888/";, "");
uri = uri.replaceFirst("freenet:", "");
try {
Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-04-23
22:15:05 UTC (rev 12906)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-04-23
22:28:38 UTC (rev 12907)
@@ -176,7 +176,9 @@
thaw.plugin.fetch.freenet0.5.l5=Merci d'avance,
thaw.plugin.fetch.freenet0.5.l6=le Thaw d?velopeur de Thaw.
+thaw.plugins.fetch.noValidURI=Pas de clef valide trouv?e dans la liste
+
thaw.plugin.console.console=Console de log
thaw.plugin.console.saveToFile=Sauvegarder les logs
thaw.plugin.console.maxSize=M?moire maximum allou? au stockage des logs (in
Bytes)
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-04-23 22:15:05 UTC
(rev 12906)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-04-23 22:28:38 UTC
(rev 12907)
@@ -180,6 +180,7 @@
thaw.plugin.fetch.freenet0.5.l5=Thanks,
thaw.plugin.fetch.freenet0.5.l6=the Thaw developper.
+thaw.plugins.fetch.noValidURI=No valid key found in the list !
thaw.plugin.console.console=Log console
thaw.plugin.console.saveToFile=Save log to file
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-04-23 22:15:05 UTC
(rev 12906)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-04-23 22:28:38 UTC
(rev 12907)
@@ -176,7 +176,9 @@
thaw.plugin.fetch.freenet0.5.l5=Merci d'avance,
thaw.plugin.fetch.freenet0.5.l6=le Thaw d\u00e9velopeur de Thaw.
+thaw.plugins.fetch.noValidURI=Pas de clef valide trouv\u00e9e dans la liste
+
thaw.plugin.console.console=Console de log
thaw.plugin.console.saveToFile=Sauvegarder les logs
thaw.plugin.console.maxSize=M\u00e9moire maximum allou\u00e9 au stockage des
logs (in Bytes)
@@ -341,8 +343,9 @@
thaw.plugin.index.comment.reset=Remettre les commentaires \u00e0 0
thaw.plugin.index.comment.moderated=*MOD\u00c9R\u00c9*
+thaw.plugin.index.comment.moderate=Moderer
+thaw.plugin.index.comment.unmoderate=D\u00e9mod\u00e9rer
-
thaw.plugin.index.mustReinsert=Vous devez r\u00e9inserer l'index pour que les
changements fassent effet
Modified: trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java 2007-04-23 22:15:05 UTC
(rev 12906)
+++ trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java 2007-04-23 22:28:38 UTC
(rev 12907)
@@ -98,8 +98,10 @@
final int persistence, final boolean globalQueue,
final String destination) {
+ boolean somethingStarted = false;
boolean trollDetected = false; /* because of trolls coming from
0.5 */
+
for(int i = 0 ; i < keys.length ; i++) {
if(keys[i].length() < 10)
continue;
@@ -128,6 +130,7 @@
persistence,
globalQueue, -1,
destination));
+ somethingStarted = true;
}
fetchFrame.setVisible(false);
@@ -140,8 +143,15 @@
+
I18n.getMessage("thaw.plugin.fetch.freenet0.5.l4")+"\n"
+
I18n.getMessage("thaw.plugin.fetch.freenet0.5.l5")+"\n"
+
I18n.getMessage("thaw.plugin.fetch.freenet0.5.l6"));
+ return;
+ }
+ if (!somethingStarted) {
+ new thaw.gui.WarningWindow(core,
+
I18n.getMessage("thaw.plugin.fetch.noValidURI"));
+ return;
}
+
}
