Merge pull request #172 from edwardmeng/master

 Add more date time format localization and translations.

Author: niemyjski

src/app/event/tabs/overview.tpl.html

@@ -7,7 +7,7 @@
     <th>{{::'Duration' | translate}}</th>
     <td>
       <span ng-if="!vm.event.data.sessionend" class="glyphicon glyphicon-one-fine-dot glyphicon-green" title="{{::'Online' | translate}}"></span>
-      <abbr title="{{::'Seconds' | translate:{duration : vm.getDuration()}}}"><duration value="vm.getDuration()"></duration></abbr>
+      <abbr title="{{::'Seconds' | translate:{duration : vm.getDuration()} }}"><duration value="vm.getDuration()"></duration></abbr>
       <span ng-if="vm.event.data.sessionend">
         ({{::'ended' | translate}} <timeago date="vm.event.data.sessionend"></timeago>)
       </span>

src/app/event/tabs/session.tpl.html

@@ -17,7 +17,7 @@ <h4><a ng-click="appVm.changePlan(vm.project.organization_id)">{{vm.project.orga
       <th>{{::'Duration' | translate}}</th>
       <td>
         <span ng-if="!vm.event.data.sessionend" class="glyphicon glyphicon-one-fine-dot glyphicon-green" title="{{::'Online' | translate}}"></span>
-        <abbr title="{{::'Seconds' | translate:{duration : vm.getDuration()}}}"><duration value="vm.getDuration()"></duration></abbr>
+        <abbr title="{{::'Seconds' | translate:{duration : vm.getDuration()} }}"><duration value="vm.getDuration()"></duration></abbr>
         <span ng-if="vm.event.data.sessionend">
           ({{::'ended' | translate}} <timeago date="vm.event.data.sessionend"></timeago>)
         </span>

src/app/organization/manage/invoices-directive.tpl.html

@@ -11,7 +11,7 @@
     <tbody>
     <tr ng-repeat="invoice in vm.invoices track by invoice.id">
       <td class="row-clickable" ng-click="vm.open(invoice.id)">{{invoice.id}}</td>
-      <td class="row-clickable" ng-click="vm.open(invoice.id)">{{invoice.date | date: 'medium'}}</td>
+      <td class="row-clickable" ng-click="vm.open(invoice.id)">{{'DateTime' | translate : invoice }}</td>
       <td class="row-clickable" ng-click="vm.open(invoice.id)">{{invoice.paid ? 'Paid' : 'Unpaid'}}</td>
       <td>
         <div class="btn-group">

src/app/session/sessions-directive.tpl.html

@@ -15,7 +15,7 @@
             <summary source="event" show-type="vm.showType"></summary>
           </div>
         </td>
-        <td ng-click="vm.open(event.id, $event)"><abbr title="{{::event.date | date : 'medium'}}">
+        <td ng-click="vm.open(event.id, $event)"><abbr title="{{::'DateTime' | translate : event }}">
           <timeago date="event.date"></timeago>
         </abbr></td>
         <td ng-click="vm.open(event.id, $event)"><abbr title="{{vm.getDuration(event)}} seconds">

src/app/stack/stack-controller.js

@@ -537,8 +537,8 @@
 
         vm.chartOptions = [
           {name: translateService.T('Occurrences'), field: 'sum:count~1', title: '', selected: true, render: false},
-          {name: translateService.T('Average Value'), field: 'avg:value', title: translateService.T('The average of all event values'), render: true},
-          {name: translateService.T('Value Sum'), field: 'sum:value', title: translateService.T('The sum of all event values'), render: true}
+          {name: translateService.T('Average Value'), field: 'avg:value', title: translateService.T('The average of all event values'), render: true, menuName: translateService.T('Show Average Value')},
+          {name: translateService.T('Value Sum'), field: 'sum:value', title: translateService.T('The sum of all event values'), render: true, menuName: translateService.T('Show Value Sum')}
         ];
 
         vm.canRefresh = canRefresh;

src/app/stack/stack.tpl.html

@@ -76,7 +76,7 @@
         {{::'Stack' | translate}}
         <span class="labels">
           <span class="label label-success" ng-if="vm.stack.date_fixed && !vm.stack.is_regressed">
-              <span class="hidden-xs">FIXED<span ng-if="vm.stack.fixed_in_version"> IN {{vm.stack.fixed_in_version}}</span></span>
+              <span class="hidden-xs">{{vm.stack.fixed_in_version ? 'Fixed_With_Version' : 'Fixed' | translate : vm.stack}}</span>
               <span class="visible-xs">F</span>
           </span>
           <span class="label label-success" ng-if="vm.stack.is_regressed">
@@ -129,7 +129,7 @@
             </tr>
             <tr ng-if="(vm.stack.date_fixed && !vm.stack.is_regressed)">
               <th>{{::'Date Fixed' | translate}}</th>
-              <td><span>{{vm.stack.date_fixed | date: 'medium'}}</span></td>
+              <td><span>{{'DateTime' | translate : {'date' : vm.stack.date_fixed} }}</span></td>
             </tr>
             <tr ng-if="vm.stack.description">
               <th>{{::'Description' | translate}}</th>
@@ -177,7 +177,7 @@ <h4>{{::'Stacking Information' | translate}}</h4>
             </button>
             <ul class="dropdown-menu dropdown-menu-right" role="menu">
               <li ng-repeat="o in vm.chartOptions | filter: { render: true } track by o.field">
-                <a ng-click="o.selected = !o.selected; vm.updateStats();" title="{{::o.title}}"><i class="fa fa-fw" ng-class="{'fa-check': !!o.selected}" ng-if="vm.hasSelectedChartOption()"></i>{{::'Show '+o.name | translate}}</a>
+                <a ng-click="o.selected = !o.selected; vm.updateStats();" title="{{::o.title}}"><i class="fa fa-fw" ng-class="{'fa-check': !!o.selected}" ng-if="vm.hasSelectedChartOption()"></i>{{::o.menuName}}</a>
               </li>
             </ul>
           </div>

src/components/date-filter/date-filter-directive.js

@@ -8,7 +8,7 @@
         replace: true,
         scope: true,
         templateUrl: 'components/date-filter/date-filter-directive.tpl.html',
-        controller: function ($interval, $scope, dialogs, filterService) {
+        controller: function ($interval, $scope, dialogs, filterService, translateService) {
           var vm = this;
           function getFilteredDisplayName() {
             var time = filterService.getTime();
@@ -34,7 +34,7 @@
 
             var range = dateRangeParserService.parse(time);
             if (range && range.start && range.end) {
-              return moment(range.start).twix(moment(range.end)).format();
+              return moment(range.start).twix(moment(range.end)).format({dayFormat:translateService.T('DayFormat')});
             }
 
             setFilter('last week');

src/components/events/events-directive.tpl.html

@@ -29,7 +29,7 @@
         <td ng-click="vm.open(event.id, $event)">
           <span ng-if="vm.hideSessionStartTime && event.data.Type === 'session'">--</span>
           <span ng-if="!vm.hideSessionStartTime || event.data.Type !== 'session'">
-            <abbr title="{{::event.date | date : 'medium'}}">
+            <abbr title="{{::'DateTime' | translate:event}}">
                 <span ng-if="vm.relativeTo()">after <relative-time to="vm.relativeTo()" date="event.date"></relative-time></span>
                 <span ng-if="!vm.relativeTo()"><timeago date="event.date"></timeago></span>
             </abbr>

src/components/organization-notifications/organization-notifications-directive.tpl.html

@@ -24,7 +24,7 @@ <h4>{{::"We haven't received any data!" | translate}}</h4>
       <p>
         Please configure your clients for
         <strong ng-repeat="project in vm.projectsRequiringConfiguration">
-          <span ng-if="!$first">, </span><a ui-sref="app.project.configure({ id: project.id, redirect: true })" title="{{::'Configure_Project_Title' | translate:{projectName: project.name, organizationName: project.organization_name}}}">{{project.name}}</a>
+          <span ng-if="!$first">, </span><a ui-sref="app.project.configure({ id: project.id, redirect: true })" title="{{::'Configure_Project_Title' | translate:{projectName: project.name, organizationName: project.organization_name} }}">{{project.name}}</a>
         </strong>
         projects and start becoming exceptionless in less than 60 seconds!
       </p>

src/components/stacks/stacks-directive.tpl.html

@@ -27,11 +27,11 @@
       </td>
       <td ng-click="vm.open(stack.id, $event)" class="number">{{stack.total | number:0}}</td>
       <td ng-click="vm.open(stack.id, $event)" class="hidden-xs">
-        <abbr title="{{::stack.first_occurrence | date : 'medium'}}">
+        <abbr title="{{::'DateTime' | translate : {'date' : stack.first_occurrence} }}">
           <timeago date="stack.first_occurrence"></timeago>
         </abbr>
       </td>
-      <td ng-click="vm.open(stack.id, $event)" class="hidden-xs"><abbr title="{{::stack.last_occurrence | date : 'medium'}}">
+      <td ng-click="vm.open(stack.id, $event)" class="hidden-xs"><abbr title="{{::'DateTime' | translate : {'date' : stack.last_occurrence} }}">
         <timeago date="stack.last_occurrence"></timeago>
       </abbr></td>
     </tr>

src/lang/en-us.json

@@ -131,6 +131,8 @@
   "Used to promote stacks to external systems.":"Used to promote stacks to external systems.",
   "Add a reference link to an external resource.":"Add a reference link to an external resource.",
   "Delete this stack":"Delete this stack",
+  "Fixed_With_Version":"FIXED IN {{fixed_in_version}}",
+  "Fixed" : "FIXED",
 
   "Summary":"Summary",
   "Created":"Created",
@@ -282,6 +284,7 @@
   "Custom": "Custom",
   "Select Date Range": "Select Date Range",
 
+  "DayFormat":"D",
   "DateFormat":"ddd, MMM D, YYYY",
   "DateTimeFormat":"ddd, MMM D, YYYY h:mma",
   "Filter": "Filter",

src/lang/zh-cn.json

@@ -94,7 +94,9 @@
     "Method":"方法",
     "Chart Options":"图表选项",
     "Show Average Value":"显示平均值",
-    "Show Value Sum":"显示求和值",
+    "Average Value":"平均值",
+    "Show Value Sum":"显示合计值",
+    "Value Sum":"合计值",
     "Recent Occurrences":"最近发生",
     "Reference Links":"参考链接",
     "Mark Fixed": "标记已修复",
@@ -131,6 +133,8 @@
     "Used to promote stacks to external systems.":"用于将堆栈推送到外部系统。",
     "Add a reference link to an external resource.":"为外部资源增加引用链接。",
     "Delete this stack":"删除堆栈",
+    "Fixed_With_Version":"在 {{fixed_in_version}} 版本中修复",
+    "Fixed" : "已修复",
 
     "Summary":"概要",
     "Created":"已创建",
@@ -281,8 +285,10 @@
     "All Time": "全部时间",
     "Custom": "自定义",
     "Select Date Range": "选择日期范围",
-    "DateFormat": "YYYY-MM-DD",
-    "DateTimeFormat": "YYYY-MM-DD HH:mm:ss",
+
+    "DayFormat":"D日",
+    "DateFormat": "YYYY年M月D日",
+    "DateTimeFormat": "YYYY年M月D日 H:mm:ss",
     "Filter": "过滤条件",
     "Search Documentation": "说明文档",
 
@@ -607,7 +613,7 @@
     "Delete":"删除",
     "Cancel":"取消",
     "Apply":"确认",
-    "DateTime":"{{date | date: 'yyyy-MM-dd HH:mm:ss'}}",
+    "DateTime":"{{date | date: 'yyyy年M月d日 H:mm:ss'}}",
     "Go To Dashboard":"前往概览视图",
     "Save":"保存",
     "Edit":"修改",
@@ -643,8 +649,6 @@
     "Limit":"上限量",
     "Allowed in Organization":"组织容许量",
     "Occurrences":"数量",
-    "Average Value":"平均值",
-    "Value Sum":"合计",
     "Log source":"日志来源",
     "Add":"新增",
     "Total":"总计",