Author: daburna
Date: 2008-01-31 17:05:57 +0100 (Thu, 31 Jan 2008)
New Revision: 4422
Modified:
yacybar/chrome/yacybar/content/QuickCrawl.js
yacybar/chrome/yacybar/content/QuickCrawl.xul
yacybar/chrome/yacybar/content/about.xul
yacybar/chrome/yacybar/content/addBookmark.js
yacybar/chrome/yacybar/content/addBookmark.xul
yacybar/chrome/yacybar/content/prefs.xul
yacybar/chrome/yacybar/content/yacybarOverlay.js
yacybar/chrome/yacybar/locale/de-DE/yacybar.properties
yacybar/chrome/yacybar/locale/en-US/yacybar.properties
Log:
#update for property files
#small corrections and enhancement
Modified: yacybar/chrome/yacybar/content/QuickCrawl.js
===================================================================
--- yacybar/chrome/yacybar/content/QuickCrawl.js 2008-01-31 14:05:34 UTC
(rev 4421)
+++ yacybar/chrome/yacybar/content/QuickCrawl.js 2008-01-31 16:05:57 UTC
(rev 4422)
@@ -45,7 +45,8 @@
crawlJobData["showQuickCrawlDialog"] =
!document.getElementById('showQuickCrawlDialog').checked;
}
-function crawlingStartChanged() {
- document.getElementById('crawlingTitle').value = "Unknown";
+function crawlingStartChanged() {
+ var stringBundle = document.getElementById("yacybar-string-bundle");
+ document.getElementById('crawlingTitle').value =
stringBundle.getString("yacybar_unknown");
}
Modified: yacybar/chrome/yacybar/content/QuickCrawl.xul
===================================================================
--- yacybar/chrome/yacybar/content/QuickCrawl.xul 2008-01-31 14:05:34 UTC
(rev 4421)
+++ yacybar/chrome/yacybar/content/QuickCrawl.xul 2008-01-31 16:05:57 UTC
(rev 4422)
@@ -10,6 +10,10 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";>
<script type="application/x-javascript" src="QuickCrawl.js"/>
+
+ <stringbundleset id="stringbundleset">
+ <stringbundle id="yacybar-string-bundle"
src="chrome://yacybar/locale/yacybar.properties"/>
+ </stringbundleset>
<groupbox align="center" orient="horizontal">
<grid>
Modified: yacybar/chrome/yacybar/content/about.xul
===================================================================
--- yacybar/chrome/yacybar/content/about.xul 2008-01-31 14:05:34 UTC (rev
4421)
+++ yacybar/chrome/yacybar/content/about.xul 2008-01-31 16:05:57 UTC (rev
4422)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://yacybar/skin/about.css" type="text/css"?>
-<!DOCTYPE overlay SYSTEM "chrome://yacybar/locale/yacybar.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://yacybar/locale/yacybar.dtd">
<dialog buttons="accept"
id="YaCyBarAbout"
ondialogaccept="return true"
@@ -14,8 +14,8 @@
<vbox>
<text value="YaCy-Bar"
class="about-extension-name"/>
<text value="Version 0.2.3"/>
- </vbox>
- <image src="chrome://yacybar/skin/yacy_logo2.gif"/>
+ </vbox>
+ <image src="chrome://yacybar/skin/yacy_logo2.gif"/>
</hbox>
<separator class="thin"/>
@@ -30,7 +30,7 @@
<separator class="thin"/>
<text value="&about.text.homepage;"
class="about-extension-info"/>
- <text value="http://www.yacy.net/"; class="url"
onclick="window.open('http://www.yacy.net/'); self.close();"/>
+ <text value="http://www.yacy.net/"; class="url"
onclick="window.open('http://www.yacy.net/'); self.close();"/>
<separator class="thin"/>
</vbox>
<spring flex="1"/>
Modified: yacybar/chrome/yacybar/content/addBookmark.js
===================================================================
--- yacybar/chrome/yacybar/content/addBookmark.js 2008-01-31 14:05:34 UTC
(rev 4421)
+++ yacybar/chrome/yacybar/content/addBookmark.js 2008-01-31 16:05:57 UTC
(rev 4422)
@@ -36,15 +36,19 @@
var tags=document.getElementById("tags").value;
var
isPublic=document.getElementById("ispublic").getAttribute("selected");
var public="private"
+ var stringBundle = document.getElementById("yacybar-string-bundle");
if(isPublic){
public="public";
}
- if(url==""){
- alert("Please enter an URL");
+ if(url=="" && title==""){
+ alert(stringBundle.getString("yacybar_enterboth"));
+ }else if(url==""){
+ alert(stringBundle.getString("yacybar_enterurl"));
}else if(title==""){
- alert("Please enter a title");
+ alert(stringBundle.getString("yacybar_entertitle"));
}
+
//TODO: This needs the not exisiting backend
//TODO: Do not Change it, till a stable Release with the Backend!
//req.open('get', getBaseURL()+"/xml/bookmarks/posts/add_p.xml?");
Modified: yacybar/chrome/yacybar/content/addBookmark.xul
===================================================================
--- yacybar/chrome/yacybar/content/addBookmark.xul 2008-01-31 14:05:34 UTC
(rev 4421)
+++ yacybar/chrome/yacybar/content/addBookmark.xul 2008-01-31 16:05:57 UTC
(rev 4422)
@@ -9,7 +9,10 @@
title="&addBM.dialog.title;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";>
<script type="application/x-javascript" src="functions.js"/>
- <script type="application/x-javascript" src="addBookmark.js"/>
+ <script type="application/x-javascript" src="addBookmark.js"/>
+ <stringbundleset id="stringbundleset">
+ <stringbundle id="yacybar-string-bundle"
src="chrome://yacybar/locale/yacybar.properties"/>
+ </stringbundleset>
<vbox>
<label for="url" value="&addBM.label.url;"/>
<textbox id="url" flex="1" />
@@ -22,8 +25,8 @@
<label for="public" value="&addBM.label.public;"/>
<menulist id="public">
<menupopup>
- <menuitem value="&addBM.menuitem.yes;"
label="yes" selected="true" id="ispublic" />
- <menuitem value="&addBM.menuitem.no;"
label="no" id="isprivate" />
+ <menuitem value="&addBM.menuitem.yes;"
label="&addBM.menuitem.yes;" selected="true" id="ispublic" />
+ <menuitem value="&addBM.menuitem.no;"
label="&addBM.menuitem.no;" id="isprivate" />
</menupopup>
</menulist>
</vbox>
Modified: yacybar/chrome/yacybar/content/prefs.xul
===================================================================
--- yacybar/chrome/yacybar/content/prefs.xul 2008-01-31 14:05:34 UTC (rev
4421)
+++ yacybar/chrome/yacybar/content/prefs.xul 2008-01-31 16:05:57 UTC (rev
4422)
@@ -55,11 +55,7 @@
<!-- searching preferences -->
<preference id="yacybar_searchMaxResults"
name="extensions.yacybar.search.maxResults"
- type="int"/>
- <preference id="yacybar_searchOrderBy"
- name="extensions.yacybar.search.orderBy"
- type="string"/>
- <preference id="yacybar_searchResource"
+ type="int"/>
<preference id="yacybar_searchResource"
name="extensions.yacybar.search.resource"
type="string"/>
<preference id="yacybar_searchMaxSearchTime"
@@ -145,7 +141,7 @@
<description>&prefs.tabpanel.description.searching;</description>
<grid>
- <rows>
+ <rows>
<row>
<label
value="&prefs.tabpanel.label.value.maxresults;"/>
<menulist
preference="yacybar_searchMaxResults" id="search.MaxResults" editable="true">
Modified: yacybar/chrome/yacybar/content/yacybarOverlay.js
===================================================================
--- yacybar/chrome/yacybar/content/yacybarOverlay.js 2008-01-31 14:05:34 UTC
(rev 4421)
+++ yacybar/chrome/yacybar/content/yacybarOverlay.js 2008-01-31 16:05:57 UTC
(rev 4422)
@@ -54,7 +54,7 @@
}
}
- // init search settings
+ // init search settings
if (!Branch.prefHasUserValue("search.maxResults"))
Branch.setIntPref("search.maxResults",10);
if (!Branch.prefHasUserValue("search.resource"))
Branch.setCharPref("search.resource","global");
if (!Branch.prefHasUserValue("search.maxSearchTime"))
Branch.setIntPref("search.maxSearchTime",6);
@@ -104,7 +104,7 @@
function getSearchURL(keyword) {
// alert(searchwords);
-
+
var maxResults = Branch.getIntPref("search.maxResults");
var resource = Branch.getCharPref("search.resource");
var maxSearchTime = Branch.getIntPref("search.maxSearchTime");
Modified: yacybar/chrome/yacybar/locale/de-DE/yacybar.properties
===================================================================
--- yacybar/chrome/yacybar/locale/de-DE/yacybar.properties 2008-01-31
14:05:34 UTC (rev 4421)
+++ yacybar/chrome/yacybar/locale/de-DE/yacybar.properties 2008-01-31
16:05:57 UTC (rev 4422)
@@ -1,3 +1,9 @@
+# addBookmark
+
+yacybar_enterboth=Bitte geben Sie eine URL und einen Titel ein
+yacybar_enterurl=Bitte geben Sie eine URL ein
+yacybar_entertitle=Bitte geben Sie einen Titel ein
+
# firststart
yacybar_nextstart=Beim nächsten Start von Firefox müssen Sie den Demomodus
erneut aktivieren. Sie finden ihn im YaCy-Menü.
@@ -2,2 +8,6 @@
+# quickcrawl
+
+yacybar_unknown=Unbekannt
+
# yacybaroverlays
Modified: yacybar/chrome/yacybar/locale/en-US/yacybar.properties
===================================================================
--- yacybar/chrome/yacybar/locale/en-US/yacybar.properties 2008-01-31
14:05:34 UTC (rev 4421)
+++ yacybar/chrome/yacybar/locale/en-US/yacybar.properties 2008-01-31
16:05:57 UTC (rev 4422)
@@ -1,3 +1,9 @@
+# addBookmark
+
+yacybar_enterboth=Please enter an URL and a title
+yacybar_enterurl=Please enter an URL
+yacybar_entertitle=Please enter a title
+
# firststart
yacybar_nextstart=On next start of firefox you need to reenable the Demomode.
You can find it then in the YaCy-Menu.
@@ -2,2 +8,6 @@
+# quickcrawl
+
+yacybar_unknown=Unknown
+
# yacybaroverlays
_______________________________________________
YaCy-svn mailing list
YaCy-svn@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/yacy-svn
