Browse Source

Merge pull request 'I18n for head and foot and cateogory' (#3) from category_i18n into develop

Reviewed-by: palytoxin <sxty32@126.com>
master
palytoxin 5 years ago
parent
commit
d9505df0b7
11 changed files with 180 additions and 60 deletions
  1. +11
    -12
      custom/templates/base/footer_content.tmpl
  2. +22
    -19
      custom/templates/base/head_navbar.tmpl
  3. +2
    -2
      custom/templates/datasets/dataset_list.tmpl
  4. +1
    -1
      custom/templates/user/auth/signin_inner.tmpl
  5. +12
    -0
      modules/templates/helper.go
  6. +57
    -0
      options/locale/locale_en-US.ini
  7. +58
    -0
      options/locale/locale_zh-CN.ini
  8. +1
    -1
      templates/datasets/create.tmpl
  9. +2
    -2
      templates/datasets/dataset_list.tmpl
  10. +12
    -21
      templates/datasets/form.tmpl
  11. +2
    -2
      templates/datasets/show.tmpl

+ 11
- 12
custom/templates/base/footer_content.tmpl View File

@@ -4,20 +4,19 @@
<div class="sixteen wide mobile eight wide tablet eight wide computer column">
<div class="ui three column grid">
<div class="column ui vertical text menu">
<div class="header item">社区</div>
<a href="https://www.openi.org.cn/html/Club/2019/0227/14.html" class="item">理事会</a>
<a href="https://www.openi.org.cn/html/Club/2019/0227/14.html" class="item">技术委员会</a>
<a href="https://www.openi.org.cn/html/Club/2019/0228/17.html" class="item">加入OpenI</a>
<div class="header item">{{.i18n.Tr "custom.head.community"}}</div>
<a href="https://www.openi.org.cn/html/Club/2019/0227/14.html" class="item">{{.i18n.Tr "custom.foot.council"}}</a>
<a href="https://www.openi.org.cn/html/Club/2019/0227/14.html" class="item">{{.i18n.Tr "custom.foot.technical_committee"}}</a>
<a href="https://www.openi.org.cn/html/Club/2019/0228/17.html" class="item">{{.i18n.Tr "custom.foot.join"}}</a>
</div>
<div class="column ui vertical text menu">
<div class="header item">动态</div>
<a href="https://www.openi.org.cn/html/news/dongtai/" class="item">社区动态</a>
<a href="https://www.openi.org.cn/html/news/huodong/" class="item">成员动态</a>
<a href="https://www.openi.org.cn/html/news/zixun/" class="item">行业资讯</a>
<div class="header item">{{.i18n.Tr "custom.foot.news"}}</div>
<a href="https://www.openi.org.cn/html/news/dongtai/" class="item">{{.i18n.Tr "custom.foot.community_news"}}</a>
<a href="https://www.openi.org.cn/html/news/huodong/" class="item">{{.i18n.Tr "custom.foot.member_news"}}</a>
<a href="https://www.openi.org.cn/html/news/zixun/" class="item">{{.i18n.Tr "custom.foot.industry_advisory"}}</a>
</div>
<div class="column ui vertical text menu">
<div class="header item">帮助</div>
<a href="https://docs.gitea.io/zh-cn/" class="item">帮助文档</a>
<div class="header item">{{.i18n.Tr "custom.foot.help"}}</div>
<div class="ui language bottom floating slide up dropdown link item">
<i class="world icon"></i>
<div class="text">{{.LangName}}</div>
@@ -32,9 +31,9 @@
</div>
</div>
<div class="sixteen wide mobile eight wide tablet eight wide computer column" style=" margin:2.0rem 0">
版权所有:新一代人工智能开源开放平台(OpenI) <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备18004880号</a>
{{.i18n.Tr "custom.foot.copyright"}} <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备18004880号</a>
<br>
{{.i18n.Tr "powered_by" "鹏城实验室云脑、Trustie、华为云 DevCloud、gitea"}} 构建
{{.i18n.Tr "powered_by" "鹏城实验室云脑、Trustie、华为云 DevCloud、gitea"}}
<br>
</div>
</div>


+ 22
- 19
custom/templates/base/head_navbar.tmpl View File

@@ -11,18 +11,18 @@
{{if .IsSigned}}
<a class="item {{if .PageIsDashboard}}active{{end}}" href="/">{{.i18n.Tr "dashboard"}}</a>
<div class="ui dropdown item">
社区
{{.i18n.Tr "custom.head.community"}}
<i class="dropdown icon"></i>
<div class="menu">
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0228/17.html">欢迎加入OpenI</a>
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0227/14.html">组织结构</a>
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0227/15.html">启智开源许可证</a>
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0227/16.html">OpenI社区章程</a>
<a class="item" href="https://www.openi.org.cn/html/news/dongtai/">社区动态</a>
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0228/17.html">{{.i18n.Tr "custom.head.welcome"}}</a>
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0227/14.html">{{.i18n.Tr "custom.head.about_org"}}</a>
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0227/15.html">{{.i18n.Tr "custom.head.license"}}</a>
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0227/16.html">{{.i18n.Tr "custom.head.community_charter"}}</a>
<a class="item" href="https://www.openi.org.cn/html/news/dongtai/">{{.i18n.Tr "custom.head.community_infos"}}</a>
</div>
</div>
<a class="item" href="{{AppSubUrl}}/datasets">{{.i18n.Tr "datasets"}}</a>
<a class="item" href="{{AppSubUrl}}/explore/repos">项目</a>
<a class="item" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "custom.head.project"}}</a>
{{if not .UnitIssuesGlobalDisabled}}
<a class="item {{if .PageIsIssues}}active{{end}}" href="{{AppSubUrl}}/issues">{{.i18n.Tr "issues"}}</a>
{{end}}
@@ -36,31 +36,34 @@
{{.i18n.Tr "explore"}}
<i class="dropdown icon"></i>
<div class="menu">
<a class="item" href="javascript:alert('WIP')">学习</a>
<a class="item" href="javascript:alert('WIP')">活动</a>
<a class="item" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "custom.head.project"}}</a>
<a class="item" href="{{AppSubUrl}}/datasets">{{.i18n.Tr "datasets"}}</a>
<a class="item" href="javascript:alert('WIP')">{{.i18n.Tr "custom.head.study"}}</a>
<a class="item" href="javascript:alert('WIP')">{{.i18n.Tr "custom.head.activity"}}</a>
</div>
</div>
{{else if .IsLandingPageHome}}
<a class="item {{if .PageIsHome}}active{{end}}" href="/">{{.i18n.Tr "home"}}</a>
<div class="ui dropdown item">
社区
{{.i18n.Tr "custom.head.community"}}
<i class="dropdown icon"></i>
<div class="menu">
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0228/17.html">欢迎加入OpenI</a>
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0227/14.html">组织结构</a>
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0227/15.html">启智开源许可证</a>
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0227/16.html">OpenI社区章程</a>
<a class="item" href="https://www.openi.org.cn/html/news/dongtai/">社区动态</a>
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0228/17.html">{{.i18n.Tr "custom.head.welcome"}}</a>
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0227/14.html">{{.i18n.Tr "custom.head.about_org"}}</a>
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0227/15.html">{{.i18n.Tr "custom.head.license"}}</a>
<a class="item" href="https://www.openi.org.cn/html/Club/2019/0227/16.html">{{.i18n.Tr "custom.head.community_charter"}}</a>
<a class="item" href="https://www.openi.org.cn/html/news/dongtai/">{{.i18n.Tr "custom.head.community_infos"}}</a>
</div>
</div>
<a class="item" href="{{AppSubUrl}}/explore/repos">项目</a>
<a class="item" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "custom.head.project"}}</a>
<div class="ui dropdown item">
{{.i18n.Tr "explore"}}
<i class="dropdown icon"></i>
<div class="menu">
<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">更多开源项目</a>
<a class="item" href="https://openi.org.cn/welcome/shixuns" target="_blank">学习</a>
<a class="item" href="http://club.openi.org.cn/portal.php?mod=list&amp;catid=4" target="_blank">活动</a>
<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "custom.head.project"}}</a>
<a class="item" href="{{AppSubUrl}}/datasets">{{.i18n.Tr "datasets"}}</a>
<a class="item" href="javascript:alert('WIP')" target="_blank">{{.i18n.Tr "custom.head.project"}}</a>
<a class="item" href="javascript:alert('WIP')" target="_blank">{{.i18n.Tr "custom.head.activity"}}</a>
</div>
</div>
{{else if .IsLandingPageExplore}}


