Skip to content
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

Jump to bottom

Add zh-CN i18n support for Windows installer #2569

Closed
wants to merge 1 commit into from
Closed

Add zh-CN i18n support for Windows installer #2569

wants to merge 1 commit into from

Conversation

pmq20
Copy link
Contributor

@pmq20 pmq20 commented Aug 27, 2015

This is a follow-up on #2247 and #819

@JacksonTian Could you review the translations? thanks!

@brendanashworth brendanashworth added windows Issues and PRs related to the Windows platform. i18n-api Issues and PRs related to the i18n implementation. install Issues and PRs related to the installers. labels Aug 27, 2015
JacksonTian
JacksonTian reviewed Aug 27, 2015
View reviewed changes
tools/msvs/msi/i18n/zh-cn.wxl
<String Id="WelcomeDlgDescription">本安装向导将在您的计算机上安装 [ProductName]。</String>
<String Id="InstallDirDlgDescription">请选择一个自定义的安装位置，或单击下一步开始安装。</String>

<String Id="MajorUpgrade_DowngradeErrorMessage">已安装的 [ProductName] 的一个更高版本。安装程序将立即退出。</String>
Copy link
Contributor

Choose a reason for hiding this comment

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

已安装的xxx的 去掉前一个的

@pmq20
Copy link
Contributor Author

pmq20 commented Aug 27, 2015

Thank you @JacksonTian for reviewing. Typo fixed.

JacksonTian
JacksonTian reviewed Aug 27, 2015
View reviewed changes
tools/msvs/msi/i18n/zh-cn.wxl
<String Id="DocumentationShortcuts_Description">在开始菜单内添加 [ProductName] [FullVersion] 的在线文档链接以及 [ProductName] 的网站链接。</String>

<String Id="EnvironmentPath_Title">添加到 PATH 环境变量</String>
<String Id="EnvironmentPath_Description">把 [ProductName], npm 以及以全局方式安装的 npm 模块添加到 PATH 环境变量。</String>
Copy link
Contributor

Choose a reason for hiding this comment

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

以及以

@Fishrock123
Copy link
Contributor

cc @nodejs/iojs-cn

@laosb
Copy link

laosb commented Aug 29, 2015

Seems good.

@dead-horse
Copy link
Contributor

LGTM

@Fishrock123
Copy link
Contributor

@joaocgreis I think you are the most familiar with the windows installer bits, could you review that?

@joaocgreis
Copy link
Member

LGTM

cc @fhemberger

yorkie
yorkie reviewed Aug 29, 2015
View reviewed changes
tools/msvs/msi/i18n/zh-cn.wxl
<String Id="EnvironmentPathNode_Title">Node.js 和 npm</String>
<String Id="EnvironmentPathNode_Description">把 [ProductName] 和 npm（如果安装了）添加到 PATH 环境变量中。</String>

<String Id="EnvironmentPathNpmModules_Title">npm 模块</String>
Copy link
Contributor

Choose a reason for hiding this comment

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

What's the correct/better translation about the often word "module"? "模块" vs. "模组", as for me, +1 on "模组" :)

Copy link
Contributor

Choose a reason for hiding this comment

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

Just Taiwan or Hongkong use "模组" for module.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok, I see...LGTM now

@fengmk2
Copy link
Contributor

fengmk2 commented Aug 29, 2015

👍

@fhemberger
Copy link
Contributor

Wow, awesome! I was planning to write an issue for all translators about the Windows installer. You were faster. ;)

LGTM

@fhemberger
Copy link
Contributor

@nodejs/collaborators Can someone please merge this? It has no direct influence on the build (translations are still commented out).

@rvagg
Copy link
Member

rvagg commented Dec 18, 2015

I might run a test build of it to get feedback from native speakers, hold on

@rvagg
Copy link
Member

rvagg commented Dec 18, 2015

ah, it's kind of old, @pmq20 would you mind rebasing this off master please?

@pmq20
Copy link
Contributor Author

pmq20 commented Dec 19, 2015

@rvagg Sure. Rebased.

@joaocgreis
Copy link
Member

@rvagg can I land this? If you still want to get some feedback, note that this is being committed commented in nodemsi.wixproj. Let me know what I can do to help you.

@rvagg
Copy link
Member

rvagg commented Jan 20, 2016

go ahead @joaocgreis, I put out a call but am happy to trust @pmq20 on this, I'm sure we'll get feedback on anything that can be tweaked.

@joaocgreis
Copy link
Member

This builds well with the translation commented, but fails otherwise with the same problem as #4647 (comment) . Upstream WiX has a translation for German, but none for Chinese or Italian. A possible workaround seems to be adding those variables to the translation file, translating the original. The best would be to submit it upstream. @fhemberger do you know of a better solution for this?

@fhemberger
Copy link
Contributor

@joaocgreis Sounds good to me. Sorry, I'm no expert on this topic either. I dug into WiX once over a weekend for the initial German translation but never used it before.

@mcollina mcollina mentioned this pull request Mar 2, 2016
Closed
@joaocgreis
Copy link
Member

@mcollina that would be great! @pmq20 would you consider this for zh-CN?

@piccoloaiutante
Copy link
Member

@mcollina yes we can, so we can finally have the italian version :-)

