Merge branch 'WIP]-issue-dapperstats#12'

Author: chuckleong21

Diff for: DESCRIPTION

@@ -14,5 +14,6 @@ Suggests:
   covr,
   pkgdown,
   testthat
+Imports: countrycode
 RoxygenNote: 6.1.1
 Encoding: UTF-8

Diff for: NAMESPACE

@@ -5,4 +5,5 @@ export(gendr)
 export(gendr_warning)
 export(get_locale)
 export(ifnull)
+importFrom(countrycode,countrycode)
 importFrom(stats,setNames)

Diff for: R/gendr.R

@@ -1,45 +1,45 @@
 #' @title Do not assign gender to someone
 #'
-#' @description Recognizing that gender is an individual, person 
-#'  characteristic, it is impossible to accurately assign gender to another. 
-#'  Further, assigning genders to those who have been incorrectly assigned 
-#'  genders is a retraumatizing, violent act. Finally, gender is a 
-#'  spatiotemporally evolving concept, and therefore by definition, the 
-#'  gender of an individual in a given space and time may not be accurately
-#'  predicted by the genders of other individuals in other spaces and/or 
-#'  times. A particularly prescient example of this is the recent-historic 
-#'  Euro-centric notion of a gender binary, which is a false construct that 
-#'  has been nonetheless used to define genders on a massive scale. \cr \cr
-#'  \code{gendr} acknowledges these shortcomings when asked to assign the 
-#'  gender of an individual. \cr \cr
-#'  \code{gendr_warning} produces a warning if necessary (it's necessary).
+#' @description Recognizing that gender is an individual, person characteristic,
+#'   it is impossible to accurately assign gender to another. Further, assigning
+#'   genders to those who have been incorrectly assigned genders is a
+#'   retraumatizing, violent act. Finally, gender is a spatiotemporally evolving
+#'   concept, and therefore by definition, the gender of an individual in a
+#'   given space and time may not be accurately predicted by the genders of
+#'   other individuals in other spaces and/or times. A particularly prescient
+#'   example of this is the recent-historic Euro-centric notion of a gender
+#'   binary, which is a false construct that has been nonetheless used to define
+#'   genders on a massive scale. \cr \cr \code{gendr} acknowledges these
+#'   shortcomings when asked to assign the gender of an individual. \cr \cr
+#'   \code{gendr_warning} produces a warning if necessary (it's necessary).
+#'
+#' @details \code{get_locale()} now expands ISO names of language and location
+#'   into full automatically for MacOS. Set argument \code{locale_asis}
+#'   \strong{FALSE} for \code{get_locale} to see ISO names as they are.
 #'
 #' @param names \code{character} vector of first names. All options available.
 #'
-#' @param locations \code{character} vector of locations. All options 
-#'   available.
+#' @param locations \code{character} vector of locations. All options available.
 #'
-#' @param languages \code{character} vector of languages. All options
-#'   available.
+#' @param languages \code{character} vector of languages. All options available.
 #'
-#' @param years \code{integer}-conformable vector of years. All options 
+#' @param years \code{integer}-conformable vector of years. All options
 #'   available.
 #'
 #' @param methods \code{character} vector of methods. All options available.
 #'
-#' @return 
-#'  \code{gendr}: \code{data.frame} of genders for inputs. \cr
-#'  \code{gendr_warning}: \code{NULL}, warning is produced.
+#' @return \code{gendr}: \code{data.frame} of genders for inputs. \cr
+#'   \code{gendr_warning}: \code{NULL}, warning is produced.
 #'
 #' @examples
 #'  \donttest{
 #'  gendr("max", "usa", "english", 1990) # produces warning
-#'  gendr() # produces warning 
+#'  gendr() # produces warning
 #'  gendr_warning() # produces warning
 #'  }
 #'
 #' @export