+ 2
- 2
custom/templates/datasets/dataset_list.tmpl View File

@@ -28,8 +28,8 @@
{{.Title}}
</a>
<div class="ui right metas">
<span class="text grey">{{svg "octicon-tasklist" 16}} {{.Task}}</span>
<span class="text grey">{{svg "octicon-tag" 16}}{{.Category}}</span>
<span class="text grey">{{svg "octicon-tasklist" 16}} {{$.i18n.Tr (printf "dataset.task.%s" .Task)}}</span>
<span class="text grey">{{svg "octicon-tag" 16}}{{$.i18n.Tr (printf "dataset.category.%s" .Category)}}</span>
{{if ne .DownloadTimes 0}}
<span class="text grey">{{svg "octicon-flame" 16}} {{.DownloadTimes}}</span>
{{end}}


+ 1
- 1
custom/templates/user/auth/signin_inner.tmpl View File

@@ -11,7 +11,7 @@
<div class="ui centered grid">
<div class="sixteen wide mobile ten wide tablet ten wide computer column">
<div class="ui bottom aligned two column grid">
<div class="column">
<div class="column">
<h2 class="ui header">
{{if .LinkAccountMode}}
{{.i18n.Tr "auth.oauth_signin_title"}}


+ 12
- 0
modules/templates/helper.go View File

