[Sciviews-commits] r118 - in komodo/SciViews-K: content content/js locale/en-GB locale/fr-FR
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Feb 26 14:06:17 CET 2009
Author: prezez
Date: 2009-02-26 14:06:16 +0100 (Thu, 26 Feb 2009)
New Revision: 118
Modified:
komodo/SciViews-K/content/js/r.js
komodo/SciViews-K/content/js/robjects.js
komodo/SciViews-K/content/pkgManager.xul
komodo/SciViews-K/locale/en-GB/main.properties
komodo/SciViews-K/locale/fr-FR/main.properties
Log:
Typos and small bugs corrected
Modified: komodo/SciViews-K/content/js/r.js
===================================================================
--- komodo/SciViews-K/content/js/r.js 2009-02-25 22:28:43 UTC (rev 117)
+++ komodo/SciViews-K/content/js/r.js 2009-02-26 13:06:16 UTC (rev 118)
@@ -426,7 +426,7 @@
if (topic == "") {
// let's not cry so much about an empty selection
- ko.statusBar.AddMessage(SelectionEmpty, "R", 1000, false);
+ ko.statusBar.AddMessage(sv.translate("SelectionEmpty"), "R", 1000, false);
//alert("Nothing is selected!");
}
@@ -467,14 +467,14 @@
var res = false;
if (typeof(topic) == "undefined" | topic == "") topic = sv.getText();
// Ask for the search string
- topic = ko.dialogs.prompt("Search R objects using a regular expression" +
- " (e.g., '^log' for objects starting with 'log')",
- "Pattern", topic, "Search R help", "okRsearchPattern");
+ topic = ko.dialogs.prompt(sv.translate("Search_R_objects_using_a_regular_expression"),
+ sv.translate("Pattern"), topic,
+ sv.translate("Search_R_help"), "okRsearchPattern");
if (topic != null & topic != "") {
// Get list of matching items and evaluate it with sv.r.search_select()
res = sv.r.evalCallback('cat(apropos("' + topic + '"), sep = "' + sv.r.sep + '")',
sv.r.search_select);
- ko.statusBar.AddMessage("Searching R help for '" + topic + "'",
+ ko.statusBar.AddMessage(sv.translate("Searching_R_help_for", topic),
"R", 5000, true);
}
return(res);
@@ -485,7 +485,7 @@
ko.statusBar.AddMessage("", "R");
var res = false;
if (sv.tools.strings.removeLastCRLF(topics) == "") {
- alert("No item found in R help!");
+ sv.cmdout.message(sv.translate("No_item_found_in_R_help"));
} else { // Something is returned
var items = topics.split(sv.r.sep);
if (items.length == 1) {
@@ -586,8 +586,8 @@
sv.r.loadWorkspace = function(file, attach) {
// Ask for the filename if not provided
if (!file) {
- file = sv.fileOpen("", ".RData", "Browse for workspace",
- ["R workspace (*.RData)|*.RData"], true);
+ file = sv.fileOpen("", ".RData", sv.translate("Browse_for_workspace"),
+ [sv.translate("R_workspace") + " (*.RData)|*.RData"], true);
} else if (typeof files == "string") {
file = file.split(/[;,]/);
}
Modified: komodo/SciViews-K/content/js/robjects.js
===================================================================
--- komodo/SciViews-K/content/js/robjects.js 2009-02-25 22:28:43 UTC (rev 117)
+++ komodo/SciViews-K/content/js/robjects.js 2009-02-26 13:06:16 UTC (rev 118)
@@ -134,7 +134,7 @@
var isInitialized = false;
-this.debug = true;
+this.debug = false;
this.visibleData = [];
this.treeData = [];
Modified: komodo/SciViews-K/content/pkgManager.xul
===================================================================
--- komodo/SciViews-K/content/pkgManager.xul 2009-02-25 22:28:43 UTC (rev 117)
+++ komodo/SciViews-K/content/pkgManager.xul 2009-02-26 13:06:16 UTC (rev 118)
@@ -285,7 +285,8 @@
//var uItem = el.appendChild(getUpdateItem(pkg));
theUpdatesList.appendChild(getUpdateItem(pkg));
}
- document.getElementById("myTabList").selectedIndex = 2;
+ //document.getElementById("pkgPanels").selectedIndex = 2;
+ document.getElementById("pkgPanelButtons").childNodes[2].click();
//ade4;;1.4-9;;2.8.0;;1.4-10;;http://r.meteo.uni.wroc.pl/bin/windows/contrib/2.8
@@ -340,11 +341,11 @@
<hbox>
-<radiogroup orient="horizontal">
+<radiogroup id="pkgPanelButtons" orient="horizontal">
<radio label="Available"
oncommand="document.getElementById('pkgPanels').selectedIndex = 0;"
/>
- <radio label="Installed"
+ <radio label="Installed" selected="true"
oncommand="document.getElementById('pkgPanels').selectedIndex = 1;"
/>
<radio label="Updates"
Modified: komodo/SciViews-K/locale/en-GB/main.properties
===================================================================
--- komodo/SciViews-K/locale/en-GB/main.properties 2009-02-25 22:28:43 UTC (rev 117)
+++ komodo/SciViews-K/locale/en-GB/main.properties 2009-02-26 13:06:16 UTC (rev 118)
@@ -6,19 +6,26 @@
titleOpenFile=Open file
#r.js
ChooseWorkingDir=Choose working directory
-WorkingDirSetTo=Current R's working directory is: "%s
+WorkingDirSetTo=Current R's working directory is: "%S"
RHelpStarted=R help started... should display in browser soon
SelectionEmpty=Selection is empty...
-RHelpAskedFor=R help asked for "%s'"
-RExampleFor=R example run for "%s"
+RHelpAskedFor=R help asked for "%S"
+RExampleFor=R example run for "%S"
ListingPackages=Listing available R packages... please wait
InstallingPackages=Installing available R packages... please wait
titleInstallPackage=Install R package
titleLoadPackage=Load R package
-selectPkgsToInstall=Select package(s) to install
-selectPkgToLoad=Select R package(s) to load
+SelectPkgsToInstall=Select package(s) to install
+SelectPkgToLoad=Select R package(s) to load
InstallingPkgs=Installing packages... please wait
RetrievingCRANMirrors=Retrieving CRAN mirrors list... please wait
-CRANMirrorSetTo=Current CRAN mirror is set to %s
+CRANMirrorSetTo=Current CRAN mirror is set to %S
CRANMirrors=CRAN mirrors
SelectCRANMirror=Select CRAN mirror to use:
+Search_R_objects_using_a_regular_expression=Search R objects using a regular expression (e.g. '^log' for objects starting with 'log')
+Pattern=Pattern
+Search_R_help=Search R help
+Searching R help for "%S"
+No_item_found_in_R_help=No item found in R help!
+Browse_for_workspace=Browse for workspace
+R_workspace=R workspace
Modified: komodo/SciViews-K/locale/fr-FR/main.properties
===================================================================
--- komodo/SciViews-K/locale/fr-FR/main.properties 2009-02-25 22:28:43 UTC (rev 117)
+++ komodo/SciViews-K/locale/fr-FR/main.properties 2009-02-26 13:06:16 UTC (rev 118)
@@ -6,17 +6,26 @@
titleOpenFile=Open file
#r.js
ChooseWorkingDir=Choose working directory
-WorkingDirSetTo="Current R's working directory is: "%s"
+WorkingDirSetTo=Current R's working directory is: "%S"
RHelpStarted=R help started... should display in browser soon
SelectionEmpty=Selection is empty...
-RHelpAskedFor=R help asked for "%s'"
-RExampleFor=R example run for "%s"
+RHelpAskedFor=R help asked for "%S"
+RExampleFor=R example run for "%S"
ListingPackages=Listing available R packages... please wait
-InstallingPackages=Listing available R packages... please wait
+InstallingPackages=Installing available R packages... please wait
titleInstallPackage=Install R package
-selectPkgsToInstall=Select package(s) to install
+titleLoadPackage=Load R package
+SelectPkgsToInstall=Select package(s) to install
+SelectPkgToLoad=Select R package(s) to load
InstallingPkgs=Installing packages... please wait
RetrievingCRANMirrors=Retrieving CRAN mirrors list... please wait
-CRANMirrorSetTo=Current CRAN mirror is set to %s
+CRANMirrorSetTo=Current CRAN mirror is set to %S
CRANMirrors=CRAN mirrors
SelectCRANMirror=Select CRAN mirror to use:
+Search_R_objects_using_a_regular_expression=Search R objects using a regular expression (e.g. '^log' for objects starting with 'log')
+Pattern=Pattern
+Search_R_help=Search R help
+Searching R help for "%S"
+No_item_found_in_R_help=No item found in R help!
+Browse_for_workspace=Browse for workspace
+R_workspace=R workspace
More information about the Sciviews-commits
mailing list