Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/CustomDimensions/tests/System/expected/test___API.getReportMetadata_day.xml4
-rw-r--r--plugins/UserLanguage/Reports/GetLanguage.php2
-rw-r--r--plugins/UserLanguage/Reports/GetLanguageCode.php2
-rw-r--r--plugins/UserLanguage/lang/en.json6
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml10
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml4
6 files changed, 21 insertions, 7 deletions
diff --git a/plugins/CustomDimensions/tests/System/expected/test___API.getReportMetadata_day.xml b/plugins/CustomDimensions/tests/System/expected/test___API.getReportMetadata_day.xml
index a2c6db5c41..d18499602f 100644
--- a/plugins/CustomDimensions/tests/System/expected/test___API.getReportMetadata_day.xml
+++ b/plugins/CustomDimensions/tests/System/expected/test___API.getReportMetadata_day.xml
@@ -256,6 +256,7 @@
<module>UserLanguage</module>
<action>getLanguage</action>
<dimension>Language</dimension>
+ <documentation>This report shows which language the visitor's browsers are using. (e.g. "English")</documentation>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -334,6 +335,7 @@
<module>UserLanguage</module>
<action>getLanguageCode</action>
<dimension>Language</dimension>
+ <documentation>This report shows which exact language code the visitor's browsers is set to. (e.g. "German - Austria (de-at)")</documentation>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -2573,4 +2575,4 @@
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=API&amp;apiAction=get&amp;period=day&amp;date=2012-12-25,2013-01-23</imageGraphEvolutionUrl>
<uniqueId>API_get</uniqueId>
</row>
-</result> \ No newline at end of file
+</result>
diff --git a/plugins/UserLanguage/Reports/GetLanguage.php b/plugins/UserLanguage/Reports/GetLanguage.php
index adc2ac8ea2..ae3b92c223 100644
--- a/plugins/UserLanguage/Reports/GetLanguage.php
+++ b/plugins/UserLanguage/Reports/GetLanguage.php
@@ -20,7 +20,7 @@ class GetLanguage extends Base
parent::init();
$this->dimension = new Language();
$this->name = Piwik::translate('UserLanguage_BrowserLanguage');
- $this->documentation = ''; // TODO
+ $this->documentation = Piwik::translate('UserLanguage_getLanguageDocumentation');
$this->order = 8;
}
diff --git a/plugins/UserLanguage/Reports/GetLanguageCode.php b/plugins/UserLanguage/Reports/GetLanguageCode.php
index 0c1f56ba3e..85866b830f 100644
--- a/plugins/UserLanguage/Reports/GetLanguageCode.php
+++ b/plugins/UserLanguage/Reports/GetLanguageCode.php
@@ -19,7 +19,7 @@ class GetLanguageCode extends GetLanguage
parent::init();
$this->dimension = new Language();
$this->name = Piwik::translate('UserLanguage_LanguageCode');
- $this->documentation = '';
+ $this->documentation = Piwik::translate('UserLanguage_getLanguageCodeDocumentation');
$this->order = 11;
}
diff --git a/plugins/UserLanguage/lang/en.json b/plugins/UserLanguage/lang/en.json
index ffbf336048..545a90ce54 100644
--- a/plugins/UserLanguage/lang/en.json
+++ b/plugins/UserLanguage/lang/en.json
@@ -2,6 +2,8 @@
"UserLanguage": {
"BrowserLanguage": "Browser language",
"LanguageCode": "Language code",
- "PluginDescription": "Reports the language used by your visitors' browsers."
+ "PluginDescription": "Reports the language used by your visitors' browsers.",
+ "getLanguageDocumentation": "This report shows which language the visitor's browsers are using. (e.g. \"English\")",
+ "getLanguageCodeDocumentation": "This report shows which exact language code the visitor's browsers is set to. (e.g. \"German - Austria (de-at)\")"
}
-} \ No newline at end of file
+}
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
index a4fe0eec4f..49c658ccfc 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
@@ -13,6 +13,10 @@
<documentation>This report shows your visitors' browsers broken down into browser engines. &lt;br /&gt; The most important information for web developers is what kind of rendering engine their visitors are using. The labels contain the names of the engines followed by the most common browser using that engine in brackets.</documentation>
</row>
<row>
+ <name>Browser language (Visitors)</name>
+ <documentation>This report shows which language the visitor's browsers are using. (e.g. &quot;English&quot;)</documentation>
+ </row>
+ <row>
<name>Browsers (Visitors)</name>
<documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation>
</row>
@@ -71,6 +75,10 @@
<documentation>This report shows which keywords users were searching for before they were referred to your website. &lt;br /&gt;&lt;br /&gt; By clicking on a row in the table, you can see the distribution of search engines that were queried for the keyword.&lt;br /&gt;&lt;br /&gt;Note: This report lists most keywords as not defined, because most search engines do not send the exact keyword used on the search engine.</documentation>
</row>
<row>
+ <name>Language code (Visitors)</name>
+ <documentation>This report shows which exact language code the visitor's browsers is set to. (e.g. &quot;German - Austria (de-at)&quot;)</documentation>
+ </row>
+ <row>
<name>Length of Visits (Actions)</name>
<documentation>In this report, you can see how many visits had a certain total duration. Initially, the report is shown as a tag cloud, more common durations are displayed in a larger font.&lt;br /&gt;Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation>
</row>
@@ -151,4 +159,4 @@
<name>Websites (Referrers)</name>
<documentation>In this table, you can see which websites referred visitors to your site. &lt;br /&gt; By clicking on a row in the table, you can see which URLs the links to your website were on.</documentation>
</row>
-</result> \ No newline at end of file
+</result>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
index 519c26571d..c36aa73e2f 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
@@ -256,6 +256,7 @@
<module>UserLanguage</module>
<action>getLanguage</action>
<dimension>Language</dimension>
+ <documentation>This report shows which language the visitor's browsers are using. (e.g. "English")</documentation>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -334,6 +335,7 @@
<module>UserLanguage</module>
<action>getLanguageCode</action>
<dimension>Language</dimension>
+ <documentation>This report shows which exact language code the visitor's browsers is set to. (e.g. "German - Austria (de-at)")</documentation>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -2724,4 +2726,4 @@
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=API&amp;apiAction=get&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
<uniqueId>API_get</uniqueId>
</row>
-</result> \ No newline at end of file
+</result>