@@ -301,6 +301,8 @@ func NewFuncMap() []template.FuncMap {
"svg": func(icon string, size int) template.HTML {
return template.HTML(fmt.Sprintf(`<svg class="svg %s" width="%d" height="%d" aria-hidden="true"><use xlink:href="#%s" /></svg>`, icon, size, size, icon))
},
"tasks": tasks,
"categories": categories,
}}
}

@@ -721,3 +723,13 @@ func buildSubjectBodyTemplate(stpl *texttmpl.Template, btpl *template.Template,
log.Warn("Failed to parse template [%s/body]: %v", name, err)
}
}

// Dataset categories
func categories() []string {
return []string{"computer_vision", "natural_language_processing", "speech_processing", "computer_vision_natural_language_processing"}
}

// Dataset tasks
func tasks() []string {
return []string{"machine_translation", "question_answering_system", "information_retrieval", "knowledge_graph", "text_annotation", "text_categorization", "emotion_analysis", "language_modeling", "speech_recognition", "automatic_digest", "information_extraction", "description_generation", "image_classification", "face_recognition", "image_search", "target_detection", "image_description_generation", "vehicle_license_plate_recognition", "medical_image_analysis", "unmanned", "unmanned_security", "drone", "vr_ar", "2_d_vision", "2.5_d_vision", "3_d_reconstruction", "image_processing", "video_processing", "visual_input_system", "speech_coding", "speech_enhancement", "speech_recognition", "speech_synthesis"}
}

+ 57
- 0
options/locale/locale_en-US.ini View File