-#'
+#' 
 gendr <- function(names = NULL, locations = NULL, languages = NULL, 
                   years = NULL, methods = "standard"){
 

Diff for: R/utilities.R

@@ -64,21 +64,27 @@ check_type <- function(x, type){
 
 #' @title Get the language and location of a system locale
 #'
-#' @description OS-flexible approach to determining the system locale with 
-#'  respect to language and location.
-#' 
-#' @param category \code{character} string of the locale environmental 
-#'  variable to use, passed directly to \code{\link[base]{Sys.getlocale}}.
+#' @description OS-flexible approach to determining the system locale with
+#'   respect to language and location.
+#'
+#' @param category \code{character} string of the locale environmental variable
+#'   to use, passed directly to \code{\link[base]{Sys.getlocale}}.
+#'
+#' @param locale_asis \code{boolean} for returning \emph{language} and
+#'   \emph{location} from \link[base]{Sys.getlocale} as it is. Defult to
+#'   FALSE.
+#'
+#' @return \code{character} vector with elements \code{"language"} and
+#'   \code{"location"}.
+#'
+#' @importFrom countrycode countrycode
 #'
-#' @return \code{character} vector with elements \code{"language"} and 
-#'  \code{"location"}. 
-#' 
 #' @examples
 #'  get_locale()
 #'
-#' @export 
-#'
-get_locale <- function(category = "LC_TIME"){
+#' @export
+#' 
+get_locale <- function(category = "LC_TIME", locale_asis = FALSE){
   ismac <- Sys.info()["sysname"] == "Darwin"
   issolaris <- Sys.info()["sysname"] == "SunOS"
   splitchar <- ifelse(ismac | issolaris, "/", ";")
@@ -88,8 +94,42 @@ get_locale <- function(category = "LC_TIME"){
   locale <- strsplit(locale, "_")[[1]]
   locale <- setNames(locale, c("language", "location"))
   locale[["location"]] <- sub("\\..*", "", locale[["location"]])
-  locale
-}
-
-
+  
+  language_codes <- c('af', 'sq', 'ar', 'hy', 'az', 'eu', 'be', 'bn', 'bs', 
+                      'bg', 'ca', 'ceb', 'zh-CN', 'zh-TW', 'hr', 'cs', 'da', 
+                      'nl', 'en', 'eo', 'et', 'tl', 'fi', 'fr', 'gl', 'ka', 
+                      'de', 'el', 'gu', 'ht', 'ha', 'iw', 'hi', 'hmn', 'hu', 
+                      'is', 'ig', 'id', 'ga', 'it', 'ja', 'jw', 'kn', 'km', 
+                      'ko', 'lo', 'la', 'lv', 'lt', 'mk', 'ms', 'mt', 'mi', 
+                      'mr', 'mn', 'ne', 'no', 'fa', 'pl', 'pt', 'pa', 'ro', 
+                      'ru', 'sr', 'sk', 'sl', 'so', 'es', 'sw', 'sv', 'ta', 
+                      'te', 'th', 'tr', 'uk', 'ur', 'vi', 'cy', 'yi', 'yo', 
+                      'zu')
+  language_names <- c('Afrikaans', 'Albanian', 'Arabic', 'Armenian', 
+                      'Azerbaijani', 'Basque', 'Belarusian', 'Bengali', 
+                      'Bosnian', 'Bulgarian', 'Catalan', 'Cebuano', 
+                      'Chinese_Simplified', 'Chinese_Traditional', 
+                      'Croatian', 'Czech', 'Danish', 'Dutch', 'English', 
+                      'Esperanto', 'Estonian', 'Filipino', 'Finnish', 
+                      'French', 'Galician', 'Georgian', 'German', 'Greek', 
+                      'Gujarati', 'Haitian_Creole', 'Hausa', 'Hebrew', 
+                      'Hindi', 'Hmong', 'Hungarian', 'Icelandic', 'Igbo', 
+                      'Indonesian', 'Irish', 'Italian', 'Japanese', 
+                      'Javanese', 'Kannada', 'Khmer', 'Korean', 'Lao', 
+                      'Latin', 'Latvian', 'Lithuanian', 'Macedonian', 
+                      'Malay', 'Maltese', 'Maori', 'Marathi', 'Mongolian', 
+                      'Nepali', 'Norwegian', 'Persian', 'Polish', 
+                      'Portuguese', 'Punjabi', 'Romanian', 'Russian', 
+                      'Serbian', 'Slovak', 'Slovenian', 'Somali', 'Spanish', 
+                      'Swahili', 'Swedish', 'Tamil', 'Telugu', 'Thai', 
+                      'Turkish', 'Ukrainian', 'Urdu', 'Vietnamese', 'Welsh', 
+                      'Yiddish', 'Yoruba', 'Zulu')
+  names(language_codes) <- language_names
 
+  if(!locale_asis && (ismac | issolaris)) {
+    locale["language"] <- names(which(language_codes == locale["language"]))
+    locale["location"] <- countrycode(locale["location"], 
+                                      "eurostat", "un.name.en")
+  }
+  return(locale)
+}