Merge pull request #11103 from piwik/3.x-dev3.0.1-b1

Release Piwik 3.0.1-b1

4 files changed, 35 insertions, 8 deletions

diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index 112a3221d7..f50e495537 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -306,6 +306,7 @@ class Visitor implements VisitorInterface
                     $actionDetail['eventValue'] = round($actionDetail['custom_float'], self::EVENT_VALUE_PRECISION);
                 }
             } elseif ($actionDetail['custom_float'] > 0) {
+                $actionDetail['generationTimeMilliseconds'] = $actionDetail['custom_float'];
                 $actionDetail['generationTime'] = $formatter->getPrettyTimeFromSeconds($actionDetail['custom_float'] / 1000, true);
             }
             unset($actionDetail['custom_float']);
diff --git a/plugins/Live/VisitorProfile.php b/plugins/Live/VisitorProfile.php
index b92ead75e6..181c8bb302 100644
--- a/plugins/Live/VisitorProfile.php
+++ b/plugins/Live/VisitorProfile.php
@@ -355,14 +355,14 @@ class VisitorProfile
     {
         if ($this->profile['totalPageViewsWithTiming']) {
             $this->profile['averagePageGenerationTime'] =
-                round($this->pageGenerationTimeTotal / $this->profile['totalPageViewsWithTiming'], $precision = 2);
+                round($this->pageGenerationTimeTotal / (1000 * $this->profile['totalPageViewsWithTiming']), $precision = 3);
         }
     }
 
     private function handleIfPageGenerationTime($action)
     {
-        if (isset($action['generationTime'])) {
-            $this->pageGenerationTimeTotal += $action['generationTime'];
+        if (isset($action['generationTimeMilliseconds'])) {
+            $this->pageGenerationTimeTotal += $action['generationTimeMilliseconds'];
             ++$this->profile['totalPageViewsWithTiming'];
         }
     }
diff --git a/plugins/Live/lang/ja.json b/plugins/Live/lang/ja.json
index 8e15f18ee8..d00df2fa51 100644
--- a/plugins/Live/lang/ja.json
+++ b/plugins/Live/lang/ja.json
@@ -4,6 +4,7 @@
         "CalculatedOverNPageViews": "このビジターの最終 %1$s ページビューを利用して計算",
         "ClickToViewMoreAboutVisit": "この訪問に関する詳細情報を見るには、クリックしてください。",
         "ConvertedNGoals": "変換された %s 目標",
+        "EcommerceSummaryConversions": "%1$s 件の注文%2$s は合計 %3$s%4$s 件、%5$s 件の商品%6$s を購入しました。",
         "FirstVisit": "最初の訪問",
         "GoalType": "タイプ",
         "HideMap": "隠れたマップ",
diff --git a/plugins/Live/lang/zh-tw.json b/plugins/Live/lang/zh-tw.json
index 6cce2d6c2e..2d6f449860 100644
--- a/plugins/Live/lang/zh-tw.json
+++ b/plugins/Live/lang/zh-tw.json
@@ -1,11 +1,36 @@
 {
     "Live": {
-        "LastHours": "最近 %s 小時內",
-        "LastMinutes": "最近 %s 分鐘內",
+        "AveragePageGenerationTime": "這個使用者平均花費 %1$s 載入網頁。",
+        "CalculatedOverNPageViews": "以這個訪客過去 %1$s 次頁面訪問來計算。",
+        "ClickToViewMoreAboutVisit": "點擊以查看這個訪問紀錄的詳細資訊",
+        "ConvertedNGoals": "轉換了 %s 個目標",
+        "FirstVisit": "首次訪問",
+        "GoalType": "類型",
+        "HideMap": "隱藏地圖",
+        "LastHours": "最近 %s 小時",
+        "LastMinutes": "最近 %s 分鐘",
+        "LastVisit": "最後訪問",
         "LinkVisitorLog": "查看詳細的訪客記錄",
-        "Referrer_URL": "推薦連結",
+        "LoadMoreVisits": "載入更多訪客",
+        "MorePagesNotDisplayed": "更多此訪客的到達頁面未顯示",
+        "NbVisitor": "1 位訪客",
+        "NbVisitors": "%s 位訪客",
+        "NextVisitor": "下一位訪客",
+        "NoMoreVisits": "這個訪客沒有更多訪問紀錄了。",
+        "PreviousVisitor": "上一位訪客",
+        "RealTimeVisitorCount": "即時訪客數量",
+        "Referrer_URL": "參造連結網址",
+        "ShowMap": "顯示地圖",
+        "ViewVisitorProfile": "查看訪客資料",
+        "VisitedPages": "到達頁面",
         "VisitorLog": "訪客記錄",
-        "VisitorsInRealTime": "目前正在參觀網站的訪客",
-        "VisitorsLastVisit": "此訪客於 %s 天前曾來訪"
+        "VisitorProfile": "訪客資料",
+        "VisitorsInRealTime": "即時訪客資訊",
+        "VisitorsLastVisit": "此訪客曾於 %s 天前訪問過。",
+        "VisitsFrom": "%1$s%2$s 次訪問%3$s 來自",
+        "VisitSummary": "共停留了 %1$s%2$s 在網站上%3$s，並訪問了 %4$s 個頁面%5$s在過去 %6$s 次%7$s次訪問。",
+        "VisitSummaryWithActionDetails": "共停留了 %1$s%2$s 在網站上%3$s，並執行了 %4$s 個動作%5$s（%6$s）在過去 %7$s 次%8$s次訪問。",
+        "OnClickPause": "%s 已開始。點擊暫停。",
+        "OnClickStart": "%s 已停止。點擊開始。"
     }
 }
\ No newline at end of file