@@ -651,6 +651,43 @@ settings.delete_notices_1= - This operation <strong>CANNOT</strong> be undone.
settings.delete_notices_2= - This operation will permanently delete the <strong>%s</strong> dataset.
settings.delete_notices_fork_1= - Forks of this dataset will become independent after deletion.
settings.deletion_success= The dataset has been deleted.
task.machine_translation= machine translation
task.question_answering_system= question answering system
task.information_retrieval= information retrieval
task.knowledge_graph= knowledge graph
task.text_annotation= text annotation
task.text_categorization= text categorization
task.emotion_analysis= emotion analysis
task.language_modeling= language modeling
task.speech_recognition= speech recognition
task.automatic_digest= automatic digest
task.information_extraction= information extraction
task.description_generation= description generation
task.image_classification= image classification
task.face_recognition= face recognition
task.image_search= image search
task.target_detection= target detection
task.image_description_generation= image description generation
task.vehicle_license_plate_recognition= vehicle license plate recognition
task.medical_image_analysis= medical image analysis
task.unmanned= unmanned
task.unmanned_security= unmanned security
task.drone= drone
task.vr_ar= VR/AR
task.2_d_vision= 2.D vision
task.2.5_d_vision= 2.5D vision
task.3_d_reconstruction= 3Dreconstruction
task.image_processing= image processing
task.video_processing= video processing
task.visual_input_system= visual input system
task.speech_coding= speech coding
task.speech_enhancement= speech enhancement
task.speech_recognition= speech recognition
task.speech_synthesis= speech synthesis
category.computer_vision= computer vision
category.natural_language_processing= natural language processing
category.speech_processing= speech processing
category.computer_vision_natural_language_processing= computer vision and natural language processing

[repo]
owner = Owner
@@ -2402,3 +2439,23 @@ error.probable_bad_default_signature = "WARNING! Although the default key has th
[units]
error.no_unit_allowed_repo = You are not allowed to access any section of this repository.
error.unit_not_allowed = You are not allowed to access this repository section.

[custom]
head.community= Community
head.welcome= Welcome to OpenI
head.about_org= About orgnation
head.license= OpenI open source license
head.community_charter= OpenI Community Charter
head.community_infos= Community News
head.project= Project
head.study= Study
head.activity= Activity
foot.council= Council
foot.technical_committee= Technical Committee
foot.join= Join OpenI
foot.news= News
foot.community_news= Community News
foot.member_news= Member news
foot.industry_advisory= Industry Advisory
foot.help= help
foot.copyright= Copyright: New Generation Artificial Intelligence Open Source Open Platform (OpenI)

+ 58
- 0
options/locale/locale_zh-CN.ini View File

@@ -651,6 +651,43 @@ settings.delete_notices_1=- 此操作 <strong>不可以</strong> 被回滚。
settings.delete_notices_2=- 此操作将永久删除据集 <strong>%s</strong>。
settings.delete_notices_fork_1=- 在此仓库删除后,它的派生据集将变成独立据集。
settings.deletion_success=据集已被删除。
task.machine_translation=机器翻译
task.question_answering_system=问答系统
task.information_retrieval=信息检索
task.knowledge_graph=知识图谱
task.text_annotation=文本标注
task.text_categorization=文本分类
task.emotion_analysis=情感分析
task.language_modeling=语言建模
task.speech_recognition=语音识别
task.automatic_digest=自动文摘
task.information_extraction=信息抽取
task.description_generation=说明生成
task.image_classification=图像分类
task.face_recognition=人脸识别
task.image_search=图像搜索
task.target_detection=目标检测
task.image_description_generation=图像描述生成
task.vehicle_license_plate_recognition=车辆车牌识别
task.medical_image_analysis=医学图像分析
task.unmanned=无人驾驶
task.unmanned_security=无人安防
task.drone=无人机
task.vr_ar=VR/AR
task.2_d_vision=2-D视觉
task.2.5_d_vision=2.5-D视觉
task.3_d_reconstruction=3D重构
task.image_processing=图像处理
task.video_processing=视频处理
task.visual_input_system=视觉输入系统
task.speech_coding=语音编码
task.speech_enhancement=语音增强
task.speech_recognition=语音识别
task.speech_synthesis=语音合成
category.computer_vision=计算机视觉
category.natural_language_processing=自然语言处理
category.speech_processing=语音处理
category.computer_vision_natural_language_processing=计算机视觉、自然语言处理

[repo]
owner=拥有者
@@ -2403,3 +2440,24 @@ error.probable_bad_default_signature=警告!虽然默认密钥拥有此ID,
error.no_unit_allowed_repo=您没有被允许访问此仓库的任何单元。
error.unit_not_allowed=您没有权限访问此仓库单元

