Skip to content

Commit

Permalink
Document and bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
vspinu committed Nov 20, 2016
1 parent f53a618 commit ac50217
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 7 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Description: Functions to work with date-times and time-spans: fast and user
fun.
Enhances: chron, timeDate, zoo, xts, its, tis, timeSeries,
fts, tseries
Version: 1.6.0.9000
Version: 1.6.0.9009
Depends:
methods,
R (>= 3.0.0)
Expand Down
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ Version 1.6.0.9000

### NEW FEATURES
* [#485](https://github.com/hadley/lubridate/pull/485) `quarter` gained a new argument `fiscal_start` to address the issue of different fiscal conventions.
* [#492](https://github.com/hadley/lubridate/issues/492) New functions `epiweek` and `epiyear`.
* [#257](https://github.com/hadley/lubridate/issues/257) New `start` parameter in `wday` and `wday<-` to set week start.
* [#401](https://github.com/hadley/lubridate/issues/401) New parameter `locale` in `wday`. Labels of the returned factors (when `label=TRUE`) now respect current locale.

### BUG FIXES

Expand Down
4 changes: 2 additions & 2 deletions R/accessors-day.r
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ NULL
#' will display an abbreviated version of the label, such as "Sun". abbr is
#' disregarded if label = FALSE.
#' @param value a numeric object
#' @param locale locale to use for day names. Default to current locale.
#' @param start day on which week starts following ISO conventions - 1 means
#' Monday, 7 means Sunday (default). You can set \code{lubridate.week.start}
#' option to control this parameter globally.
#' @param locale locale to use for day names. Default to current locale.
#' @return \code{wday} returns the day of the week as a decimal number or an
#' ordered factor if label is T.
#' @seealso \code{\link{yday}}, \code{\link{mday}}
Expand Down Expand Up @@ -148,7 +148,7 @@ setMethod("day<-", signature("Period"), function(x, value){

#' @rdname day
#' @export
"wday<-" <- function(x, value, start = getOption("lubridate.week.start", 7)){
"wday<-" <- function(x, start = getOption("lubridate.week.start", 7), value){
if (!is.numeric(value)) {
## FIXME: how to make this localized and preserve backward compatibility? Guesser?
labels <- .shift_wday_names(c("sunday", "monday", "tuesday", "wednesday",
Expand Down
2 changes: 1 addition & 1 deletion R/help.r
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#' \code{\link{Period-class}} objects with the functions
#' \code{\link{hm}}, \code{\link{hms}} and \code{\link{ms}}.
#'
#' Lubridate has an inbuilt very fast POSIX parser. Most of the \coe{strptime}
#' Lubridate has an inbuilt very fast POSIX parser. Most of the \code{strptime}
#' formats and various extensions are supported for English locales. See
#' \code{\link{parse_date_time}} for more details.
#'
Expand Down
2 changes: 1 addition & 1 deletion man/lubridate-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions man/year.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ac50217

Please # to comment.