Merge pull request #599 from swirldev/dev

swirl 2.4.3

.travis.yml

@@ -1,4 +1,11 @@
-language: R
+language: r
+
+matrix:
+  include:
+  - r: release
+  - r: oldrel
+  - r: devel
+
 cache: packages
 sudo: false
 

DESCRIPTION

@@ -4,7 +4,7 @@ Description: Use the R console as an interactive learning
     environment. Users receive immediate feedback as they are guided through
     self-paced lessons in data science and R programming.
 URL: http://swirlstats.com
-Version: 2.4.2
+Version: 2.4.3
 License: MIT + file LICENSE
 Authors@R: c(
     person("Sean", "Kross", email = "[email protected]", role = c("aut", "cre")),

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2016
+YEAR: 2017
 COPYRIGHT HOLDER: Team swirl

NEWS.md

@@ -1,3 +1,9 @@
+# swirl 2.4.3
+
+* Added "swirl_is_fun" option to `swirl_options()`.
+
+* Added Portuguese menu translations.
+
 # swirl 2.4.2
 
 * Script questions behave more appropriately in RStudio. (#434, thank you @jimhester)

R/languages.R

@@ -1,6 +1,7 @@
 swirl_language <- function(){
   lang <- getOption("swirl_language")
-  langs <- c("chinese_simplified", "english", "french", "german", "korean", 
+  langs <- c("chinese_simplified", "dutch", "english", 
+             "french", "german", "german_formal", "korean", "portuguese", 
              "spanish", "turkish")
 
   if(is.null(lang) || !(lang %in% langs)){
@@ -25,7 +26,8 @@ swirl_language <- function(){
 #' 
 #' @export
 select_language <- function(language = NULL, append_rprofile = FALSE){
-  langs <- c("chinese_simplified", "english", "french", "german", "korean", 
+  langs <- c("chinese_simplified", "dutch", "english", 
+             "french", "german", "german_formal", "korean", "portuguese", 
              "spanish", "turkish")
   if(is.null(language)){
     selection <- select.list(langs)
@@ -57,7 +59,7 @@ compile_languages <- function(){
 
   for(i in menus){
     lang_name <- sub(".yaml$", "", basename(i))
-    cmd <- paste0(lang_name, " <- wrap_encoding(yaml.load_file('", i, "'))")
+    cmd <- paste0(lang_name, " <- swirl:::wrap_encoding(yaml.load_file('", i, "'))")
     eval(parse(text=cmd))
   }
 

R/options.R

@@ -47,7 +47,8 @@ swirl_options <- function(...){
       swirl_courses_dir = getOption("swirl_courses_dir"),
       swirl_data_dir = getOption("swirl_data_dir"),
       swirl_language = getOption("swirl_language"),
-      swirl_logging = getOption("swirl_logging")
+      swirl_logging = getOption("swirl_logging"),
+      swirl_is_fun = getOption("swirl_is_fun")
     )
   } else {
     options(...)

README.md

@@ -1,7 +1,7 @@
 # swirl
 
 [![Build Status](https://travis-ci.org/swirldev/swirl.png?branch=master)](https://travis-ci.org/swirldev/swirl)
-[![CRAN version](http://www.r-pkg.org/badges/version/swirl?color=3399ff)](https://cran.r-project.org/web/packages/swirl/index.html)
+[![CRAN version](http://www.r-pkg.org/badges/version/swirl?color=3399ff)](https://cran.r-project.org/package=swirl)
 [![Downloads](http://cranlogs.r-pkg.org/badges/swirl?color=3399ff)](http://cran-logs.rstudio.com/)
 
 ### [http://swirlstats.com](http://swirlstats.com)

cran-comments.md

@@ -1,12 +1,12 @@
 ## Release summary
 
-This is the first attempted CRAN release of swirl 2.4.2.
+This is the first attempted CRAN release of swirl 2.4.3.
 
 ## Test environments
 
-* local OSX Yosemite install, R 3.3.0
-* Ubuntu 12.04 (on travis-ci), R 3.3.0
-* win-builder (devel and release)
+* local macOS Sierra install, R 3.3.2
+* Ubuntu 12.04 (on travis-ci), R 3.3.2, R 3.2.5, R-devel.
+* win-builder (release)
 
 ## R CMD check results