Small corrections suggested by CRAN

rOpenGov · Dec 5, 2015 · c8e3b71 · c8e3b71
1 parent 963b1dd
commit c8e3b71
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: sweidnumbr
 Type: Package
 Title: Handling of Swedish Identity Numbers
-Version: 0.8.1
-Date: 2015-12-04
+Version: 0.8.2
+Date: 2015-12-05
 Author: Mans Magnusson and Erik Bulow
 Maintainer: Mans Magnusson <[email protected]>
 Description: Structural handling of identity numbers used in the Swedish
@@ -12,7 +12,7 @@ VignetteBuilder: knitr
 URL: https://github.com/rOpenGov/sweidnumbr/
 BugReports: https://github.com/rOpenGov/sweidnumbr/issues
 License: BSD_2_clause + file LICENSE
-Depends: R (>= 2.10)
+Depends: R (>= 3.2)
 Imports:
     lubridate (>= 1.4),
     stringr

diff --git a/R/pin.R b/R/pin.R
@@ -18,17 +18,15 @@
 #'   \item character: \code{"YYMMDDNNNC"} (assuming < 100 years of age)
 #' }
 #' 
-#' @encoding UTF8
-#' 
 #' @param pin Vector with swedish personal identity numbers in character or numeric format. See details.
 #' 
 #' @references 
 #' \itemize{
 #'  \item \href{https://www.skatteverket.se/download/18.8dcbbe4142d38302d74be9/1387372677724/717B06.pdf}{Population registration in Sweden}
 #'  \item \href{https://www.skatteverket.se/download/18.1e6d5f87115319ffba380001857/1285595720207/70408.pdf}{SKV 704}
 #'  \item \href{http://www.riksdagen.se/sv/Dokument-Lagar/Utredningar/Statens-offentliga-utredningar/Personnummer-och-samordningsnu_GWB360/}{SOU 2008:60 : Personnummer och samordningsnummer}
-#'  \item \emph{Personnummer: information från Centrala folkbokförings- och uppbördsnämnden.} (1967). Stockholm
-#'  \item \emph{Den svenska folkbokföringens historia under tre sekel.} (1982). Solna: Riksskatteverket \href{http://www.skatteverket.se/privat/folkbokforing/omfolkbokforing/folkbokforingigaridag/densvenskafolkbokforingenshistoriaundertresekler.4.18e1b10334ebe8bc80004141.html}{URL}
+#'  \item \emph{Personnummer: information fran Centrala folkbokforings- och uppbordsnamnden.} (1967). Stockholm
+#'  \item \emph{Den svenska folkbokforingens historia under tre sekel.} (1982). Solna: Riksskatteverket \href{http://www.skatteverket.se/privat/folkbokforing/omfolkbokforing/folkbokforingigaridag/densvenskafolkbokforingenshistoriaundertresekler.4.18e1b10334ebe8bc80004141.html}{URL}
 #' }
 #' @return
 #' Vector of class "pin" (with additional classes "AsIs" and character) with swedish personal identity numbers with standard ABS format \code{"YYYYMMDDNNNC"}.
@@ -134,7 +132,7 @@ as.pin.character <- function(pin){
   # Maximum one of each message is enough, messages are therefore stored and possibly 
   # overwritten but not printed inside the loop
   if (!isTRUE(is.na(msg))) {
-    msg <- paste(na.omit(msg), collapse = " and ")
+    msg <- paste(stats::na.omit(msg), collapse = " and ")
     message(paste("Assumption:", paste(toupper(substring(msg, 1, 1)), substring(msg, 2), sep = "", collapse = " ")))
     }
 

diff --git a/man/as.pin.Rd b/man/as.pin.Rd
@@ -1,6 +1,5 @@
 % Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/pin.R
-\encoding{UTF8}
 \name{as.pin}
 \alias{as.pin}
 \title{Parse personal identity numbers to ABS format}
@@ -49,8 +48,8 @@ pin <-c("201212090122", "201212090122", "121209-0122", "1212090122")
  \item \href{https://www.skatteverket.se/download/18.8dcbbe4142d38302d74be9/1387372677724/717B06.pdf}{Population registration in Sweden}
  \item \href{https://www.skatteverket.se/download/18.1e6d5f87115319ffba380001857/1285595720207/70408.pdf}{SKV 704}
  \item \href{http://www.riksdagen.se/sv/Dokument-Lagar/Utredningar/Statens-offentliga-utredningar/Personnummer-och-samordningsnu_GWB360/}{SOU 2008:60 : Personnummer och samordningsnummer}
- \item \emph{Personnummer: information från Centrala folkbokförings- och uppbördsnämnden.} (1967). Stockholm
- \item \emph{Den svenska folkbokföringens historia under tre sekel.} (1982). Solna: Riksskatteverket \href{http://www.skatteverket.se/privat/folkbokforing/omfolkbokforing/folkbokforingigaridag/densvenskafolkbokforingenshistoriaundertresekler.4.18e1b10334ebe8bc80004141.html}{URL}
+ \item \emph{Personnummer: information fran Centrala folkbokforings- och uppbordsnamnden.} (1967). Stockholm
+ \item \emph{Den svenska folkbokforingens historia under tre sekel.} (1982). Solna: Riksskatteverket \href{http://www.skatteverket.se/privat/folkbokforing/omfolkbokforing/folkbokforingigaridag/densvenskafolkbokforingenshistoriaundertresekler.4.18e1b10334ebe8bc80004141.html}{URL}
 }
 }