Skip to content

Commit

Permalink
Merge branch '4.x-dev' into 5.x-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@diosmosis
diosmosis committed Oct 7, 2022
2 parents 41ddfc2 + bbb545a commit 9a24d93
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 18 deletions.
19 changes: 11 additions & 8 deletions plugins/Feedback/config/config.php
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<?php
return array(
'popularHelpTopics' => array(
array('title' => 'Feedback_NotTrackingVisits', 'url' => 'https://matomo.org/faq/troubleshooting/faq_58/'),
array('title' => 'Feedback_TrackMultipleSites', 'url' => 'https://matomo.org/faq/troubleshooting/faq_104/'),
array('title' => 'Feedback_RemoveOtherLabel', 'url' => 'https://matomo.org/faq/troubleshooting/faq_54/'),
array('title' => 'Feedback_PurgeOldData', 'url' => 'https://matomo.org/faq/troubleshooting/faq_42/'),
)
);
return [
'popularHelpTopics' => [
['title' => 'Feedback_NotTrackingVisits', 'url' => 'https://matomo.org/faq/troubleshooting/faq_58/'],
['title' => 'Feedback_TrackMultipleSites', 'url' => 'https://matomo.org/faq/troubleshooting/faq_104/'],
['title' => 'Feedback_HowToMigrateFromGA', 'url' => 'https://matomo.org/faq/how-to/faq_102/'],
['title' => 'Feedback_HowToDefineAndTrackGoals', 'url' => 'https://matomo.org/docs/tracking-goals-web-analytics/'],
['title' => 'Feedback_HowToGetStartedWithMtm', 'url' => 'https://matomo.org/guide/tag-manager/getting-started-with-tag-manager/'],
['title' => 'Feedback_HowToMigrateFromGtm', 'url' => 'https://matomo.org/faq/tag-manager/migrating-from-google-tag-manager/'],
['title' => 'Feedback_HowToTrackEcommerce', 'url' => 'https://matomo.org/docs/ecommerce-analytics/'],
]
];
23 changes: 19 additions & 4 deletions plugins/Feedback/lang/en.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"Feedback": {
"FrequentlyAskedQuestions": "Frequently Asked Questions",
"DoYouHaveBugReportOrFeatureRequest": "Do you have a bug to report or a feature request?",
"HowToCreateTicket": "Please read the recommendations on writing a good %1$sbug report%2$s or %3$sfeature request%4$s. Then register or login on %5$sour issue tracker%6$s and create a %7$snew issue%8$s.",
"IWantTo": "I want to:",
Expand Down Expand Up @@ -57,12 +58,11 @@
"RemindMeLater": "Remind me later",
"NeverAskMeAgain": "Never ask me again",
"HowCanWeHelp": "How can we help?",
"NotTrackingVisits": "Matomo isn't tracking any visits",
"TrackMultipleSites": "I need to track multiple sites or subdomains",
"NotTrackingVisits": "Why isn’t Matomo tracking any visits?",
"TrackMultipleSites": "How do I track multiple sites or subdomains?",
"RemoveOtherLabel": "I want to see my 'Others' data",
"PurgeOldData": "I want to remove some old data",
"SearchHelpResources": "Search matomo.org help resources",
"PopularHelpTopics": "Popular help topics",
"ReferMatomo": "Refer Matomo",
"ReferBannerTitle": "Believe in Matomo?",
"ReferBannerLonger": "Please help us spread the word about us so more people get control over their analytics data.",
Expand All @@ -81,6 +81,21 @@
"FeedbackSubtitle": "Here's your chance to ask for it! Please describe in as much details as you can. <br/> Your feedback will help us improve Matomo. %1$s",
"ThankYourForFeedback": "We really appreciate your feedback! %1$s We will be in touch in case we require more information about your feedback.",
"Policy": "Your message and your email address will be sent to us by submitting this form. The information will be only used to improve our products and services. Your data will be processed by us, our hosting provider, and our support ticket provider. For more information have a look at %1$sMatomo's Privacy Policy%2$s.",
"MessageBodyValidationError": "The message body is too short (minimum is 10 characters)."
"MessageBodyValidationError": "The message body is too short (minimum is 10 characters).",
"HowToMigrateFromGA": "How do I migrate from Google Analytics?",
"HowToDefineAndTrackGoals": "How do I define and track Goal conversions?",
"HowToGetStartedWithMtm": "How do I get started with Matomo Tag Manager?",
"HowToMigrateFromGtm": "How do I migrate from Google Tag Manager?",
"HowToTrackEcommerce": "How do I track Ecommerce orders?",
"MatomoHelpCentre": "Matomo Help Centre",
"KnowledgeBase": "Knowledge Base",
"KnowledgeBaseDescription": "FAQs, comprehensive guides, how-to’s and troubleshooting documents.",
"CommunityForum": "Community Forum",
"CommunityForumDescription": "Ask questions, browse solutions or share your knowledge with the Matomo Community.",
"GlossaryDescription": "Learn the definitions of terminology used in Matomo and web analytics.",
"MatomoVideoTraining": "Matomo Video Training",
"MatomoVideoTrainingDescription": "Learn the fundamentals of web analytics and how to use Matomo.",
"MtmVideoTraining": "Matomo Tag Manager Video Training",
"MtmVideoTrainingDescription": "Get started or uncover more ways to master the power of Matomo Tag Manager."
}
}
13 changes: 7 additions & 6 deletions plugins/Feedback/templates/index.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@
</div>
</form>

