Skip to content

汉化 #11300

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

Closed
fsz65 wants to merge 4 commits into from
Closed

汉化 #11300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1518755
汉化
fsz65 Apr 18, 2017
56182cd
时间段选择汉化
fsz65 Apr 18, 2017
cd3be85
自动刷新时间配置汉化
fsz65 Apr 18, 2017
7a1513a
set to now汉化
fsz65 Apr 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions src/ui/public/timepicker/quick_ranges.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,37 @@ define(function (require) {
let module = require('ui/modules').get('kibana');

module.constant('quickRanges', [
{ from: 'now/d', to: 'now/d', display: 'Today', section: 0 },
{ from: 'now/w', to: 'now/w', display: 'This week', section: 0 },
{ from: 'now/M', to: 'now/M', display: 'This month', section: 0 },
{ from: 'now/y', to: 'now/y', display: 'This year', section: 0 },
{ from: 'now/d', to: 'now', display: 'The day so far', section: 0 },
{ from: 'now/w', to: 'now', display: 'Week to date', section: 0 },
{ from: 'now/M', to: 'now', display: 'Month to date', section: 0 },
{ from: 'now/y', to: 'now', display: 'Year to date', section: 0 },
{ from: 'now/d', to: 'now/d', display: '今日', section: 0 },
{ from: 'now/w', to: 'now/w', display: '本周', section: 0 },
{ from: 'now/M', to: 'now/M', display: '本月', section: 0 },
//{ from: 'now/y', to: 'now/y', display: 'This year', section: 0 },
{ from: 'now/d', to: 'now', display: '今日(截止当前)', section: 0 },
{ from: 'now/w', to: 'now', display: '本周(截止当前)', section: 0 },
{ from: 'now/M', to: 'now', display: '本月(截止当前)', section: 0 },
//{ from: 'now/y', to: 'now', display: 'Year to date', section: 0 },

{ from: 'now-1d/d', to: 'now-1d/d', display: 'Yesterday', section: 1 },
{ from: 'now-2d/d', to: 'now-2d/d', display: 'Day before yesterday', section: 1 },
{ from: 'now-7d/d', to: 'now-7d/d', display: 'This day last week', section: 1 },
{ from: 'now-1w/w', to: 'now-1w/w', display: 'Previous week', section: 1 },
{ from: 'now-1M/M', to: 'now-1M/M', display: 'Previous month', section: 1 },
{ from: 'now-1y/y', to: 'now-1y/y', display: 'Previous year', section: 1 },
{ from: 'now-1d/d', to: 'now-1d/d', display: '昨日', section: 1 },
{ from: 'now-2d/d', to: 'now-2d/d', display: '前日', section: 1 },
{ from: 'now-7d/d', to: 'now-7d/d', display: '上周今日', section: 1 },
{ from: 'now-1w/w', to: 'now-1w/w', display: '上周', section: 1 },
// { from: 'now-1M/M', to: 'now-1M/M', display: 'Previous month', section: 1 },
// { from: 'now-1y/y', to: 'now-1y/y', display: 'Previous year', section: 1 },

{ from: 'now-15m', to: 'now', display: 'Last 15 minutes', section: 2 },
{ from: 'now-30m', to: 'now', display: 'Last 30 minutes', section: 2 },
{ from: 'now-1h', to: 'now', display: 'Last 1 hour', section: 2 },
{ from: 'now-4h', to: 'now', display: 'Last 4 hours', section: 2 },
{ from: 'now-12h', to: 'now', display: 'Last 12 hours', section: 2 },
{ from: 'now-24h', to: 'now', display: 'Last 24 hours', section: 2 },
{ from: 'now-7d', to: 'now', display: 'Last 7 days', section: 2 },
{ from: 'now-15m', to: 'now', display: '最近15分钟', section: 2 },
{ from: 'now-30m', to: 'now', display: '最近30分钟', section: 2 },
{ from: 'now-1h', to: 'now', display: '最近1小时', section: 2 },
{ from: 'now-4h', to: 'now', display: '最近4小时', section: 2 },
{ from: 'now-12h', to: 'now', display: '最近12小时', section: 2 },
{ from: 'now-24h', to: 'now', display: '最近24小时', section: 2 },
{ from: 'now-7d', to: 'now', display: '最近7天', section: 2 },

{ from: 'now-30d', to: 'now', display: 'Last 30 days', section: 3 },
/* { from: 'now-30d', to: 'now', display: 'Last 30 days', section: 3 },
{ from: 'now-60d', to: 'now', display: 'Last 60 days', section: 3 },
{ from: 'now-90d', to: 'now', display: 'Last 90 days', section: 3 },
{ from: 'now-6M', to: 'now', display: 'Last 6 months', section: 3 },
{ from: 'now-1y', to: 'now', display: 'Last 1 year', section: 3 },
{ from: 'now-2y', to: 'now', display: 'Last 2 years', section: 3 },
{ from: 'now-5y', to: 'now', display: 'Last 5 years', section: 3 },
{ from: 'now-5y', to: 'now', display: 'Last 5 years', section: 3 },*/

]);

Expand Down
24 changes: 12 additions & 12 deletions src/ui/public/timepicker/refresh_intervals.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ define(function (require) {
module.constant('refreshIntervals', [
{ value : 0, display: 'Off', section: 0},

{ value : 5000, display: '5 seconds', section: 1},
{ value : 10000, display: '10 seconds', section: 1},
{ value : 30000, display: '30 seconds', section: 1},
{ value : 45000, display: '45 seconds', section: 1},
// { value : 5000, display: '5 seconds', section: 1},
{ value : 10000, display: '10秒钟', section: 1},
{ value : 30000, display: '30秒钟', section: 1},
{ value : 45000, display: '45秒钟', section: 1},

{ value : 60000, display: '1 minute', section: 2},
{ value : 300000, display: '5 minutes', section: 2},
{ value : 900000, display: '15 minutes', section: 2},
{ value : 1800000, display: '30 minutes', section: 2},
{ value : 60000, display: '1分钟', section: 2},
{ value : 300000, display: '5分钟', section: 2},
{ value : 900000, display: '15分钟', section: 2},
{ value : 1800000, display: '30分钟', section: 2},

{ value : 3600000, display: '1 hour', section: 3},
{ value : 7200000, display: '2 hour', section: 3},
{ value : 43200000, display: '12 hour', section: 3},
{ value : 86400000, display: '1 day', section: 3}
{ value : 3600000, display: '1小时', section: 3},
{ value : 7200000, display: '2小时', section: 3},
{ value : 43200000, display: '12小时', section: 3},
{ value : 86400000, display: '1天', section: 3}
]);

});
8 changes: 4 additions & 4 deletions src/ui/public/timepicker/timepicker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
<div class="col-md-2">
<ul class="nav nav-pills nav-stacked kbn-timepicker-modes">
<li ng-class="{active: mode === 'quick' }">
<a ng-click="setMode('quick')">quick</a>
<a ng-click="setMode('quick')">快速设置时间</a>
</li>
<li ng-class="{active: mode === 'relative' }">
<a ng-click="setMode('relative')">relative</a>
<a ng-click="setMode('relative')">相对时间</a>
</li>
<li ng-class="{active: mode === 'absolute' }">
<a ng-click="setMode('absolute')">absolute</a>
<a ng-click="setMode('absolute')">用户自定义时间</a>
</li>
</ul>
</div>
Expand Down Expand Up @@ -131,7 +131,7 @@
<div class="kbn-timepicker-section">
<div>
<label class="small">To:
<a class="label label-default" ng-click="setToNow()">Set To Now</a>
<a class="label label-default" ng-click="setToNow()">设置为当前时间</a>
</label>
<span ng-show="!absolute.to"><i>Invalid Date</i></span>
<input type="text" required class="form-control" input-datetime="{{format}}" ng-model="absolute.to">
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/timepicker/toggle.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
class="to-body">

<a ng-click="pickerTemplate.toggle('interval')" class="navbar-timepicker-auto-refresh-desc">
<span ng-show="timefilter.refreshInterval.value === 0"><i class="fa fa-repeat"></i> Auto-refresh</span>
<span ng-show="timefilter.refreshInterval.value === 0"><i class="fa fa-repeat"></i> 自动刷新</span>
<span ng-show="timefilter.refreshInterval.value > 0">{{timefilter.refreshInterval.display}}</span>
</a>

Expand Down