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:
authordiosmosis <diosmosis@users.noreply.github.com>2018-06-01 21:44:31 +0300
committerStefan Giehl <stefan@piwik.org>2018-06-01 21:44:31 +0300
commit89715269ed0ba616e2f508ef4cf6d43367cc8b1b (patch)
tree22e08461f8ce072c44c9e8060af5d28ac49a7a21 /plugins/Feedback
parent4eb38fd6eaaef6643a794aba4457143434a68e14 (diff)
Fix some UI tests, including random failure + allow --piwik-domain use in tests:run-ui (#13027)
* Forward --piwik-domain to sub-commands from tests:run-ui. * temp commit debugging * Predictable screenshots for realtime map in dashboard. * Fix translation regression. * Update UI test case & screenshots. * Remove it.only * update screenshot * removes unused use statements
Diffstat (limited to 'plugins/Feedback')
-rw-r--r--plugins/Feedback/templates/index.twig5
1 files changed, 1 insertions, 4 deletions
diff --git a/plugins/Feedback/templates/index.twig b/plugins/Feedback/templates/index.twig
index cab0fd7094..fb88961dce 100644
--- a/plugins/Feedback/templates/index.twig
+++ b/plugins/Feedback/templates/index.twig
@@ -28,10 +28,7 @@
<p> &bull; {{ 'Feedback_ViewUserGuides'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/docs/'>","</a>")|raw }}.</p>
<p> &bull; {{ 'Feedback_ViewAnswersToFAQ'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/faq/'>","</a>")|raw }}.</p>
<p> &bull; {{ 'Feedback_VisitTheForums'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://forum.matomo.org/'>","</a>")|raw }}.</p>
- <p> &bull; {{ 'API_LearnAboutCommonlyUsedTerms'|translate(
- '<a href="'~ linkTo({'module':"API",'action':"glossary"}) ~ '#metrics">' ~ 'General_Metrics'|translate ~ '</a>',
- '<a href="'~ linkTo({'module':"API",'action':"glossary"}) ~ '#reports">' ~ 'General_Reports'|translate ~ '</a>')|raw
- }} ({{ 'API_Glossary'|translate }})</p>
+ <p> &bull; {{ 'API_LearnAboutCommonlyUsedTerms2'|translate }} <a href="{{ linkTo({'module':"API",'action':"glossary"}) }}">({{ 'API_Glossary'|translate }})</a></p>
</div>
<div piwik-content-block content-title="{{ 'Feedback_ProfessionalHelp'|translate|e('html_attr') }}">