Feature/translate #72

BennieMeng · 2018-11-27T08:20:10Z

What type of PR is this?

/kind feature

What this PR does / why we need it:

https://github.com/Qihoo360/wayne/milestone/3

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

目前i18n 规划是先完整中文模板。
进度是首页namespace 5个item基本完成。
项目中完成了 项目概览，部署列表，创建模板。
开发了一个自动同步中文模板到其他模板的脚本 fill-lang.js , 运行 node fill-lang.js 完成同步。

wilhelmguo · 2018-11-27T08:50:34Z

/lgtm @chengyumeng

src/frontend/src/assets/i18n/en.json

src/frontend/src/assets/i18n/zh-Hans.json

motecshine · 2018-11-27T10:13:32Z

src/frontend/src/app/portal/app/app.component.html

-                  <wayne-checkbox>创建时间</wayne-checkbox>
-                  <wayne-checkbox>创建者</wayne-checkbox>
-                  <wayne-checkbox>操作</wayne-checkbox>
+                  <wayne-checkbox value="name">{{'TITEL.NAME' | translate}}</wayne-checkbox>


typo ? TITLE

i also use the meaning of title, ., i will change this later

@motecshine do you have interesting in constructing this issue.

当然，一直关注这个项目，这个pr还是你来吧

@motecshine i will optimize the design kayframe of language json. maybe the job is a little boring and longless, if insteresting, contact me. laugh~

…feature/translate

chengyumeng · 2018-11-28T06:26:41Z

src/frontend/src/app/portal/app-apikey/apikey.component.html

    </div>
    <div class="table-search">
      <div class="table-search-left">
        <button *ngIf="authService.currentAppPermission.apiKey.create || authService.currentUser.admin" class="wayne-button normal"
          (click)="openModal()">
-          创建APIKey
+          {{'ACTION.CREATE' | translate}} APIKey


这种为什么不把创建 APIkeys 作为一个词条去翻译？

apikey 叫什么，一开始为什么就是英文

APIkeys 可以暂时先不翻译

chengyumeng · 2018-11-28T06:29:23Z

src/frontend/src/app/portal/app-apikey/create-edit-apikey/create-edit-apikey.component.html

@@ -15,13 +15,13 @@ <h3 class="modal-title">{{title}}</h3>
                   name="name"
                   required
                   id="name"
-                   placeholder="名称"
+                   [placeholder]="'TITEl.NAME' | translate"


TITEL 拼写错误，我建议，这种翻译，应该对照成：[placeholder]="'TITEl.PLACEHOLDER' | translate" 这种，不然如果存在代码交接，就很难维护了，不知道开源库有没有名字限制呢？

名称太通用了。没必要建立那么多命名空间吧。

TITEl.NAME 这个拼写错误修改了么？

chengyumeng · 2018-11-28T06:30:40Z

src/frontend/src/app/portal/app-apikey/create-edit-apikey/create-edit-apikey.component.html

@@ -35,7 +35,7 @@ <h3 class="modal-title">{{title}}</h3>
        </div>
        <div class="form-group row">
          <div class="col-lg-3 col-md-12 col-sm-12 col-xs-12">
-            <label for="expire_in" class="required">过期时间</label>
+            <label for="expire_in" class="required">{{'TITLE.EXPIRE_TIME' | translate}}</label>


为什么前面叫 expire_in,后面 key 叫expire_time?按照常用用法，应该是使用expire_in

带时间的在translate中统一用time，用你这种写法好维护？

chengyumeng · 2018-11-28T06:32:01Z

src/frontend/src/app/portal/app-apikey/create-edit-apikey/create-edit-apikey.component.html

@@ -44,13 +44,13 @@ <h3 class="modal-title">{{title}}</h3>
                   required
                   name="expire_in"
                   id="expire_in"
-                   placeholder="单位秒，0代表永久有效"
+                   [placeholder]="'PLACEHOLDER.EXPIRE_TIME' | translate"


前面有一个 placeholder 写法是： [placeholder]="'TITEl.NAME' | translate"，这里又这样关联，有问题吧？

建议仔细看一下配置。除了个别通用的，placeholder 都是放在PLACHOLDER里边的

chengyumeng · 2018-11-28T06:34:27Z

src/frontend/src/app/portal/app-apikey/token-detail/token-detail.component.html

@@ -1,5 +1,5 @@
 <clr-modal [(clrModalOpen)]="modalOpened">
-  <h3 class="modal-title">查看token</h3>
+  <h3 class="modal-title">{{'ACTION.LOOK_UP' | translate}}token</h3>


“查看”可以翻译为 view，是比较通用的翻译。

水平不行啊，你来翻译？

chengyumeng · 2018-11-28T06:35:16Z

src/frontend/src/app/portal/app/app.component.html

@@ -8,18 +8,18 @@
                <svg style="width: 16px; height: 16px;fill: #377aec; margin-right: 5px;" viewBox="0, 0, 40 , 40" xmlns="http://www.w3.org/2000/svg">
                  <rect x="0" y="18.5" width="40" height="3" rx="1.5" ry="1.5"></rect>
                  <rect x="18.5" y="0" width="3" height="40" rx="1.5" ry="1.5"></rect>