<h4>{{'Feedback_PopularHelpTopics'|translate}}</h4>
<h4>{{'Feedback_FrequentlyAskedQuestions'|translate}}</h4>
{% for helpTopic in popularHelpTopics %}
<p> &bull; <a rel="noreferrer noopener" target="_blank" href="{{helpTopic.url}}?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides">{{helpTopic.title|translate}}</a></p>
{% endfor %}

<h4>{{ 'Feedback_CommunityHelp'|translate }}</h4>
<p> &bull; <a target="_blank" rel="noreferrer noopener" href="https://matomo.org/docs/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=docs">{{ 'Feedback_UserGuides'|translate }}</a> - {{ 'Feedback_ViewUserGuides'|translate("","") }}.</p>
<p> &bull; <a target="_blank" rel="noreferrer noopener" href="https://matomo.org/faq/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=FAQs">{{ 'Feedback_FAQs'|translate }}</a> - {{ 'Feedback_ViewAnswersToFAQ'|translate("","") }}.</p>
<p> &bull; <a target="_blank" rel="noreferrer noopener" href="https://forum.matomo.org/">{{ 'Feedback_Forums'|translate }}</a> - {{ 'Feedback_VisitTheForums'|translate("","") }}.</p>
<p> &bull; <a target="_blank" rel="noreferrer noopener" href="{{ linkTo({'module':"API",'action':"glossary"}) }}&mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=glossary">{{ 'API_Glossary'|translate }}</a> - {{ 'API_LearnAboutCommonlyUsedTerms2'|translate }}</p>
<h4>{{ 'Feedback_MatomoHelpCentre'|translate }}</h4>
<p> &bull; <a target="_blank" rel="noreferrer noopener" href="https://matomo.org/guides/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=docs">{{ 'Feedback_KnowledgeBase'|translate }}</a> - {{ 'Feedback_KnowledgeBaseDescription'|translate }}</p>
<p> &bull; <a target="_blank" rel="noreferrer noopener" href="https://matomo.org/web-analytics-training/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=docs">{{ 'Feedback_MatomoVideoTraining'|translate }}</a> - {{ 'Feedback_MatomoVideoTrainingDescription'|translate }}</p>
<p> &bull; <a target="_blank" rel="noreferrer noopener" href="https://matomo.org/tag-manager-training/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=docs">{{ 'Feedback_MtmVideoTraining'|translate }}</a> - {{ 'Feedback_MtmVideoTrainingDescription'|translate }}</p>
<p> &bull; <a target="_blank" rel="noreferrer noopener" href="https://forum.matomo.org/">{{ 'Feedback_CommunityForum'|translate }}</a> - {{ 'Feedback_CommunityForumDescription'|translate }}</p>
<p> &bull; <a target="_blank" rel="noreferrer noopener" href="{{ linkTo({'module':"API",'action':"glossary"}) }}&mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=glossary">{{ 'API_Glossary'|translate }}</a> - {{ 'Feedback_GlossaryDescription'|translate }}</p>

<h4>{{ 'Feedback_ProfessionalHelp'|translate }}</h4>
<p>{{ 'Feedback_ProfessionalServicesIntro'|translate }}</p>
Expand Down

0 comments on commit 9a24d93

Please sign in to comment.