Revision: 8519 http://languagetool.svn.sourceforge.net/languagetool/?rev=8519&view=rev Author: gulp21-1 Date: 2012-12-08 20:19:07 +0000 (Sat, 08 Dec 2012) Log Message: ----------- [extension] escape every dynamicly created strings update ui strings + descriptions to reflect latest changes
Modified Paths: -------------- trunk/extension/common/locales/en-US/description.txt trunk/extension/firefox/TODO trunk/extension/firefox/lib/main.js trunk/extension/firefox/locale/de-DE.properties trunk/extension/firefox/locale/en-US.properties trunk/extension/firefox/package.json Modified: trunk/extension/common/locales/en-US/description.txt =================================================================== --- trunk/extension/common/locales/en-US/description.txt 2012-12-08 16:19:29 UTC (rev 8518) +++ trunk/extension/common/locales/en-US/description.txt 2012-12-08 20:19:07 UTC (rev 8519) @@ -24,18 +24,18 @@ <li>Select “Customize…”.</li> <li>Drag and drop the icon to wherever you want.</li> <li>Click on “Done”.</li> -<li>You might want to close add-on bar by clicking on the close icon on the left.</li> +<li>You might want to close the add-on bar by clicking on the close icon on the left.</li> </ol> <b>Known Issues</b> <ul> <li>It is not possible to check texts on websites which were loaded before the installation of the extension.</li> -<li>If you select a headline and the following paragraph, you might get a warning about wrong case because LanguageTool doesn't consider the paragraph.</li> +<li>If you select a headline and the following paragraph, you might get a warning about wrong case because LanguageTool doesn't consider the paragraph. It might also happen that the last word of the first paragraph and the first word of the second paragraph are joined together.</li> <li>“Text” between <script>-HTML-tags is checked, if it is part of the selection.</li> </ul> -<b>Where can I report whishes, problems, or false alarms?</b> +<b>Where can I report wishes, problems, or false alarms?</b> If you have any suggestion or problems, or you want to report a false alarm, you can leave a message in the <a href="http://languagetool.org/forum/">LanguageTool forum<a> or on the <a href="https://lists.sourceforge.net/lists/listinfo/languagetool-devel">mailing list</a>. Bug reports can also be added to the <a href="http://sourceforge.net/tracker/?group_id=110216">bug tracker</a>. <b>Please do not use the rating feature if you want to report a problem.</b> Modified: trunk/extension/firefox/TODO =================================================================== --- trunk/extension/firefox/TODO 2012-12-08 16:19:29 UTC (rev 8518) +++ trunk/extension/firefox/TODO 2012-12-08 20:19:07 UTC (rev 8519) @@ -1,7 +1,7 @@ - password fields (type="password") should probably not be send to the server at all, for privacy reasons and because it doesn't make sense anyway -- possibility to undock the panel (overlay webpage) +- possibility to undock the panel (overlay webpage or sidebar) - bug: CTRL-A and check on languagetool.org and you'll get Javascript code checked. "Text" in between <script>...</script> should probably be ignored. Modified: trunk/extension/firefox/lib/main.js =================================================================== --- trunk/extension/firefox/lib/main.js 2012-12-08 16:19:29 UTC (rev 8518) +++ trunk/extension/firefox/lib/main.js 2012-12-08 20:19:07 UTC (rev 8519) @@ -8,6 +8,7 @@ var widgets=require("widget"); var _=require("l10n").get; +var EMPTYTEXTWARNING="<div class=\"status\">"+_("emptyText")+"</div>"; var PLEASEWAITWHILECHECKING="<div class=\"status\">"+_("pleaseWaitWhileChecking")+"</div>"; var MAXCONTEXTLENGTH=20; var MAXLENGTHWEBSERVICE=50000; @@ -46,6 +47,7 @@ if(error.indexOf("language code")!=-1) { prepend=_("checkLanguageCode")+"<br/>"; } + error=escapeXml(error); return prepend + error.replace(/(\r\n|\n|\r)/," <a id=\"unhidelink\" href=\"javascript:unhide();\">…</a><br/>") .replace(/\<br\/\>/,"<div class=\"hidden\">") @@ -73,8 +75,8 @@ var returnTextGrammar=""; var returnTextSpelling=""; - var lang=getLanguage(response, "name"); - var mothertongue=getLanguage(response, "mothertonguename"); + var lang=escapeXml(getLanguage(response, "name")); + var mothertongue=escapeXml(getLanguage(response, "mothertonguename")); if(lang!="") { returnLanguage="<div class=\"status\">"+_("textLanguage")+" "+lang+"</div>"; @@ -114,7 +116,7 @@ } returnText+="<div class=\"context\">"+l+"<span class=\""+spanclass+"\">"+m+"</span>"+r+"</div>"; - url=getAttributeValue(response[i],"url"); + url=escapeXml(getAttributeValue(response[i],"url")); if(url!="") { returnText+="<div class=\"url\"><a targer=\"_blank\" href=\""+url+"\">"+_("moreInformation")+"</a></div>"; } @@ -147,8 +149,6 @@ }); function widgetClicked() { - var EMPTYTEXTWARNING="<div class=\"status\">"+_("emptyText")+"</div>"; - // avoid that selectedText is changed while the text is being checked selectedTextProcessed=selectedText; @@ -188,7 +188,7 @@ webServiceNote+="</div><hr/>"; if(response.status!=200) { console.log("Response status: "+response.status); - var errorText=webServiceNote+_("errorOccurredStatus")+" "+response.status + var errorText=webServiceNote+_("errorOccurredStatus")+" "+response.status; if(response.status==500) { errorText+="<br/>"+formatError(response.text); } @@ -208,7 +208,7 @@ onComplete: function (response) { if(response.status!=200) { console.log("Response status: "+response.status); - var errorText=_("errorOccurredStatus")+" "+response.status + var errorText=_("errorOccurredStatus")+" "+response.status; if(simpleprefs.prefs.enableWebService) { console.log("Connecting with web service"); errorText+="<br>"+_("usingWebService"); @@ -217,7 +217,7 @@ checkTextOnline.post(); } else { if(response.status==0) { - errorText+="<br/>"+_("checkLtRunning"); + errorText+="<br/>"+_("checkLtRunning", simpleprefs.prefs.localServerUrl); } else if(response.status==500) { errorText+="<br/>"+formatError(response.text); } Modified: trunk/extension/firefox/locale/de-DE.properties =================================================================== --- trunk/extension/firefox/locale/de-DE.properties 2012-12-08 16:19:29 UTC (rev 8518) +++ trunk/extension/firefox/locale/de-DE.properties 2012-12-08 20:19:07 UTC (rev 8519) @@ -3,7 +3,7 @@ noProblemsFound=Es wurden keine Probleme gefunden. checkSelectionWithLT=Markierten Text oder Text in Textfeld mit LanguageTool überprüfen moreInformation=mehr Informationen -checkLtRunning=Bitte stellen Sie sicher, dass ein LanguageTool-Server auf Port 8081 läuft oder aktivieren Sie den Webdienst in den <a href="about:addons">Add-on-Einstellungen</a>. +checkLtRunning=Bitte stellen Sie sicher, dass ein LanguageTool-Server unter %s läuft oder aktivieren Sie den Webdienst in den <a href="about:addons">Add-on-Einstellungen</a>. usingWebService=Benutzen des lokalen Servers fehlgeschlagen, verbinde mit Webdienst … emptyText=Keine Text ist markiert und kein Textfeld ist aktiviert. Bitte markieren Sie einen Text oder ein Textfeld, um den Text prüfen zu lassen. checkLanguageCode=Bitte stellen Sie sicher, dass die Sprachcodes in den <a href="about:addons">Add-on-Einstellungen</a> richtig sind. Benutzen Sie Codes wie 'de-DE', nicht 'de_DE', 'de-de' oder 'deutsch'. @@ -20,5 +20,5 @@ localServerUrl_title=URL des lokalen Servers localServerUrl_description=Sie können den Port, auf dem der LanguageTool-Server läuft, ändern oder eine komplett andere URL eingeben, z. B. wenn Sie einen zentralen Server in Ihrer Firma verwenden. enableWebService_title=Den Webdienst benutzen, wenn eine Verbindung mit dem lokalen Server nicht erfolgreich ist -enableWebService_description=Die Erweiterung versucht zuerst, eine Verbindung mit einem lokal laufenden LanguageTool-Server herzustellen. Wenn dies fehlschlägt und diese Option aktiviert ist, verbindet sich die Erweiterung mit api.languagetool.org, um den Text zu prüfen. Bitte beachten Sie jedoch, dass die Verbindung nicht verschlüsselt ist. Bitte lesen Sie die Add-on-Beschreibung und die Datenschutzerklärung für Einzelheiten. +enableWebService_description=Die Erweiterung versucht zuerst, eine Verbindung mit einem lokal laufenden LanguageTool-Server herzustellen. Wenn dies fehlschlägt und diese Option aktiviert ist, verbindet sich die Erweiterung mit api.languagetool.org, um den Text zu prüfen. Die Verbindung ist verschlüsselt; bitte lesen Sie die Add-on-Beschreibung und die Datenschutzerklärung für Einzelheiten. mothertongue_options.none selected=Keine ausgewählt Modified: trunk/extension/firefox/locale/en-US.properties =================================================================== --- trunk/extension/firefox/locale/en-US.properties 2012-12-08 16:19:29 UTC (rev 8518) +++ trunk/extension/firefox/locale/en-US.properties 2012-12-08 20:19:07 UTC (rev 8519) @@ -3,7 +3,7 @@ noProblemsFound=No problems have been found. checkSelectionWithLT=Check selected text or text in text field with LanguageTool moreInformation=more information -checkLtRunning=Please make sure that a LanguageTool Server is running on port 8081 or enable the web service in the <a href="about:addons">settings of the add-on</a>. +checkLtRunning=Please make sure that a LanguageTool Server is running on %s, or enable the web service in the <a href="about:addons">settings of the add-on</a>. usingWebService=Using local server failed, connecting with web service … emptyText=No text is selected and no text field is active. Please select a text or a text field in order to have the text checked. checkLanguageCode=Please make sure that the language codes in the <a href="about:addons">settings of the add-on</a> are correct. Use codes like 'en-US', not 'en_US', 'en-us', or 'english'. @@ -20,5 +20,5 @@ localServerUrl_title=URL of the local server localServerUrl_description=You can change the port on which the LanguageTool server is running, or enter a completely different URL, e.g. if you are using a central server in your company. enableWebService_title=Use web service when connecting with the local server is not successful -enableWebService_description=At first, the extension tries to connect to a locally running LanguageTool server. If this fails and this option is enabled, the extension connects to api.languagetool.org to check the text. Please note, however, that the connection is not encrypted. Please read the add-on description and the privacy policy for details. +enableWebService_description=At first, the extension tries to connect to a locally running LanguageTool server. If this fails and this option is enabled, the extension connects to api.languagetool.org to check the text. The connection is encrypted; please read the add-on description and the privacy policy for details. mothertongue_options.none selected=none selected Modified: trunk/extension/firefox/package.json =================================================================== --- trunk/extension/firefox/package.json 2012-12-08 16:19:29 UTC (rev 8518) +++ trunk/extension/firefox/package.json 2012-12-08 20:19:07 UTC (rev 8519) @@ -2,8 +2,8 @@ "name": "languagetoolfx", "license": "GPL 3.0", "author": "Markus Brenneis", - "contributors": "The LanguageTool Developers", - "version": "0.1-pre", + "contributors": ["The LanguageTool Developers"], + "version": "0.1-pre121208", "fullName": "LanguageToolFx", "id": "jid1-j3KiX1n7UXrjxQ", "description": "LanguageTool for Firefox", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d _______________________________________________ Languagetool-commits mailing list Languagetool-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/languagetool-commits