@MylesBorins
Copy link
Contributor

@nodejs/build is there something keeping this from landing?

@fhemberger
Copy link
Contributor

@thealphanerd This can be merged, as the translation is still commented, so nothing will break.
There is still this issue to be solved to get zh-CN up and running:
#2569 (comment)

So we still need a PR for the WiX toolset to add Chinese, Italian, et. al.

@XadillaX
Copy link
Contributor

XadillaX commented Jul 7, 2016

LGTM.

@laosb
Copy link

laosb commented Jul 8, 2016

Can't believe that this is still not merged.

@mcollina
Copy link
Member

@piccoloaiutante did the PR to WiX for Italian (wixtoolset/wix3#366). Did an equivalent PR happen for Chinese as well?

@pmq20
Copy link
Contributor Author

pmq20 commented Jul 14, 2016

@joaocgreis @mcollina Sure. Thanks for the Italian example. Let me do the same thing for the Chinese language.

This PR is lasting too long to be merged. Let me first merge the translation (which has been thoroughly reviewed) and then create new PR's for the translations to take effect.

pmq20 added a commit to pmq20/node that referenced this pull request Jul 14, 2016
@pmq20
win,msi: add zh-CN translations for the installer
e09c62a 
PR-URL: nodejs#2569
Reviewed-By: Jackson Tian <shvyo1987@gmail.com>
Reviewed-By: Wexpo Lyu <laosb@lns.unihubs.com>
Reviewed-By: Yiyu He <heyiyu.deadhorse@gmail.com>
Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com>
@pmq20
Copy link
Contributor Author

pmq20 commented Jul 14, 2016

Landed in e09c62a

@pmq20 pmq20 closed this Jul 14, 2016
@pmq20 pmq20 deleted the psvr-zh-cn-1 branch July 14, 2016 03:04
evanlucas pushed a commit that referenced this pull request Jul 15, 2016
@pmq20 @evanlucas
win,msi: add zh-CN translations for the installer
e1e477e 
PR-URL: #2569
Reviewed-By: Jackson Tian <shvyo1987@gmail.com>
Reviewed-By: Wexpo Lyu <laosb@lns.unihubs.com>
Reviewed-By: Yiyu He <heyiyu.deadhorse@gmail.com>
Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com>
@evanlucas evanlucas mentioned this pull request Jul 18, 2016
Merged
evanlucas added a commit that referenced this pull request Jul 19, 2016
@evanlucas
2016-07-20, Version 6.3.1 (Current)
b0ed0fb 
Notable changes:

* deps: upgrade to V8 5.0.71.54 (Ben Noordhuis) [#7531](#7531)
* win,msi
  * add zh-CN translations for the installer (Minqi Pan) [#2569](#2569)
  * Added Italian translation (Matteo Collina) [#4647](#4647)

PR-URL: #7782
@joaocgreis joaocgreis mentioned this pull request Jul 19, 2016
Closed
2 tasks
@cjihrig cjihrig mentioned this pull request Aug 8, 2016
Closed
jasnell pushed a commit that referenced this pull request Aug 22, 2016
@pmq20 @jasnell
win,msi: add zh-CN translations for the installer
a146e68 
PR-URL: #2569
Reviewed-By: Jackson Tian <shvyo1987@gmail.com>
Reviewed-By: Wexpo Lyu <laosb@lns.unihubs.com>
Reviewed-By: Yiyu He <heyiyu.deadhorse@gmail.com>
Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com>
@evanlucas evanlucas mentioned this pull request Aug 24, 2016
Merged
MylesBorins pushed a commit that referenced this pull request Sep 30, 2016
@pmq20
win,msi: add zh-CN translations for the installer
4ca798b 
PR-URL: #2569
Reviewed-By: Jackson Tian <shvyo1987@gmail.com>
Reviewed-By: Wexpo Lyu <laosb@lns.unihubs.com>
Reviewed-By: Yiyu He <heyiyu.deadhorse@gmail.com>
Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com>
@MylesBorins
Copy link
Contributor

@pmq20 I've added this to v4.x-staging. Would you be able to test and make sure it works as expected before we do another release

rvagg pushed a commit that referenced this pull request Oct 18, 2016
@pmq20 @rvagg
win,msi: add zh-CN translations for the installer
8565d0b 
PR-URL: #2569
Reviewed-By: Jackson Tian <shvyo1987@gmail.com>
Reviewed-By: Wexpo Lyu <laosb@lns.unihubs.com>
Reviewed-By: Yiyu He <heyiyu.deadhorse@gmail.com>
Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com>
MylesBorins pushed a commit that referenced this pull request Oct 26, 2016
@pmq20 @MylesBorins
win,msi: add zh-CN translations for the installer
e8be413 
PR-URL: #2569
Reviewed-By: Jackson Tian <shvyo1987@gmail.com>
Reviewed-By: Wexpo Lyu <laosb@lns.unihubs.com>
Reviewed-By: Yiyu He <heyiyu.deadhorse@gmail.com>
Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com>
@MylesBorins MylesBorins mentioned this pull request Oct 26, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
i18n-api Issues and PRs related to the i18n implementation. install Issues and PRs related to the installers. windows Issues and PRs related to the Windows platform.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.