Skip to content

Onattach translations #4613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MichaelChirico wants to merge 7 commits into from
Closed

Onattach translations #4613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0fcb04f
small refactor of messages in onAttach
Jul 17, 2020
1a52a0e
small tweak
Jul 17, 2020
224e7fa
gettext is ignored in ... of gettextf
Jul 17, 2020
e35db71
unfuzz
Jul 17, 2020
6a776d9
remove obsolete
Jul 17, 2020
94b398d
fresh eyes
Jul 18, 2020
bc391ab
typo
Jul 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions .dev/CRAN_Release.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,8 @@ xgettext --keyword=_ -o data.table.pot *.c
cd ..

## (b) Update R template file: src/R-data.table.pot
## much easier, once the update_pkg_po bug is fixed
## much easier; note that pre-R 4.0, there may be a bug in update_pkg_po
R --no-save
## a bug fix in R still hadn't made the 2019-12-12 release,
## so run the following to source the corrected function manually
STEM='https://github.com/wch/r-source/trunk/src/library/tools/R'
source(file.path(STEM, 'utils.R'))
source(file.path(STEM, 'xgettext.R'))
source(file.path(STEM, 'translations.R'))
## shouldn't be any errors from this...
update_pkg_po('.')
q()

Expand Down Expand Up @@ -556,10 +549,11 @@ ls -1 *.tar.gz | grep -E 'Chicago|dada2|flowWorkspace|LymphoSeq' | TZ='UTC' para
# Release to CRAN
###############################################

