[rkward-cvs] [rkward] packages/rkwarddev: removed the bogus i18n stuff from all relevant functions, and fixed a regexp problem when cleaning up IDs
m.eik michalke
meik.michalke at uni-duesseldorf.de
Fri Nov 28 21:04:34 UTC 2014
Git commit 2dddccfad7bfb429220b610d4693a67f48b1fd0e by m.eik michalke.
Committed on 28/11/2014 at 21:02.
Pushed by meikm into branch 'master'.
removed the bogus i18n stuff from all relevant functions, and fixed a regexp problem when cleaning up IDs
M +6 -1 packages/rkwarddev/ChangeLog
M +1 -3 packages/rkwarddev/DESCRIPTION
M +0 -2 packages/rkwarddev/NAMESPACE
M +1 -1 packages/rkwarddev/R/rk-internal.R
M +5 -19 packages/rkwarddev/R/rk.XML.plugin.R
M +1 -6 packages/rkwarddev/R/rk.XML.pluginmap.R
D +0 -40 packages/rkwarddev/R/rk.get.language.R
M +10 -57 packages/rkwarddev/R/rk.plugin.skeleton.R
M +2 -9 packages/rkwarddev/R/rk.rkh.doc.R
D +0 -49 packages/rkwarddev/R/rk.set.language.R
M +1 -1 packages/rkwarddev/R/rkwarddev-package.R
M +11 -1 packages/rkwarddev/inst/NEWS.Rd
M +- -- packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
M +1 -4 packages/rkwarddev/man/rk.XML.plugin.Rd
M +1 -4 packages/rkwarddev/man/rk.XML.pluginmap.Rd
D +0 -17 packages/rkwarddev/man/rk.get.language.Rd
M +1 -5 packages/rkwarddev/man/rk.plugin.skeleton.Rd
M +1 -4 packages/rkwarddev/man/rk.rkh.doc.Rd
D +0 -22 packages/rkwarddev/man/rk.set.language.Rd
M +1 -1 packages/rkwarddev/man/rkwarddev-package.Rd
http://commits.kde.org/rkward/2dddccfad7bfb429220b610d4693a67f48b1fd0e
diff --git a/packages/rkwarddev/ChangeLog b/packages/rkwarddev/ChangeLog
index 1148ac1..be5acdf 100644
--- a/packages/rkwarddev/ChangeLog
+++ b/packages/rkwarddev/ChangeLog
@@ -1,6 +1,6 @@
ChangeLog for package rkwarddev
-changes in version 0.06-6 (2014-11-24)
+changes in version 0.06-6 (2014-11-28)
fixed:
- rk.XML.optionset() does now allow to re-use objects defined in the same
function call (i.e., refer to optioncolumns in the logic section)
@@ -8,6 +8,7 @@ fixed:
as these are already being documented via the objects they connect to.
- rk.build.plugin() was still only using the "--no-vignettes" option from R < 3
- rk.XML.pluginmap() malformed label argument names if they referred to standrad maneu entries
+ - rk.plugin.skeleton() still allowed invalid IDs, fixed the regexp
added:
- all "help" values can now be a list of character strings or XiMpLe nodes,
to have more control over the markup
@@ -22,6 +23,10 @@ changed:
the i18n features of 0.06-4 will be completely replaced with some proper methods now
- comment nodes (<!-- foo -->) are now globally allowed as child nodes in XML; important for
i18n comments
+removed:
+ - the functions rk.set.language() rk.get.language() were no longer useful and therefore removed
+ - also removed the option "lang" from rk.rkh.doc(), rk.XML.plugin(), rk.XML.pluginmap()
+ and rk.plugin.skeleton()
changes in version 0.06-5 (2014-10-19)
fixed:
diff --git a/packages/rkwarddev/DESCRIPTION b/packages/rkwarddev/DESCRIPTION
index 8af1d6a..db80f3f 100644
--- a/packages/rkwarddev/DESCRIPTION
+++ b/packages/rkwarddev/DESCRIPTION
@@ -15,7 +15,7 @@ URL: http://rkward.sourceforge.net
Authors at R: c(person(given="Meik", family="Michalke",
email="meik.michalke at hhu.de", role=c("aut", "cre")))
Version: 0.06-6
-Date: 2014-11-23
+Date: 2014-11-28
Collate:
'00_class_01_rk.JS.arr.R'
'00_class_02_rk.JS.var.R'
@@ -98,7 +98,6 @@ Collate:
'rk.XML.wizard.R'
'rk.build.plugin.R'
'rk.get.comp.R'
- 'rk.get.language.R'
'rk.get.rkh.prompter.R'
'rk.i18n.comment.R'
'rk.paste.JS.R'
@@ -118,7 +117,6 @@ Collate:
'rk.rkh.title.R'
'rk.rkh.usage.R'
'rk.set.comp.R'
- 'rk.set.language.R'
'rk.set.rkh.prompter.R'
'rk.testsuite.doc.R'
'rk.uniqueIDs.R'
diff --git a/packages/rkwarddev/NAMESPACE b/packages/rkwarddev/NAMESPACE
index cd5668a..6d2b03a 100644
--- a/packages/rkwarddev/NAMESPACE
+++ b/packages/rkwarddev/NAMESPACE
@@ -74,7 +74,6 @@ export(rk.XML.wizard)
export(rk.build.plugin)
export(rk.comment)
export(rk.get.comp)
-export(rk.get.language)
export(rk.get.rkh.prompter)
export(rk.i18n.comment)
export(rk.paste.JS)
@@ -95,7 +94,6 @@ export(rk.rkh.technical)
export(rk.rkh.title)
export(rk.rkh.usage)
export(rk.set.comp)
-export(rk.set.language)
export(rk.set.rkh.prompter)
export(rk.testsuite.doc)
export(rkwarddev.required)
diff --git a/packages/rkwarddev/R/rk-internal.R b/packages/rkwarddev/R/rk-internal.R
index 836c349..fd1c5c7 100644
--- a/packages/rkwarddev/R/rk-internal.R
+++ b/packages/rkwarddev/R/rk-internal.R
@@ -18,7 +18,7 @@
# collate voodoo
#' @include rk.comment.R
-# set up an internal environment, e.g. for language settings
+# set up an internal environment, e.g. for prompter settings
.rkdev.env <- new.env()
# internal functions for the rk.* functions
diff --git a/packages/rkwarddev/R/rk.XML.plugin.R b/packages/rkwarddev/R/rk.XML.plugin.R
index 352a0c5..095cfac 100644
--- a/packages/rkwarddev/R/rk.XML.plugin.R
+++ b/packages/rkwarddev/R/rk.XML.plugin.R
@@ -43,7 +43,6 @@
#' See \code{\link[rkwarddev:rk.XML.dependencies]{rk.XML.dependencies}} for details. Skipped if \code{NULL}.
#' @param gen.info Logical, if \code{TRUE} a comment note will be written into the document,
#' that it was generated by \code{rkwarddev} and changes should be done to the script.
-#' @param lang Character string, the language of the plugin. See \code{\link[rkwarddev:i18n]{i18n}} for details.
#' @param i18n Either a character string or a named list with the optional element \code{context},
#' to give some \code{i18n_context}
#' information for this node. If set to \code{FALSE}, the attribute \code{label} will be renamed into
@@ -68,7 +67,7 @@
#' }
rk.XML.plugin <- function(name, dialog=NULL, wizard=NULL, logic=NULL, snippets=NULL, provides=NULL, help=TRUE, include=NULL,
- label=NULL, clean.name=TRUE, about=NULL, dependencies=NULL, gen.info=TRUE, lang=rk.get.language(), i18n=NULL){
+ label=NULL, clean.name=TRUE, about=NULL, dependencies=NULL, gen.info=TRUE, i18n=NULL){
if(isTRUE(clean.name)){
name.orig <- name
name <- clean.name(name)
@@ -80,17 +79,10 @@ rk.XML.plugin <- function(name, dialog=NULL, wizard=NULL, logic=NULL, snippets=N
all.children[[length(all.children)+1]] <- generator.info
} else {}
- # check for i18n
- if(is.null(lang)){
- lang.file <- NULL
- } else {
- lang.file <- paste0(lang, ".")
- }
-
- all.children[[length(all.children)+1]] <- rk.XML.code(file=paste0(lang.file, name, ".js"))
+ all.children[[length(all.children)+1]] <- rk.XML.code(file=paste0(name, ".js"))
if(isTRUE(help)){
- all.children[[length(all.children)+1]] <- rk.XML.help(file=paste0(lang.file, name, ".rkh"))
+ all.children[[length(all.children)+1]] <- rk.XML.help(file=paste0(name, ".rkh"))
} else {}
if(!is.null(include)){
@@ -159,16 +151,10 @@ rk.XML.plugin <- function(name, dialog=NULL, wizard=NULL, logic=NULL, snippets=N
all.children[[length(all.children)+1]] <- wizard
}
- # check for possible i18n
- if(is.null(lang)){
- lang.attrs <- NULL
- } else {
- lang.attrs <- list(lang=lang, "xml:lang"=lang)
- }
# check for additional i18n info; if FALSE, "label" will be renamed to "noi18n_label"
- lang.attrs <- check.i18n(i18n=i18n, attrs=lang.attrs)
+ i18n.attrs <- check.i18n(i18n=i18n)
- top.doc <- XMLNode("document", attrs=lang.attrs, .children=child.list(all.children))
+ top.doc <- XMLNode("document", attrs=i18n.attrs, .children=child.list(all.children))
plugin <- XMLTree(
dtd=list(doctype="rkplugin"),
diff --git a/packages/rkwarddev/R/rk.XML.pluginmap.R b/packages/rkwarddev/R/rk.XML.pluginmap.R
index 767c914..01a8196 100644
--- a/packages/rkwarddev/R/rk.XML.pluginmap.R
+++ b/packages/rkwarddev/R/rk.XML.pluginmap.R
@@ -48,14 +48,13 @@
#' @param namespace Character string, the namespace attribute of the \code{<document>} node, defaults to the plugin name (which you probably shouldn't touch...)
#' @param priority Character string, the priority attribute of the \code{<document>} node. Must be either "hidden", "low", "medium", or "high",
#' defaults to "medium".
-#' @param lang Character string, the language of the document. See \code{\link[rkwarddev:i18n]{i18n}} for details.
#' @seealso \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @return An object of class \code{XiMpLe.node}.
#' @export
rk.XML.pluginmap <- function(name, about=NULL, components, hierarchy="test",
require=NULL, x11.context=NULL, import.context=NULL, clean.name=TRUE, hints=FALSE, gen.info=TRUE,
- dependencies=NULL, namespace=name, priority="medium", id.name="auto", lang=rk.get.language()){
+ dependencies=NULL, namespace=name, priority="medium", id.name="auto"){
name.orig <- name
if(isTRUE(clean.name)){
# to besure, remove all non-character symbols from name
@@ -310,10 +309,6 @@ rk.XML.pluginmap <- function(name, about=NULL, components, hierarchy="test",
} else {}
all.attrs <- list(base_prefix="", namespace=namespace, id=doc.ID.name, po_id=doc.ID.name, priority=priority)
- # check for possible i18n
- if(!is.null(lang)){
- all.attrs[["lang"]] <- all.attrs[["xml:lang"]] <- lang
- } else {}
top.doc <- XMLNode("document", attrs=all.attrs, .children=all.children)
pluginmap <- XMLTree(
diff --git a/packages/rkwarddev/R/rk.get.language.R b/packages/rkwarddev/R/rk.get.language.R
deleted file mode 100644
index d71a33b..0000000
--- a/packages/rkwarddev/R/rk.get.language.R
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2010-2014 Meik Michalke <meik.michalke at hhu.de>
-#
-# This file is part of the R package rkwarddev.
-#
-# rkwarddev is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# rkwarddev is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with rkwarddev. If not, see <http://www.gnu.org/licenses/>.
-
-
-#' Get plugin language for internationalisation
-#'
-#' @param locales Logical, whether to query for language or locales set.
-#' @export
-#' @examples
-#' rk.get.language()
-
-rk.get.language <- function(locales=FALSE){
- if(isTRUE(locales)){
- if(exists("locales", envir=.rkdev.env, inherits=FALSE)){
- locales <- get("locales", envir=.rkdev.env)
- return(locales)
- } else {}
- } else {
- if(exists("lang", envir=.rkdev.env, inherits=FALSE)){
- lang <- get("lang", envir=.rkdev.env)
- return(lang)
- } else {
- return(invisible(NULL))
- }
- }
-}
diff --git a/packages/rkwarddev/R/rk.plugin.skeleton.R b/packages/rkwarddev/R/rk.plugin.skeleton.R
index 7a8f436..fbe0239 100644
--- a/packages/rkwarddev/R/rk.plugin.skeleton.R
+++ b/packages/rkwarddev/R/rk.plugin.skeleton.R
@@ -90,7 +90,6 @@
#' that they were generated by \code{rkwarddev} and changes should be done to the script.
#' @param hints Logical, if \code{TRUE} and you leave out optional entries (like \code{dependencies=NULL}), dummy sections will be added as comments.
#' @param indent.by A character string defining the indentation string to use.
-#' @param lang Character string, the language of the plugin. See \code{\link[rkwarddev:i18n]{i18n}} for details.
#' @return Character string with the path to the plugin root directory.
#' @seealso \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @export
@@ -160,7 +159,7 @@ rk.plugin.skeleton <- function(about, path=tempdir(),
overwrite=FALSE, tests=TRUE, lazyLoad=TRUE,
create=c("pmap", "xml", "js", "rkh", "desc", "clog"), suggest.required=TRUE,
components=list(), dependencies=NULL, edit=FALSE, load=FALSE, show=FALSE, gen.info=TRUE,
- hints=TRUE, indent.by="\t", lang=rk.get.language()){
+ hints=TRUE, indent.by="\t"){
if(is.XiMpLe.node(about)){
# check about and dependencies
@@ -185,15 +184,6 @@ rk.plugin.skeleton <- function(about, path=tempdir(),
name.orig <- name
name <- clean.name(name)
- # check for i18n
- if(!is.null(lang)){
- translate <- TRUE
- lang.file <- paste0(lang, ".")
- } else {
- translate <- FALSE
- lang.file <- NULL
- }
-
# define paths an file names
main.dir <- file.path(path, name)
R.dir <- file.path(main.dir, "R")
@@ -201,26 +191,11 @@ rk.plugin.skeleton <- function(about, path=tempdir(),
namespace.file <- file.path(main.dir, "NAMESPACE")
changelog.file <- file.path(main.dir, "ChangeLog")
rkward.dir <- file.path(main.dir, "inst", "rkward")
- i18n.dir <- file.path(rkward.dir, "po")
plugin.dir <- file.path(rkward.dir, "plugins")
# file names with paths
toplevel.fname.pluginmap <- paste0(name, ".pluginmap")
- # check for i18n
- if(isTRUE(translate)){
- # don't prefix pluginmap for the english default
- if(identical(lang, "en")){
- plugin.fname.pluginmap <- paste0(name, ".pluginmap")
- } else {
- plugin.fname.pluginmap <- paste0(lang.file, name, ".pluginmap")
- }
- plugin.pluginmap <- file.path(i18n.dir, plugin.fname.pluginmap)
- toplevel.pluginmap <- file.path(rkward.dir, toplevel.fname.pluginmap)
- default.pluginmap <- file.path(i18n.dir, toplevel.fname.pluginmap)
- require.default.pluginmap <- file.path("po", toplevel.fname.pluginmap)
- } else {
- plugin.fname.pluginmap <- paste0(lang.file, name, ".pluginmap")
- plugin.pluginmap <- file.path(rkward.dir, toplevel.fname.pluginmap)
- }
+ plugin.fname.pluginmap <- paste0(name, ".pluginmap")
+ plugin.pluginmap <- file.path(rkward.dir, toplevel.fname.pluginmap)
tests.main.dir <- file.path(rkward.dir, "tests")
tests.dir <- file.path(rkward.dir, "tests", name)
testsuite.file <- file.path(tests.main.dir, "testsuite.R")
@@ -247,10 +222,6 @@ rk.plugin.skeleton <- function(about, path=tempdir(),
stopifnot(dir.create(tests.dir, recursive=TRUE))
message(paste0("Created directory ", tests.dir, "."))
} else {}
- if(isTRUE(translate) & !file_test("-d", i18n.dir)){
- stopifnot(dir.create(i18n.dir, recursive=TRUE))
- message(paste0("Created directory ", i18n.dir, "."))
- } else {}
## create the main component
got.pm.options <- names(pluginmap)
@@ -287,9 +258,9 @@ rk.plugin.skeleton <- function(about, path=tempdir(),
rkh.doc <- slot(this.comp, "rkh")
# the basic file names
- plugin.fname.xml <- paste0(lang.file, comp.name, ".xml")
- plugin.fname.js <- paste0(lang.file, comp.name, ".js")
- plugin.fname.rkh <- paste0(lang.file, comp.name, ".rkh")
+ plugin.fname.xml <- paste0(comp.name, ".xml")
+ plugin.fname.js <- paste0(comp.name, ".js")
+ plugin.fname.rkh <- paste0(comp.name, ".rkh")
# file names with paths
plugin.xml <- file.path(plugin.dir, plugin.fname.xml)
plugin.js <- file.path(plugin.dir, plugin.fname.js)
@@ -339,11 +310,7 @@ rk.plugin.skeleton <- function(about, path=tempdir(),
# get components and hierarchy info from the components list
all.components <- sapply(components, function(this.comp){
comp.name <- slot(this.comp, "name")
- if(isTRUE(translate)){
- named.compo <- paste0("../plugins/", lang.file, clean.name(comp.name), ".xml")
- } else {
- named.compo <- paste0("plugins/", clean.name(comp.name), ".xml")
- }
+ named.compo <- paste0("plugins/", clean.name(comp.name), ".xml")
# we'll name the component, to nicen the menu entry
names(named.compo) <- comp.name
return(named.compo)
@@ -362,29 +329,15 @@ rk.plugin.skeleton <- function(about, path=tempdir(),
hints=hints,
gen.info=gen.info,
dependencies=dependencies.node,
- id.name=paste(gsub("[.]*|[[:space:]]*", "", pluginmap[["name"]]), lang, "rkward", sep="_"))
+# id.name=paste(gsub("[.]*|[[:space:]]*", "", pluginmap[["name"]]), "rkward", sep="_"))
+ id.name=paste(gsub("[^[:alnum:]_]*", "", pluginmap[["name"]]), "rkward", sep="_"))
cat(pasteXML(XML.pluginmap, shine=2, indent.by=indent.by), file=plugin.pluginmap)
# needed for "show"
- pm.id.name <- gsub("[.]*|[[:space:]]*", "", pluginmap[["name"]])
+ pm.id.name <- gsub("[^[:alnum:]_]*", "", pluginmap[["name"]])
} else {
pm.id.name <- name
}
- if(isTRUE(translate)){
- # generate toplevel pluginmap for i18n
- XML.i18n.require <- rk.XML.require(file=require.default.pluginmap, localized=TRUE)
- XML.i18n.pluginmap <- rk.XML.pluginmap(
- name=pluginmap[["name"]],
- components=NULL,
- hierarchy=NULL,
- require=XML.i18n.require,
- hints=FALSE,
- gen.info=gen.info,
- id.name=paste0(gsub("[.]*|[[:space:]]*", "", pluginmap[["name"]]), "_main_rkward"),
- lang="en")
- cat(pasteXML(XML.i18n.pluginmap, shine=2, indent.by=indent.by), file=toplevel.pluginmap)
- } else {}
-
if(isTRUE(edit)){
rk.edit.files(plugin.pluginmap, title=plugin.fname.pluginmap, prompt=FALSE)
} else {}
diff --git a/packages/rkwarddev/R/rk.rkh.doc.R b/packages/rkwarddev/R/rk.rkh.doc.R
index 1fc501a..5ed2e64 100644
--- a/packages/rkwarddev/R/rk.rkh.doc.R
+++ b/packages/rkwarddev/R/rk.rkh.doc.R
@@ -36,7 +36,6 @@
#' @param hints Logical, if \code{TRUE} and you leave out optional entries (like \code{technical=NULL}), empty dummy sections will be added.
#' @param gen.info Logical, if \code{TRUE} a comment note will be written into the document,
#' that it was generated by \code{rkwarddev} and changes should be done to the script.
-#' @param lang Character string, the language of the help page. See \code{\link[rkwarddev:i18n]{i18n}} for details.
#' @return An object of class \code{XiMpLe.doc}.
#' @seealso
#' \code{\link[rkwarddev:rk.rkh.summary]{rk.rkh.summary}},
@@ -48,7 +47,7 @@
#' and the \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @export
-rk.rkh.doc <- function(summary=NULL, usage=NULL, sections=NULL, settings=NULL, related=NULL, technical=NULL, title=NULL, hints=TRUE, gen.info=TRUE, lang=rk.get.language()){
+rk.rkh.doc <- function(summary=NULL, usage=NULL, sections=NULL, settings=NULL, related=NULL, technical=NULL, title=NULL, hints=TRUE, gen.info=TRUE){
all.children <- list()
@@ -163,13 +162,7 @@ rk.rkh.doc <- function(summary=NULL, usage=NULL, sections=NULL, settings=NULL, r
all.children[[length(all.children)+1]] <- rk.rkh.technical()
} else {}
- # check for possible i18n
- if(is.null(lang)){
- lang.attrs <- NULL
- } else {
- lang.attrs <- list(lang=lang, "xml:lang"=lang)
- }
- rkh.document <- XMLNode("document", attrs=lang.attrs, .children=child.list(all.children, empty=FALSE))
+ rkh.document <- XMLNode("document", .children=child.list(all.children, empty=FALSE))
rkh.main <- XMLTree(rkh.document, dtd=list(doctype="rkhelp"))
diff --git a/packages/rkwarddev/R/rk.set.language.R b/packages/rkwarddev/R/rk.set.language.R
deleted file mode 100644
index 4ab0520..0000000
--- a/packages/rkwarddev/R/rk.set.language.R
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2010-2014 Meik Michalke <meik.michalke at hhu.de>
-#
-# This file is part of the R package rkwarddev.
-#
-# rkwarddev is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# rkwarddev is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with rkwarddev. If not, see <http://www.gnu.org/licenses/>.
-
-#' Set plugin language for internationalisation
-#'
-#' Stores the given language in an internal environment, so functions like
-#' \code{\link[rkwarddev:i18n]{i18n}} can use it.
-#'
-#' @param lang Character string, abbreviated language to use with \code{\link[rkwarddev:i18n]{i18n}}, e.g. \code{"en"}.
-#' @param locales Character vector, all the locales this translation covers, e.g. \code{c("en_EN", "en_US")}.
-#' @export
-#' @examples
-#' rk.set.language("en", c("en_EN", "en_US"))
-
-rk.set.language <- function(lang=NULL, locales=NULL){
- if(is.null(lang)){
- if(exists("lang", envir=.rkdev.env, inherits=FALSE)){
- rm("lang", envir=.rkdev.env)
- } else {}
- if(exists("locales", envir=.rkdev.env, inherits=FALSE)){
- rm("locales", envir=.rkdev.env)
- } else {}
- message(paste("removed language setting"))
- } else {
- set.rk.env("lang", value=lang)
- message(paste("set language to:", dQuote(lang)))
- if(is.null(locales)){
- warning("please provide at least one locale!")
- } else {
- set.rk.env("locales", value=locales)
- message(paste("set locales to:", paste0(dQuote(locales), collapse=", ")))
- }
- }
- return(invisible(NULL))
-}
diff --git a/packages/rkwarddev/R/rkwarddev-package.R b/packages/rkwarddev/R/rkwarddev-package.R
index 620ceef..471fdca 100644
--- a/packages/rkwarddev/R/rkwarddev-package.R
+++ b/packages/rkwarddev/R/rkwarddev-package.R
@@ -4,7 +4,7 @@
#' Package: \tab rkwarddev\cr
#' Type: \tab Package\cr
#' Version: \tab 0.06-6\cr
-#' Date: \tab 2014-11-23\cr
+#' Date: \tab 2014-11-28\cr
#' Depends: \tab R (>= 2.9.0),methods,XiMpLe (>= 0.03-21),rkward (>= 0.5.7)\cr
#' Enhances: \tab rkward\cr
#' Encoding: \tab UTF-8\cr
diff --git a/packages/rkwarddev/inst/NEWS.Rd b/packages/rkwarddev/inst/NEWS.Rd
index 85a5edc..abe87cf 100644
--- a/packages/rkwarddev/inst/NEWS.Rd
+++ b/packages/rkwarddev/inst/NEWS.Rd
@@ -1,7 +1,7 @@
\name{NEWS}
\title{News for Package 'rkwarddev'}
\encoding{UTF-8}
-\section{Changes in rkwarddev version 0.06-6 (2014-11-23)}{
+\section{Changes in rkwarddev version 0.06-6 (2014-11-28)}{
\subsection{fixed}{
\itemize{
\item \code{rk.XML.optionset()} does now allow to re-use objects defined in the same
@@ -10,6 +10,7 @@
as these are already being documented via the objects they connect to.
\item \code{rk.build.plugin()} was still only using the "--no-vignettes" option from R < 3
\item \code{rk.XML.pluginmap()} malformed label argument names if they referred to standrad maneu entries
+ \item \code{rk.plugin.skeleton()} still allowed invalid IDs, fixed the regexp
}
}
\subsection{added}{
@@ -28,6 +29,15 @@
\item function \code{i18n()} was changed to be used in JavaScript generation only; this breaks code
using the function introduced with 0.06-4, but that was to be shortlived from the start...
the i18n features of 0.06-4 will be completely replaced with some proper methods now
+ \item comment nodes (<!-- foo -->) are now globally allowed as child nodes in XML; important for
+ i18n comments
+ }
+ }
+ \subsection{removed}{
+ \itemize{
+ \item the functions \code{rk.set.language()} rk.\code{get.language()} were no longer useful and therefore removed
+ \item also removed the option \code{"lang"} from \code{rk.rkh.doc()}, \code{rk.XML.plugin()}, \code{rk.XML.pluginmap()}
+ and \code{rk.plugin.skeleton()}
}
}
}
diff --git a/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf b/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
index 977842d..3adc32f 100644
Binary files a/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf and b/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf differ
diff --git a/packages/rkwarddev/man/rk.XML.plugin.Rd b/packages/rkwarddev/man/rk.XML.plugin.Rd
index 65fb065..843e868 100644
--- a/packages/rkwarddev/man/rk.XML.plugin.Rd
+++ b/packages/rkwarddev/man/rk.XML.plugin.Rd
@@ -6,7 +6,7 @@
rk.XML.plugin(name, dialog = NULL, wizard = NULL, logic = NULL,
snippets = NULL, provides = NULL, help = TRUE, include = NULL,
label = NULL, clean.name = TRUE, about = NULL, dependencies = NULL,
- gen.info = TRUE, lang = rk.get.language(), i18n = NULL)
+ gen.info = TRUE, i18n = NULL)
}
\arguments{
\item{name}{Character string,
@@ -54,9 +54,6 @@ See \code{\link[rkwarddev:rk.XML.dependencies]{rk.XML.dependencies}} for details
\item{gen.info}{Logical, if \code{TRUE} a comment note will be written into the document,
that it was generated by \code{rkwarddev} and changes should be done to the script.}
-\item{lang}{Character string,
- the language of the plugin. See \code{\link[rkwarddev:i18n]{i18n}} for details.}
-
\item{i18n}{Either a character string or a named list with the optional element \code{context},
to give some \code{i18n_context}
information for this node. If set to \code{FALSE},
diff --git a/packages/rkwarddev/man/rk.XML.pluginmap.Rd b/packages/rkwarddev/man/rk.XML.pluginmap.Rd
index 2b1a922..ba63e45 100644
--- a/packages/rkwarddev/man/rk.XML.pluginmap.Rd
+++ b/packages/rkwarddev/man/rk.XML.pluginmap.Rd
@@ -7,7 +7,7 @@ rk.XML.pluginmap(name, about = NULL, components, hierarchy = "test",
require = NULL, x11.context = NULL, import.context = NULL,
clean.name = TRUE, hints = FALSE, gen.info = TRUE,
dependencies = NULL, namespace = name, priority = "medium",
- id.name = "auto", lang = rk.get.language())
+ id.name = "auto")
}
\arguments{
\item{name}{Character string, name of the plugin.}
@@ -63,9 +63,6 @@ See \code{\link[rkwarddev:rk.XML.dependencies]{rk.XML.dependencies}} for details
\item{priority}{Character string,
the priority attribute of the \code{<document>} node. Must be either "hidden", "low", "medium", or "high",
defaults to "medium".}
-
-\item{lang}{Character string,
- the language of the document. See \code{\link[rkwarddev:i18n]{i18n}} for details.}
}
\value{
An object of class \code{XiMpLe.node}.
diff --git a/packages/rkwarddev/man/rk.get.language.Rd b/packages/rkwarddev/man/rk.get.language.Rd
deleted file mode 100644
index 3c249f3..0000000
--- a/packages/rkwarddev/man/rk.get.language.Rd
+++ /dev/null
@@ -1,17 +0,0 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
-\name{rk.get.language}
-\alias{rk.get.language}
-\title{Get plugin language for internationalisation}
-\usage{
-rk.get.language(locales = FALSE)
-}
-\arguments{
-\item{locales}{Logical, whether to query for language or locales set.}
-}
-\description{
-Get plugin language for internationalisation
-}
-\examples{
-rk.get.language()
-}
-
diff --git a/packages/rkwarddev/man/rk.plugin.skeleton.Rd b/packages/rkwarddev/man/rk.plugin.skeleton.Rd
index f106ce3..b9a590b 100644
--- a/packages/rkwarddev/man/rk.plugin.skeleton.Rd
+++ b/packages/rkwarddev/man/rk.plugin.skeleton.Rd
@@ -9,8 +9,7 @@ rk.plugin.skeleton(about, path = tempdir(), provides = c("logic", "dialog"),
overwrite = FALSE, tests = TRUE, lazyLoad = TRUE, create = c("pmap",
"xml", "js", "rkh", "desc", "clog"), suggest.required = TRUE,
components = list(), dependencies = NULL, edit = FALSE, load = FALSE,
- show = FALSE, gen.info = TRUE, hints = TRUE, indent.by = "\\t",
- lang = rk.get.language())
+ show = FALSE, gen.info = TRUE, hints = TRUE, indent.by = "\\t")
}
\arguments{
\item{about}{Either an object of class \code{XiMpLe.node} with descriptive information on the plugin and its authors
@@ -130,9 +129,6 @@ that they were generated by \code{rkwarddev} and changes should be done to the s
if \code{TRUE} and you leave out optional entries (like \code{dependencies=NULL}), dummy sections will be added as comments.}
\item{indent.by}{A character string defining the indentation string to use.}
-
-\item{lang}{Character string,
- the language of the plugin. See \code{\link[rkwarddev:i18n]{i18n}} for details.}
}
\value{
Character string with the path to the plugin root directory.
diff --git a/packages/rkwarddev/man/rk.rkh.doc.Rd b/packages/rkwarddev/man/rk.rkh.doc.Rd
index 3e9e100..521fa1b 100644
--- a/packages/rkwarddev/man/rk.rkh.doc.Rd
+++ b/packages/rkwarddev/man/rk.rkh.doc.Rd
@@ -5,7 +5,7 @@
\usage{
rk.rkh.doc(summary = NULL, usage = NULL, sections = NULL,
settings = NULL, related = NULL, technical = NULL, title = NULL,
- hints = TRUE, gen.info = TRUE, lang = rk.get.language())
+ hints = TRUE, gen.info = TRUE)
}
\arguments{
\item{summary}{An object of class \code{XiMpLe.node} to be pasted as the \code{<summary>} section. See
@@ -35,9 +35,6 @@ Refer to \code{\link{rk.rkh.scan}} for a function to create this from an existin
\item{gen.info}{Logical, if \code{TRUE} a comment note will be written into the document,
that it was generated by \code{rkwarddev} and changes should be done to the script.}
-
-\item{lang}{Character string,
- the language of the help page. See \code{\link[rkwarddev:i18n]{i18n}} for details.}
}
\value{
An object of class \code{XiMpLe.doc}.
diff --git a/packages/rkwarddev/man/rk.set.language.Rd b/packages/rkwarddev/man/rk.set.language.Rd
deleted file mode 100644
index 2a838a5..0000000
--- a/packages/rkwarddev/man/rk.set.language.Rd
+++ /dev/null
@@ -1,22 +0,0 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
-\name{rk.set.language}
-\alias{rk.set.language}
-\title{Set plugin language for internationalisation}
-\usage{
-rk.set.language(lang = NULL, locales = NULL)
-}
-\arguments{
-\item{lang}{Character string,
- abbreviated language to use with \code{\link[rkwarddev:i18n]{i18n}}, e.g. \code{"en"}.}
-
-\item{locales}{Character vector, all the locales this translation covers,
- e.g. \code{c("en_EN", "en_US")}.}
-}
-\description{
-Stores the given language in an internal environment, so functions like
-\code{\link[rkwarddev:i18n]{i18n}} can use it.
-}
-\examples{
-rk.set.language("en", c("en_EN", "en_US"))
-}
-
diff --git a/packages/rkwarddev/man/rkwarddev-package.Rd b/packages/rkwarddev/man/rkwarddev-package.Rd
index 725dd2a..f45c4fa 100644
--- a/packages/rkwarddev/man/rkwarddev-package.Rd
+++ b/packages/rkwarddev/man/rkwarddev-package.Rd
@@ -11,7 +11,7 @@ A collection of tools for RKWard plugin development.
Package: \tab rkwarddev\cr
Type: \tab Package\cr
Version: \tab 0.06-6\cr
-Date: \tab 2014-11-23\cr
+Date: \tab 2014-11-28\cr
Depends: \tab R (>= 2.9.0),methods,XiMpLe (>= 0.03-21),rkward (>= 0.5.7)\cr
Enhances: \tab rkward\cr
Encoding: \tab UTF-8\cr
More information about the rkward-tracker
mailing list