New arguments for ordinal_format
#149
Conversation
| #' | ||
| #' # Custom rules for French | ||
| #' french <- list( | ||
| #' er = "^1$", |
There was a problem hiding this comment.
Does this work for 101? In English it would be 101st, but in French 101e?
There was a problem hiding this comment.
Yes, in French it is "101e" and "1001e", "er" is used only for 1.
R/formatter.r
Outdated
| #' french <- list( | ||
| #' er = "^1$", | ||
| #' nd = "^2$", | ||
| #' e = "([0-9]+)[12]$", |
There was a problem hiding this comment.
What happens if a number matches multiple regular expressions? If it return the first match, we could make the fallbacks (in both French and English) simpler by matching anything (i.e. e = '.')
There was a problem hiding this comment.
I have done a quick test. If a number match two or more rules, two or more values will be returned. I will have to update the code to consider only the first results
R/formatter.r
Outdated
| #' @param x A numeric vector of positive values to format. | ||
| #' @param prefix,suffix Symbols to display before and after value. | ||
| #' @param big.mark Character used between every 3 digits to separate thousands. | ||
| #' @param rules Custom rules for computing ordinal indicators (list of regular |
There was a problem hiding this comment.
Maybe: Named list of regular expressions, match in order. Name gives suffix, and value specifies which numbers to match.
R/formatter.r
Outdated
| rules = NULL, ...) { | ||
| stopifnot(all(x > 0)) | ||
| if (is.null(rules)) { | ||
| rules <- list( |
There was a problem hiding this comment.
Maybe we should make this ordinal_english() and export it? Then we can use as the default argument, and users can easily see what the default rules are.
There was a problem hiding this comment.
done
also added ordinal_french() and ordinal_spanish()
larmarange
force-pushed
the
ordinal_format
branch
from
0bd819e to
ecbb8d7
Compare
|
Note: I will resolve conflicts once other PRs merged |
| expect_equal(ordinal(4), "4th") | ||
| expect_equal(ordinal(11), "11th") | ||
| expect_equal(ordinal(12), "12th") | ||
| expect_equal(ordinal(21), "21st") |
There was a problem hiding this comment.
Can you please add a test for 101st, too?
R/formatter.r
Outdated
| list( | ||
| er = "^1$", | ||
| nd = "^2$", | ||
| e = "([0-9]+)[12]$", |
There was a problem hiding this comment.
Now I think you can simplify this so that e matches anything
There was a problem hiding this comment.
And similarly, English just needs a fall back to th if nothing else matches.
larmarange
force-pushed
the
ordinal_format
branch
from
ecbb8d7 to
e0c3719
Compare
|
done, bullet news added and merge conflict solved |
`prefix`, `suffix`, `big.mark` and `rules` allowing to provide custom rules
larmarange
force-pushed
the
ordinal_format
branch
from
e0c3719 to
93ae013
Compare
2 participants
prefix,suffix,big.markandrules(allowing to provide custom rules)