Translation dracodoc#4034
Translation dracodoc#4034MichaelChirico merged 23 commits intoRdatatable:translationfrom dracodoc:translation-dracodoc
Conversation
This reverts commit 6e65d0e.
…n-dracodoc # Conflicts: # po/R-zh_CN.po
* translation: added new message caught by xianghui
…n-dracodoc # Conflicts: # po/R-zh_CN.po
|
Thanks!! Could you take a look @shrektan? |
| int lastncol = countfields(&ch); | ||
| if (lastncol<0) continue; // invalid file with this sep and quote rule, skip | ||
| ASSERT(lastncol>0, "Internal error: first non-empty row should always be at least one field; %c %d", sep, quoteRule); // # nocov | ||
| ASSERT(lastncol>0, _("Internal error: first non-empty row should always be at least one field; %c %d"), sep, quoteRule); // # nocov |
There was a problem hiding this comment.
OK, so I figured out what's going wrong here. And now I remember that I had found something wrong here earlier but gave up before understanding what's the issue...
ASSERT is doing char array literal concatenation:
"Internal error in line %d of fread.c, please report on data.table GitHub: " msg
However, this breaks when we do the translation -- note (from po.h) that _(String) is expanding to dgettext("data.table", String), so if we wrap the ASSERT fixed literal with whatever the message is, after macro expansion we'll have:
dgettext("data.table", "Internal error in line %d of fread.c, please report on data.table GitHub: ") dgettext("data.table", msg)
The f() g() is a syntax error.
I suppose we could complicate things by doing some array copying, etc., to handle this more properly, BUT seeing as how these are all internal errors in the first place (meaning users should never see them, in principle), I don't think it's worth the effort.
So I'll roll back the use of translation with ASSERT. Sorry about that!
Sure. But I’m only available in this weekend. Will try to take a closer look then. @MichaelChirico |
No rush @shrektan, for translation reviews I'm looking to finish by mid-December :) |
shrektan
left a comment
There was a problem hiding this comment.
Other parts look good to me.
|
Great! Please push an update when you get a chance @dracodoc 👍 |
|
I have updated and pushed changes. The commit was made with my work github id because I often need to switch between 2 accounts... |
* initial exploration of adding a chinese translation of messages working version of chinese translation * adding another .mo file that was untracked * trying to get the .pot for src/ files * adding warning()s from C * C messages with DTPRINT or Rprintf * adding STOP messages * DTWARN messages * Error in forder * odds&ends more messages * cannot use _() with \r * update .pot for src files * moving pot file to po/ * update header metadata for src .pot * run update_pkg_po on the src to get mo files * update_pkg_po after merge * add template message in onAttach() & clear typos/PYDT issue along the way * remove some strings * improve arg checking&message in groupingsets; add some messages * get tests working (fix some bad quotes, adjust to new messages) * update po with latest message edits * Finished the translation assigned to Chun-Hui Gao (#3983) * Finished the translation of line 3058-3231 in po/zh_CN.po. Totally 34 messages. * Finished the translation assigned to Chun-Hui Gao in R-zh_cn.po. Lines 1500-1598 in original R-zh_CN.po. Totally 26 messages. * Resolved reviewer's comments. * Resolved reviewer's comments. * (hopefully) apply encoding fix & check compilation * improve internal error & regenerate messages * Finish translation to zh_CN assigned to group 2 (Hongyuan Jia) (#3986) * Finish translation. * Resolve review comments. * balance quotes * extra nocov * some coverage of fmelt * complete coverage of fmelt * fix test error * update message per DeLuns feedback * update message again; some minor tweaks to nearby code * Translation to zh_CN assigned to group 3 (#3985) * translate assigned to group 3 * translate assigned to group 3 * translate assigned to group 3 * remove merge conflict vestiges * remove merge conflict vestiges * plonk * update translation * minor update * added new message caught by xianghui * Translation haogao gu (#4002) * R-zh_CN_2019-10-26 * 10-26 * restore previous * updated with feedback * regenerate with small fix * regenerate .mo files * Translation finished (soappp) (#4023) * readme link examples, rm old link to a talk (#4001) * Homepage additions (#4006) * pkgdown, keep manual tab, link cranlike page, minor rename (#4008) * fix Rd warnings (#4011) * use Rdevel for revdeps due to bioc-devel (3.11) now needing R 4+ * (hopefully) apply encoding fix & check compilation * improve internal error & regenerate messages * Finish translation to zh_CN assigned to group 2 (Hongyuan Jia) (#3986) * Finish translation. * Resolve review comments. * balance quotes * extra nocov * some coverage of fmelt * complete coverage of fmelt * fix test error * update message per DeLuns feedback * update message again; some minor tweaks to nearby code * translatation completed * fixed somme message 1 * fix format tags for two translations * done some translation! * Finish translation to zh_CN assigned to group 5 (Leo Lee) (#3995) * chinese translation by Leo * Update R-zh_CN.po fix a typo * Update zh_CN.po * add missing quotes * number out-of-order format strings * apply numbering to formatters * Update R-zh_CN.po & Change author * Fix the problems of missing %d in zh_CN.po & Polish translation * Translation dracodoc (#4034) * 895 - 939 * 945 - 1007 * To the real 1007 line msg * convert enconding from GBK to UTF-8 * Revert "convert enconding from GBK to UTF-8" This reverts commit 6e65d0e. * translate start and end of assigned msgs. * till 1899 * two entries then found possible problem of missing messages * 10 missing message not captured? * till 1962 * finished assignment * review and edit * update meta info * macro-within-macro removed * syntax error -- split ternary operator * roll back use of translation in ASSERT internal errors * Update according to @shrektan's comments * re-run update_pkg_po * update binaries * Translation caiquanyou (#4039) * finish translation * Update R-zh_CN.po * Update zh_CN.po * update mo files * translation(partial) into zh_CN by Yuanchen Xie (#4010) * translation(partial) into zh_CN by Yuanchen Xie * Add new translation results, based on messages * update mo file * update transitions as renkun-ken's suggestions * update binary mo * update vs recent master * Translation to zh_CN - Group 7 (#4019) * translate R msgs * src error messages * missing quote * missing quote * remove extra quote * fix-up of merge * update po after merge * update fuzzy translations * update mistaken PRIu64->PRId64 * caught a few more failed merges * line # update * rerun update_pkg_po * Translation shawn (#4050) * done some translation! * done some translation! * done some translation * revised the translation * small tweak * Translation yilei (#3989) * messsage * messsage * messsage * messsage * messsage * done some translation! * done it. * updating some small misses from last pull * Translation to zh_CN assigned to group 12 (#3987) * Update translations * Minor refine * Minor reformatting * no longer using %llu, other small tidying * Translation fengqifang (#3990) * First version, finished all message * 2nd one, multiple lines of msgstr * 3rd, finished * zh_CN.po 1st * after zh_CN.po reviewed * fix encoding issue * manually editing per GH UI submission * run update_pkg_po on new merge * done some translation (#4069) * done some translation * do some revisions * touch-up * Translation to zh_CN assigned to group 4 (#3997) * finish R-zh_CN.po * finish zh_CN.po * finalize two files * change author * make the package * finalize the messages * change the format of numbering * install the pacakge * delete excessive src folders * manually revert coding issues (open to a better solution... `iconv(bad_str, from = 'GBK'|'GB18030', to = 'UTF-8')` both returned something gibberish-y. * update mo files * update .mo * add in suggestions from gaospecial * update mo * My part of translation has been completed. It's so happy! (#4051) * messsage * Update R-zh_CN.po * Update R-zh_CN.po * Update zh_CN.po * some revisions due to foreign char, touch-up, remove fuzzy * Translation yuliang li (#4055) * completed yuliang's translation * yuliang's work * Update zh_CN.po Co-authored-by: Michael Chirico <michaelchirico4@gmail.com> * tweaks for syntax mistakes * Translation to zh_CN - Group 17 (#4049) * finish the Chinese message translation for group 17 * change as KingdaShi suggests Co-authored-by: Michael Chirico <michaelchirico4@gmail.com> * update mo, fix missing field * Translation yc0802 (#4054) * message * message * added hongyuans review Co-authored-by: Michael Chirico <michaelchirico4@gmail.com> * adding "leftover" translations (#4143) * done some translation!-kingda (#4046) * done some translation! * done some translation * messsage * messsage Co-authored-by: Michael Chirico <michaelchirico4@gmail.com> * Translation leftover pt2 (#4146) * covering trivial translations from among the leftovers * progress on paring down leftover translations * completed translations!!! * adjustments * missing dot * add note for proceeding to CRAN_Relase * %f needed for > integer max Co-authored-by: Chun-Hui Gao <gaospecial@gmail.com> Co-authored-by: Hongyuan Jia <hongyuan.jia@bears-berkeley.sg> Co-authored-by: biobai <biobai@zju.edu.cn> Co-authored-by: Koohoko <koohoko@gmail.com> Co-authored-by: soappp <soappp9527@gmail.com> Co-authored-by: KingdaShi <50854702+KingdaShi@users.noreply.github.com> Co-authored-by: Guangzheng Li <leolee0828@outlook.com> Co-authored-by: dracodoc <dracodoc@gmail.com> Co-authored-by: caiquanyou <48861819+caiquanyou@users.noreply.github.com> Co-authored-by: Yuanchen Xie <yuanchen.gm@gmail.com> Co-authored-by: Amy Tzu-Yu Chen <amy17519@gmail.com> Co-authored-by: ShawnChen1996 <shawnchen1996@outlook.com> Co-authored-by: Yilei <30611492+Zachary-Wu@users.noreply.github.com> Co-authored-by: Kun Ren <mail@renkun.me> Co-authored-by: fengqifang <nclxin@gmail.com> Co-authored-by: Shayebuhuii <32659317+sunshine1126@users.noreply.github.com> Co-authored-by: Zhi Yang <zhiyang@usc.edu> Co-authored-by: Xueliang24 <56901274+Xueliang24@users.noreply.github.com> Co-authored-by: JulianYlli12 <43525270+JulianYlli12@users.noreply.github.com> Co-authored-by: Xianying Tan <shrektan@126.com> Co-authored-by: yc0802 <55459478+yc0802@users.noreply.github.com>
@MichaelChirico ,I just completed my assignment and double checked once. Can you notify the reviewer to look at it? Thanks!