Merge branch 'master' of https://github.com/dreamRs/esquisse

R/settings.R

@@ -28,14 +28,15 @@ modal_settings <- function(aesthetics = NULL, session = shiny::getDefaultReactiv
         tagList(tags$b("size:"), i18n("size of the points")),
         tagList(tags$b("shape:"), i18n("shape of the points")),
         tagList(tags$b("weight:"), i18n("frequency weights")),
+        tagList(tags$b("alpha:"), i18n("alpha transparency")),
         tagList(tags$b("group:"), i18n("identifies series of points with a grouping variable")),
         tagList(tags$b("ymin:"), tags$span(i18n("used in ribbons charts with ymax to display an interval between two lines"))),
         tagList(tags$b("ymax:"), i18n("used in ribbons charts with ymin to display an interval between two lines")),
         tagList(tags$b("facet:"), i18n("create small multiples")),
         tagList(tags$b("facet row:"), i18n("create small multiples by rows")),
         tagList(tags$b("facet col:"), i18n("create small multiples by columns"))
       ),
-      choiceValues = c("fill", "color", "size", "shape", "weight", "group", "ymin", "ymax", "facet", "facet_row", "facet_col"),
+      choiceValues = c("fill", "color", "size", "shape", "weight", "alpha", "group", "ymin", "ymax", "facet", "facet_row", "facet_col"),
       selected = aesthetics %||% c("fill", "color", "size", "facet"),
       status = "primary",
       outline = TRUE

inst/i18n/cn.csv

@@ -76,6 +76,7 @@ color points and lines,填充颜色(点、线)
 size of the points,点尺寸
 shape of the points,点形状
 frequency weights,权重
+alpha transparency,透明度
 identifies series of points with a grouping variable,分组变量
 used in ribbons charts with ymax to display an interval between two lines,设置带状图Y轴的极大值(显示两线间隔)
 used in ribbons charts with ymin to display an interval between two lines,设置带状图Y轴的极小值(显示两线间隔)