[custom]
head.community=社区
head.welcome=欢迎加入启智
head.about_org=关于组织架构
head.license=启智开源许可证
head.community_charter=启智社区章程
head.community_infos=社区动态
head.project=项目
head.study=学些
head.activity=活动
foot.council=理事会
foot.technical_committee=技术委员会
foot.join=加入启智
foot.news=动态
foot.community_news=社区动态
foot.member_news=成员动态
foot.industry_advisory=行业咨询
foot.help=帮助
foot.copyright= 版权所有:新一代人工智能开源开放平台(OpenI)



+ 1
- 1
templates/datasets/create.tmpl View File

@@ -8,7 +8,7 @@
{{if .PageIsEditDataset}}
{{.i18n.Tr "dataset.edit_dataset"}}
{{else}}
{{.i18n.Tr "dataset.new_dataset"}}
{{.i18n.Tr "new_dataset"}}
{{end}}
</h3>
<div class="ui attached segment">


+ 2
- 2
templates/datasets/dataset_list.tmpl View File

@@ -6,8 +6,8 @@
{{.Title}}
</a>
<div class="ui right metas">
<span class="text grey">{{svg "octicon-tasklist" 16}} {{.Task}}</span>
<span class="text grey">{{svg "octicon-tag" 16}}{{.Category}}</span>
<span class="text grey">{{svg "octicon-tasklist" 16}}{{$.i18n.Tr (printf "dataset.task.%s" .Task)}}</span>
<span class="text grey">{{svg "octicon-tag" 16}}{{$.i18n.Tr (printf "dataset.category.%s" .Category)}}</span>
<span class="text grey">{{svg "octicon-flame" 16}} 24</span>
</div>
</div>


+ 12
- 21
templates/datasets/form.tmpl View File

@@ -30,15 +30,12 @@
<i class="dropdown icon"></i>
<div class="default text" style="min-width:20vw">{{.i18n.Tr "dataset.category"}}</div>
<div class="menu">
<div class="item" data-value="计算机视觉、自然语言处理">
计算机视觉、自然语言处理
</div>
<div class="item" data-value="计算机视觉">
计算机视觉
</div>
<div class="item" data-value="深度学习">
深度学习
</div>
{{$categories := categories}}
{{range $category := $categories}}
<div class="item" data-value="{{$category}}">
{{$.i18n.Tr (printf "dataset.category.%s" $category)}}
</div>
{{end}}
</div>
</div>
</div>
@@ -50,18 +47,12 @@
<div class="default text" style="min-width:20vw">{{.i18n.Tr "dataset.task"}}</div>
<i class="dropdown icon"></i>
<div class="menu">
<div class="item" data-value="遥感图像理解">
遥感图像理解
</div>
<div class="item" data-value="语音识别">
语音识别
</div>
<div class="item" data-value="智能问答">
智能问答
</div>
<div class="item" data-value="文本分类">
文本分类
</div>
{{$tasks := tasks}}
{{range $task := $tasks}}
<div class="item" data-value="{{$task}}">
{{$.i18n.Tr (printf "dataset.task.%s" $task)}}
</div>
{{end}}
</div>
</div>
</div>


+ 2
- 2
templates/datasets/show.tmpl View File

@@ -21,13 +21,13 @@
<span class="ui green label">{{$.i18n.Tr "dataset.private"}}</span>
{{end}}
<span class="tag text blue">
<a href=""><i class="tag icon"></i> {{.dataset.Category}}</a>
<a href=""><i class="tag icon"></i> {{$.i18n.Tr (printf "dataset.task.%s" .dataset.Task)}}</a>
</span>
<span class="tag text blue">
<a href=""><i class="tag icon"></i> {{.dataset.License}}</a>
</span>
<span class="tag text blue">
<a href=""><i class="tag icon"></i> {{.dataset.Task}}</a>
<a href=""><i class="tag icon"></i> {{$.i18n.Tr (printf "dataset.category.%s" .dataset.Category)}}</a>
</span>
</div>
<div class="ui twelve wide column detail">


Loading…
Cancel
Save