diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2015-12-10 00:50:07 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2015-12-10 00:50:07 +0300 |
| commit | ebced800c0184f5ce93663afab6b0337c3755cbb (patch) | |
| tree | fb26c2506d37586ff0d38fb902d63d17701bd883 /plugins/Ecommerce | |
| parent | 3d26af780d8fe0e4f7c5824a88b95c4a0d0d25d7 (diff) | |
| parent | db36ca384809ea36457a465a3b6d1ecf951b0e26 (diff) | |
Merge master into "3.0"
Conflicts:
.travis.yml
CHANGELOG.md
core/Plugin/ControllerAdmin.php
core/Version.php
core/testMinimumPhpVersion.php
plugins/API/API.php
plugins/Actions/Reports/GetPageUrls.php
plugins/AnonymousPiwikUsageMeasurement
plugins/CoreHome/CoreHome.php
plugins/CoreHome/templates/_menu.twig
plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js
plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
plugins/Goals/Controller.php
tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
tests/PHPUnit/Integration/Plugin/ManagerTest.php
tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
tests/UI/expected-ui-screenshots
tests/UI/specs/Overlay_spec.js
tests/UI/specs/UIIntegration_spec.js
Diffstat (limited to 'plugins/Ecommerce')
| -rw-r--r-- | plugins/Ecommerce/config/config.php | 9 | ||||
| -rw-r--r-- | plugins/Ecommerce/lang/ja.json | 5 |
2 files changed, 4 insertions, 10 deletions
diff --git a/plugins/Ecommerce/config/config.php b/plugins/Ecommerce/config/config.php deleted file mode 100644 index 3431748e41..0000000000 --- a/plugins/Ecommerce/config/config.php +++ /dev/null @@ -1,9 +0,0 @@ -<?php - -return array( - - 'tracker.request.processors' => DI\add(array( - DI\get('Piwik\Plugins\Ecommerce\Tracker\EcommerceRequestProcessor'), - )), - -); diff --git a/plugins/Ecommerce/lang/ja.json b/plugins/Ecommerce/lang/ja.json index 62ccf9fe7d..822234b795 100644 --- a/plugins/Ecommerce/lang/ja.json +++ b/plugins/Ecommerce/lang/ja.json @@ -1,5 +1,8 @@ { "Ecommerce": { - "Sales": "売り上げ" + "PluginDescription": "E コマースでは、いつユーザーがカートに製品を追加し、いつ E コマース販売に結びついたか、を追跡できます。製品、製品のカテゴリビュー、および放棄されたカートも追跡できます。", + "Sales": "売り上げ", + "SalesBy": "%s 別売り上げ高", + "SalesAdjective": "売り上げ %s" } }
\ No newline at end of file |