Bump version to even release number in 3 places :
Bump version to even release number in 4 places :
1) DESCRIPTION
2) NEWS (without 'on CRAN date' text as that's not yet known)
3) dllVersion() at the end of init.c
4) po headers: top of po/*.po
DO NOT push to GitHub. Prevents even a slim possibility of user getting premature version. Even release numbers must have been obtained from CRAN and only CRAN. There were too many support problems in the past before this procedure was brought in.
du -k inst/tests # 1.5MB before
bzip2 inst/tests/*.Rraw # compress *.Rraw just for release to CRAN; do not commit compressed *.Rraw to git
Expand Down
27 changes: 16 additions & 11 deletions R/onAttach.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,25 @@
}
dev = as.integer(v[1L, 3L]) %% 2L == 1L # version number odd => dev
if (!isTRUE(getOption("datatable.quiet"))) { # new option in v1.12.4, #3489
packageStartupMessage("data.table ", v, if(dev)paste0(" IN DEVELOPMENT built ",d,g),
" using ", getDTthreads(verbose=FALSE), " threads (see ?getDTthreads). Latest news: r-datatable.com")
v = format(v)
ver_tag = if (dev) gettextf("%s IN DEVELOPMENT built %s%s", v, d, g, domain="R-data.table") else v
packageStartupMessage(domain=NA, gettextf(
"data.table %s using %d threads (see ?getDTthreads). Latest news: r-datatable.com",
ver_tag, getDTthreads(verbose=FALSE), domain="R-data.table"
))
if (gettext("TRANSLATION CHECK", domain='R-data.table') != "TRANSLATION CHECK")
packageStartupMessage(gettext("**********\nRunning data.table in English; package support is available in English only. When searching for online help, be sure to also check for the English error message. This can be obtained by looking at the po/R-<locale>.po and po/<locale>.po files in the package source, where the native language and English error messages can be found side-by-side\n**********", domain="R-data.table"))
packageStartupMessage(gettext("**********\nRunning data.table in English; package support is available in English only. When searching for online help, be sure to also check for the English error message. This can be obtained by looking at the po/R-<locale>.po and po/<locale>.po files in the package source, where the native language and English error messages can be found side-by-side\n**********", domain="R-data.table"), domain=NA)
if (dev && (Sys.Date() - as.Date(d))>28L)
packageStartupMessage("**********\nThis development version of data.table was built more than 4 weeks ago. Please update: data.table::update.dev.pkg()\n**********")
if (!.Call(ChasOpenMP))
packageStartupMessage("**********\n",
"This installation of data.table has not detected OpenMP support. It should still work but in single-threaded mode.\n",
if (Sys.info()["sysname"]=="Darwin")
"This is a Mac. Please read https://mac.r-project.org/openmp/. Please engage with Apple and ask them for support. Check r-datatable.com for updates, and our Mac instructions here: https://github.com/Rdatatable/data.table/wiki/Installation. After several years of many reports of installation problems on Mac, it's time to gingerly point out that there have been no similar problems on Windows or Linux."
else
paste0("This is ", Sys.info()["sysname"], ". This warning should not normally occur on Windows or Linux where OpenMP is turned on by data.table's configure script by passing -fopenmp to the compiler. If you see this warning on Windows or Linux, please file a GitHub issue."),
"\n**********")
if (!.Call(ChasOpenMP)) {
whoami = Sys.info()["sysname"]
os_tag = if (whoami == "Darwin") gettext("This is a Mac. Please read https://mac.r-project.org/openmp/. Please engage with Apple and ask them for support. Check r-datatable.com for updates, and our Mac instructions here: https://github.com/Rdatatable/data.table/wiki/Installation. After several years of many reports of installation problems on Mac, it's time to gingerly point out that there have been no similar problems on Windows or Linux.", domain="R-data.table")
else gettextf("This is %s. This warning should not normally occur on Windows or Linux where OpenMP is turned on by data.table's configure script by passing -fopenmp to the compiler. If you see this warning on Windows or Linux, please file a GitHub issue.", whoami, domain="R-data.table")
packageStartupMessage(domain=NA, gettextf(
"**********\nThis installation of data.table has not detected OpenMP support. It should still work but in single-threaded mode.\n%s\n**********",
os_tag, domain = "R-data.table"
))
}
}
}

Expand Down
Binary file modified inst/po/en@quot/LC_MESSAGES/R-data.table.mo
View file
Open in desktop
Binary file not shown.
Binary file modified inst/po/en@quot/LC_MESSAGES/data.table.mo
View file
Open in desktop
Binary file not shown.
Binary file modified inst/po/zh_CN/LC_MESSAGES/R-data.table.mo
View file
Open in desktop
Binary file not shown.
Binary file modified inst/po/zh_CN/LC_MESSAGES/data.table.mo
View file
Open in desktop
Binary file not shown.
25 changes: 5 additions & 20 deletions po/R-data.table.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: data.table 1.12.9\n"
"POT-Creation-Date: 2020-07-17 14:38\n"
"POT-Creation-Date: 2020-07-18 10:19\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -1366,13 +1366,10 @@ msgstr ""
msgid "are duplicated in the result"
msgstr ""

msgid "IN DEVELOPMENT built"
msgid "%s IN DEVELOPMENT built %s%s"
msgstr ""

msgid "using"
msgstr ""

msgid "threads (see ?getDTthreads). Latest news: r-datatable.com"
msgid "data.table %s using %d threads (see ?getDTthreads). Latest news: r-datatable.com"
msgstr ""

msgid "TRANSLATION CHECK"
Expand All @@ -1384,25 +1381,13 @@ msgstr ""
msgid "**********\nThis development version of data.table was built more than 4 weeks ago. Please update: data.table::update.dev.pkg()\n**********"
msgstr ""

msgid "**********"
msgstr ""

msgid "This installation of data.table has not detected OpenMP support. It should still work but in single-threaded mode."
msgstr ""

msgid "sysname"
msgstr ""

msgid "Darwin"
msgstr ""

msgid "This is a Mac. Please read https://mac.r-project.org/openmp/. Please engage with Apple and ask them for support. Check r-datatable.com for updates, and our Mac instructions here: https://github.com/Rdatatable/data.table/wiki/Installation. After several years of many reports of installation problems on Mac, it's time to gingerly point out that there have been no similar problems on Windows or Linux."
msgstr ""

msgid "This is"
msgid "This is %s. This warning should not normally occur on Windows or Linux where OpenMP is turned on by data.table's configure script by passing -fopenmp to the compiler. If you see this warning on Windows or Linux, please file a GitHub issue."
msgstr ""

msgid ". This warning should not normally occur on Windows or Linux where OpenMP is turned on by data.table's configure script by passing -fopenmp to the compiler. If you see this warning on Windows or Linux, please file a GitHub issue."
msgid "**********\nThis installation of data.table has not detected OpenMP support. It should still work but in single-threaded mode.\n%s\n**********"
msgstr ""

msgid "The option 'datatable.nomatch' is being used and is not set to the default NA. This option is still honored for now but will be deprecated in future. Please see NEWS for 1.12.4 for detailed information and motivation. To specify inner join, please specify `nomatch=NULL` explicitly in your calls rather than changing the default using this option."
Expand Down
84 changes: 40 additions & 44 deletions po/R-zh_CN.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: data.table 1.12.5\n"
"POT-Creation-Date: 2020-07-17 14:38\n"
"Project-Id-Version: data.table 1.12.9\n"
Copy link
Copy Markdown
Member Author

@MichaelChirico MichaelChirico Jul 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

strange that this doesn't bump automatically. it seems to do so in the .pot file.

"POT-Creation-Date: 2020-07-18 10:19\n"
"PO-Revision-Date: 2019-11-16 18:37+0800\n"
"Last-Translator: Xianying Tan <shrektan@126.com>\n"
"Language-Team: Mandarin\n"
Expand Down Expand Up @@ -393,10 +393,11 @@ msgid ""
"the first comma (e.g. DT[newvar := 5] instead of DT[ , new_var := 5]). "
"Please double-check the syntax. Run traceback(), and debugger() to get a "
"line number."
msgstr "在 i， 即 DT[...] 中的第一个参数，中检测出操作符 := ，但该操作符仅在 j，"
"即 DT[...] 中的第二个参数中使用才有效。通常，该错误发生在忘记"
"添加第一个逗号时 （如错误地将 [DT , new_var := 5] 写作 DT[newvar := 5]）。"
"请再次检查语法是否正确。运行 trackback()，和 debugger() 来获取发生错误的行号。"
msgstr ""
"在 i， 即 DT[...] 中的第一个参数，中检测出操作符 := ，但该操作符仅在 j，即 "
"DT[...] 中的第二个参数中使用才有效。通常，该错误发生在忘记添加第一个逗号时 "
"（如错误地将 [DT , new_var := 5] 写作 DT[newvar := 5]）。请再次检查语法是否正"
"确。运行 trackback()，和 debugger() 来获取发生错误的行号。"

msgid "is not found in calling scope"
msgstr "不存在调用环境里"
Expand Down Expand Up @@ -610,8 +611,10 @@ msgid ""
"single j=eval(macro) instead. Both will detect the columns used which is "
"important for efficiency.\n"
"Old ansvars: %s"
msgstr "在 j 中检测出 '(m)get'。ansvars 将被设为所以列。请使用 .SDcols 或"
"j=eval(macro) 来代替。二者均可检测出实际参与运算的列，这对提高运行效率非常重要。\n"
msgstr ""
"在 j 中检测出 '(m)get'。ansvars 将被设为所以列。请使用 .SDcols 或"
"j=eval(macro) 来代替。二者均可检测出实际参与运算的列，这对提高运行效率非常重"
"要。\n"
"旧的 ansvars：%s"

msgid "New ansvars: %s"
Expand Down Expand Up @@ -1873,14 +1876,13 @@ msgstr "列名"
msgid "are duplicated in the result"
msgstr "在结果中是重复的"

msgid "IN DEVELOPMENT built"
msgstr "在开发版本中"

msgid "using"
msgstr "使用"
msgid "%s IN DEVELOPMENT built %s%s"
msgstr "%s %s%s 构建的【开发版本】"

msgid "threads (see ?getDTthreads). Latest news: r-datatable.com"
msgstr "线程（请参阅?getDTthreads）。最新的消息：r-datatable.com"
msgid ""
"data.table %s using %d threads (see ?getDTthreads). Latest news: r-"
"datatable.com"
msgstr "data.table %s 使用 %d 线程（请参阅?getDTthreads）。最新的消息：r-datatable.com"

msgid "TRANSLATION CHECK"
msgstr "翻译检查"
Expand Down Expand Up @@ -1910,21 +1912,6 @@ msgstr ""
"table::update.dev.pkg()\n"
"**********"

msgid "**********"
msgstr "**********"

msgid ""
"This installation of data.table has not detected OpenMP support. It should "
"still work but in single-threaded mode."
msgstr ""
"data.table的安装未检测到OpenMP支持。在单线程模式下应该仍能运行"

msgid "sysname"
msgstr "sysname"

msgid "Darwin"
msgstr "Darwin"

msgid ""
"This is a Mac. Please read https://mac.r-project.org/openmp/. Please engage "
"with Apple and ask them for support. Check r-datatable.com for updates, and "
Expand All @@ -1933,24 +1920,33 @@ msgid ""
"on Mac, it's time to gingerly point out that there have been no similar "
"problems on Windows or Linux."
msgstr ""
"此设备为 Mac。请阅读 https://mac.r-project.org/openmp/。请"
"与 Apple 公司联系以获取支持。查看 r-datatable.com 以获取更新，并"
"参阅我们的 Mac 设备说明：https://github.com/Rdatatable/data.table/wiki/Installation"
"在 Mac 上出现相关安装问题的报告已数年之久，"
"需要指出的是在 Windows 或 Linux 平台上一般不存在类似问题。"
"此设备为 Mac。请阅读 https://mac.r-project.org/openmp/。请与 Apple 公司联系以"
"获取支持。查看 r-datatable.com 以获取更新，并参阅我们的 Mac 设备说明："
"https://github.com/Rdatatable/data.table/wiki/Installation在 Mac 上出现相关安"
"装问题的报告已数年之久，需要指出的是在 Windows 或 Linux 平台上一般不存在类似"
"问题。"

msgid "This is"
msgstr "这是"
msgid ""
"This is %s. This warning should not normally occur on Windows or Linux where "
"OpenMP is turned on by data.table's configure script by passing -fopenmp to "
"the compiler. If you see this warning on Windows or Linux, please file a "
"GitHub issue."
msgstr ""
"此设备为 %s。此警告一般不应出现在 Windows 或 Linux 平台中，因为data.table 的 "
"configure 脚本中已通过向编译器传递 -fopenmp 参数启用了 OpenMP。如果你在 "
"Windows 或 Linux 平台中发现此警告，请在 GitHub 中提交 issue。"

msgid ""
". This warning should not normally occur on Windows or Linux where OpenMP is "
"turned on by data.table's configure script by passing -fopenmp to the "
"compiler. If you see this warning on Windows or Linux, please file a GitHub "
"issue."
"**********\n"
"This installation of data.table has not detected OpenMP support. It should "
"still work but in single-threaded mode.\n"
"%s\n"
"**********"
msgstr ""
"。此警告一般不应出现在 Windows 或 Linux 平台中，因为"
"data.table 的 configure 脚本中已通过向编译器传递 -fopenmp 参数启用了 OpenMP。"
"如果你在 Windows 或 Linux 平台中发现此警告，请在 GitHub 中提交 issue。"
"**********\n"
"data.table的安装未检测到OpenMP支持。在单线程模式下应该仍能运行。\n"
"%s\n"
"**********"

msgid ""
"The option 'datatable.nomatch' is being used and is not set to the default "
Expand Down
Loading