diff options
| author | sgiehl <stefan@piwik.org> | 2014-10-21 22:44:23 +0400 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2014-10-21 22:44:23 +0400 |
| commit | 08b47615a17b122a753c11407ca76844fc79dae6 (patch) | |
| tree | 03c51af1e5d861fd26dc34118c63777b377fc35c /plugins/Contents | |
| parent | 6ba3965c2878d123514d951c60e77c1d697438ad (diff) | |
| parent | 9fef02e4483bae2f252b8316b208aa392cb7e11b (diff) | |
Merge branch 'master' into deprecate_usersettings
Conflicts:
core/Version.php
Diffstat (limited to 'plugins/Contents')
| -rw-r--r-- | plugins/Contents/lang/ja.json | 12 | ||||
| -rw-r--r-- | plugins/Contents/lang/tr.json | 12 | ||||
| -rw-r--r-- | plugins/Contents/tests/System/ContentsTest.php | 3 |
3 files changed, 27 insertions, 0 deletions
diff --git a/plugins/Contents/lang/ja.json b/plugins/Contents/lang/ja.json new file mode 100644 index 0000000000..c9bf03dc33 --- /dev/null +++ b/plugins/Contents/lang/ja.json @@ -0,0 +1,12 @@ +{ + "Contents": { + "ContentName": "コンテンツ名", + "ContentPiece": "コンテンツ要素", + "Contents": "内容", + "ContentTarget": "コンテンツターゲット", + "Impressions": "インプレッション", + "Interaction": "インタラクション", + "InteractionRate": "インタラクション率", + "Interactions": "インタラクション" + } +}
\ No newline at end of file diff --git a/plugins/Contents/lang/tr.json b/plugins/Contents/lang/tr.json new file mode 100644 index 0000000000..f37ef3e852 --- /dev/null +++ b/plugins/Contents/lang/tr.json @@ -0,0 +1,12 @@ +{ + "Contents": { + "ContentName": "İçerik İsmi", + "ContentPiece": "İçerik Parçası", + "Contents": "İçerikler", + "ContentTarget": "İçerik Hedefi", + "Impressions": "Gösterimler", + "Interaction": "Etkileşim", + "InteractionRate": "Etkileşim Oranı", + "Interactions": "Etkileşimler" + } +}
\ No newline at end of file diff --git a/plugins/Contents/tests/System/ContentsTest.php b/plugins/Contents/tests/System/ContentsTest.php index 4332217622..b555cf7962 100644 --- a/plugins/Contents/tests/System/ContentsTest.php +++ b/plugins/Contents/tests/System/ContentsTest.php @@ -27,6 +27,9 @@ class ContentsTest extends SystemTestCase */ public function testApi($api, $params) { + if(self::isMysqli()) { + $this->markTestSkipped('Sometimes fail on MYSQLI (at random)'); + } $this->runApiTests($api, $params); } |