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.

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

i18n implementation and Chinese (Traditional/Simplified) translation #2985

Merged
merged 144 commits into from Oct 21, 2017

Conversation

Projects
None yet
5 participants
@urakagi
Contributor

urakagi commented Sep 27, 2017

This pull request includes tap-i18n framework implementation and Chinese translation.
Please note that opposite to the guideline, language is auto-selected by browser's navigator.language in this PR, so users cannot set their language manually, and Accept-Language header is ignored. Also, capnp related texts are not touched. This will be left for further work.

caasi and others added some commits Aug 15, 2017

Add language auto detection by navigator.language (better also have a…
… select box)

Start to traslate Tranditional Chinese
Start to replace apps folder templates
Fix demo expired title and cleanup
* fix the demo expired title in the template "layout" and
* move shell strings to its own namespace `shell`

caasi and others added some commits Sep 17, 2017

Replace strings of templates:
* setupWizardLoginUser
* setupWizardLogSuccess
* setupWizardVerifyToken
* setupWizardTokenExpired
Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	shell/client/accounts/account-settings.html
#	shell/client/accounts/credentials/credentials.html
#	shell/client/accounts/login-buttons.html
#	shell/client/admin/admin.html
#	shell/client/admin/email-config.html
#	shell/client/admin/hosting-management.html
#	shell/client/admin/login-providers.html
#	shell/client/admin/network-capabilities.html
#	shell/client/admin/user-accounts.html
#	shell/client/admin/user-details.html
#	shell/client/grain.html
#	shell/client/notifications.html
#	shell/client/setup-wizard/wizard.html
@kentonv

Some initial (nitpicky) comments.

Mostly this code is looking pretty straightforward. Are there any particular html files where you had to make edits more complicated than simply replacing the English text with message codes?

Show outdated Hide outdated shell/client/shell-client.js
Show outdated Hide outdated shell/client/shell-client.js
Show outdated Hide outdated shell/client/shell-client.js
@@ -0,0 +1,69 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

This comment has been minimized.

@kentonv

kentonv Oct 1, 2017

Member

Please add some comments to this file explaining what it does.

@kentonv

kentonv Oct 1, 2017

Member

Please add some comments to this file explaining what it does.

@urakagi

This comment has been minimized.

Show comment
Hide comment
@urakagi

urakagi Oct 3, 2017

Contributor

I didn't meet any complicated string replacing for Chinese. Some strings can be fixed for more nature Chinese, but in fact we are used to read "translated text not so nature".

Contributor

urakagi commented Oct 3, 2017

I didn't meet any complicated string replacing for Chinese. Some strings can be fixed for more nature Chinese, but in fact we are used to read "translated text not so nature".

@kentonv

This comment has been minimized.

Show comment
Hide comment
@kentonv

kentonv Oct 14, 2017

Member

@urakagi Can you add a commit addressing the comments I made?

Member

kentonv commented Oct 14, 2017

@urakagi Can you add a commit addressing the comments I made?

@kentonv

This comment has been minimized.

Show comment
Hide comment
@kentonv

kentonv Oct 15, 2017

Member

Also @urakagi and @caasi, can I ask you both to sign the Contributor License Agreement?

https://sandstorm.io/cla/

Thanks.

Member

kentonv commented Oct 15, 2017

Also @urakagi and @caasi, can I ask you both to sign the Contributor License Agreement?

https://sandstorm.io/cla/

Thanks.

@urakagi

This comment has been minimized.

Show comment
Hide comment
@urakagi

urakagi Oct 16, 2017

Contributor

@kentonv Okay, I have committed the fixes. I need to ask @audreyt about the CLA, please wait a moment.

Contributor

urakagi commented Oct 16, 2017

@kentonv Okay, I have committed the fixes. I need to ask @audreyt about the CLA, please wait a moment.

@audreyt

This comment has been minimized.

Show comment
Hide comment
@audreyt

audreyt Oct 16, 2017

Contributor

Green light 🥗 on the CLA, please use the individual version.

Contributor

audreyt commented Oct 16, 2017

Green light 🥗 on the CLA, please use the individual version.

@urakagi

This comment has been minimized.

Show comment
Hide comment
@urakagi

urakagi Oct 16, 2017

Contributor

I have signed the CLA. BTW, what's the conflict about shell/.meteor/versions? I think I didn't modify that?

Contributor

urakagi commented Oct 16, 2017

I have signed the CLA. BTW, what's the conflict about shell/.meteor/versions? I think I didn't modify that?

@caasi

This comment has been minimized.

Show comment
Hide comment
@caasi

caasi Oct 16, 2017

Contributor

@kentonv I just signed the individual CLA with my email address: caasi.igd {at} gmail.com.

Contributor

caasi commented Oct 16, 2017

@kentonv I just signed the individual CLA with my email address: caasi.igd {at} gmail.com.

@kentonv kentonv merged commit 692299f into sandstorm-io:master Oct 21, 2017

@kentonv

This comment has been minimized.

Show comment
Hide comment
@kentonv

kentonv Oct 21, 2017

Member

This has been released!

Member

kentonv commented Oct 21, 2017

This has been released!

<button class="button-primary sign-in">Create free account »</button>
<span class="subtext">Your demo data will be transferred.</span>
<p>{{_ (con txt "oasis")}}
<button class="button primary sign-in">{{_ (con txt "createAccount")}}</button>

This comment has been minimized.

@kentonv

kentonv Oct 22, 2017

Member

Whoops, you changed the CSS class here... I'll fix it.

@kentonv

kentonv Oct 22, 2017

Member

Whoops, you changed the CSS class here... I'll fix it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment