summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorLarry Li <larryli@qq.com>2016-03-28 12:39:17 +0800
committerLarry Li <larryli@qq.com>2016-03-28 12:39:17 +0800
commit44d920605c4d857d4e494e818042a0251e9ee203 (patch)
treed672721562140801486f6a0641e1eee32088a918 /app/assets
parentb0a44cb0c867b2eec84ba8bb4ac303d829848195 (diff)
downloadgitlab-ce-8.6.0.zh1.tar.gz
完成 8.6 分支初步翻译v8.6.0.zh1
Signed-off-by: Larry Li <larryli@qq.com>
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/calendar.js.coffee7
-rw-r--r--app/assets/javascripts/star.js.coffee6
-rw-r--r--app/assets/stylesheets/pages/ui_dev_kit.scss2
3 files changed, 9 insertions, 6 deletions
diff --git a/app/assets/javascripts/calendar.js.coffee b/app/assets/javascripts/calendar.js.coffee
index d80e0e716ce..70e921be69a 100644
--- a/app/assets/javascripts/calendar.js.coffee
+++ b/app/assets/javascripts/calendar.js.coffee
@@ -2,10 +2,13 @@ class @Calendar
constructor: (timestamps, starting_year, starting_month, calendar_activities_path) ->
cal = new CalHeatMap()
cal.init
- itemName: ["contribution"]
+ itemName: ["次贡献", "次贡献"]
data: timestamps
start: new Date(starting_year, starting_month)
- domainLabelFormat: "%b"
+ domainLabelFormat: "%-m 月"
+ subDomainDateFormat: "%Y-%m-%d"
+ subDomainTitleFormat:
+ filled: "{date}:{count} {name}"
id: "cal-heatmap"
domain: "month"
subDomain: "day"
diff --git a/app/assets/javascripts/star.js.coffee b/app/assets/javascripts/star.js.coffee
index f27780dda93..7335d90d172 100644
--- a/app/assets/javascripts/star.js.coffee
+++ b/app/assets/javascripts/star.js.coffee
@@ -8,15 +8,15 @@ class @Star
toggleStar = (isStarred) ->
$this.parent().find('.star-count').text data.star_count
if isStarred
- $starSpan.removeClass('starred').text 'Star'
+ $starSpan.removeClass('starred').text '星标'
$starIcon.removeClass('fa-star').addClass 'fa-star-o'
else
- $starSpan.addClass('starred').text 'Unstar'
+ $starSpan.addClass('starred').text '取消星标'
$starIcon.removeClass('fa-star-o').addClass 'fa-star'
return
toggleStar $starSpan.hasClass('starred')
return
).on 'ajax:error', (e, xhr, status, error) ->
- new Flash('Star toggle failed. Try again later.', 'alert')
+ new Flash('星标切换失败,请稍后重试。', 'alert')
return
diff --git a/app/assets/stylesheets/pages/ui_dev_kit.scss b/app/assets/stylesheets/pages/ui_dev_kit.scss
index 587bd6a1e8a..95cd923293f 100644
--- a/app/assets/stylesheets/pages/ui_dev_kit.scss
+++ b/app/assets/stylesheets/pages/ui_dev_kit.scss
@@ -6,7 +6,7 @@
.example {
&:before {
- content: "Example";
+ content: "示例";
color: #bbb;
}