-                </svg> 创建项目
+                </svg> {{'TITLE.CREATE_PRODUCT' | translate}}


Product -> Project

这里会改成app，

chengyumeng · 2018-11-28T06:36:24Z

src/frontend/src/app/portal/app/app.component.html

                  <wayne-progress [count]="resources[cluster.name].usage.cpu" [total]="dealLimitLogic(resources[cluster.name].limit.cpu)"></wayne-progress>
                </div>
                <div style="display: flex;">
-                  <div>内存使用(G)</div>
+                  <div style="font-family: monospace;">{{'TITLE.MEMORY_USAGE_SHORT' | translate}}</div>


short 后缀是有 long 什么的 key 么？

是因为有正常的，不一定是有long

chengyumeng · 2018-11-28T06:47:58Z

src/frontend/src/assets/i18n/zh-Hans.json

+  },
+  "OTHER": "其他",
+  "OF": "的"
+}


中英文之间加空格。建议作者自己描述下这个文件的设计规则。

…feature/translate

…late

BennieMeng added 10 commits November 22, 2018 15:05

frontend: 添加en zh-Hans 俩种模板语言

89122a2

frontend: 添加语言切换

0c554aa

frontend: 前台nav i18n

f7d5c65

frontend: sidenav-namespance i18n

7f2e57c

frontend: Department i18n

c871d71

frontend: product i18n

b79f89d

frontend: namespace apikey i18n

fde8166

frontend: deployment i18n

ac5d758

frontend: deployment-create-tpl i18n

dc9b2f6

frontend: 语言切换位置显示

a1e15ae

BennieMeng requested review from chengyumeng and wilhelmguo November 27, 2018 08:20

BennieMeng assigned wilhelmguo Nov 27, 2018

wilhelmguo added kind/feature Categorizes issue or PR as related to a new feature. sig/frontend Categorizes an issue or PR as relevant to sig-frontend. labels Nov 27, 2018

wilhelmguo approved these changes Nov 27, 2018

View reviewed changes

src/frontend/src/assets/i18n/en.json Show resolved Hide resolved

src/frontend/src/assets/i18n/zh-Hans.json Show resolved Hide resolved

Merge branch 'master' into feature/translate

74a0344

BennieMeng mentioned this pull request Nov 27, 2018

International support #55

Open

motecshine reviewed Nov 27, 2018

View reviewed changes

wilhelmguo and others added 5 commits November 27, 2018 18:56

Merge branch 'master' into feature/translate

78c6723

frontend: replace titel with title

3f74bc4

Merge branch 'feature/translate' of github.com:BennieMeng/wayne into …

c51c04e

…feature/translate

Merge branch 'master' into feature/translate

85bd3cc

Merge branch 'master' into feature/translate

a570801

chengyumeng reviewed Nov 28, 2018

View reviewed changes

chengyumeng self-requested a review November 28, 2018 06:49

BennieMeng added 3 commits November 28, 2018 15:22

frontend: separate template title into TMP

b8addd2

Merge branch 'feature/translate' of github.com:BennieMeng/wayne into …

0b0bbf5

…feature/translate

frontend: statefulset list i18n

0617cb5

BennieMeng added 14 commits November 28, 2018 16:10

frontend: replace create_product to create_app

ed1a89f

frontend: statefulset template i18n

3bc84b4

frontend: daemonset i18n create

9ce9194

Merge branch 'master' into feature/translate

a9ff90f

frontend: group replace create template word

d5136da

Merge branch 'master' into feature/translate

a9d74e1

frontend: daemonset i18n

43fd38b

frontend: group replace create i18n

52afaa9

Merge branch 'feature/translate' of github.com:BennieMeng/wayne into …

f5e9b49

…feature/translate

frontend: configmap i18n

28e0dc7

frontend: secret i18n

5f72414

frontend: pvc i18n

b5f08b9

frontend: update lib

56f2f4a

Merge branch 'master' of github.com:Qihoo360/wayne into feature/trans…

9fa3b40

…late

wilhelmguo merged commit 0f842c4 into Qihoo360:master Nov 30, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/translate #72

Feature/translate #72

BennieMeng commented Nov 27, 2018

wilhelmguo commented Nov 27, 2018

motecshine Nov 27, 2018

BennieMeng Nov 27, 2018

BennieMeng Nov 27, 2018

motecshine Nov 27, 2018

BennieMeng Nov 28, 2018

chengyumeng Nov 28, 2018

BennieMeng Nov 28, 2018

wilhelmguo Nov 29, 2018

chengyumeng Nov 28, 2018

BennieMeng Nov 28, 2018

wilhelmguo Nov 29, 2018

BennieMeng Nov 29, 2018

chengyumeng Nov 28, 2018

BennieMeng Nov 28, 2018

chengyumeng Nov 28, 2018

BennieMeng Nov 28, 2018

chengyumeng Nov 28, 2018

BennieMeng Nov 28, 2018

chengyumeng Nov 28, 2018

BennieMeng Nov 28, 2018

chengyumeng Nov 28, 2018

BennieMeng Nov 28, 2018

chengyumeng Nov 28, 2018

Feature/translate #72

Feature/translate #72

Conversation

BennieMeng commented Nov 27, 2018

wilhelmguo commented Nov 27, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment