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:
authormattab <matthieu.aubry@gmail.com>2015-11-24 06:54:31 +0300
committermattab <matthieu.aubry@gmail.com>2015-11-24 06:54:31 +0300
commitbf0aac03d1661104c3af52ee9de79f54df93556c (patch)
tree69142eba6070f359300fdfcc3672f3b178effebf /plugins
parentc0603d40d929f023dedb77a060a5628637cf93b4 (diff)
Breaking a string into two strings to prevent regression as this string is used in other places (scheduled report UI)
Diffstat (limited to 'plugins')
m---------plugins/CustomDimensions0
-rw-r--r--plugins/SegmentEditor/lang/en.json3
-rw-r--r--plugins/SegmentEditor/templates/_segmentSelector.twig2
3 files changed, 3 insertions, 2 deletions
diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions
-Subproject 2ffaa0d85057ab9908176994534f4cb374098cc
+Subproject 0820e539a90be279a7ccd960655627bc880f6cc
diff --git a/plugins/SegmentEditor/lang/en.json b/plugins/SegmentEditor/lang/en.json
index a9ba4382e0..8651afeecd 100644
--- a/plugins/SegmentEditor/lang/en.json
+++ b/plugins/SegmentEditor/lang/en.json
@@ -6,7 +6,8 @@
"AreYouSureDeleteSegment": "Are you sure you want to delete this segment?",
"AutoArchivePreProcessed": "segmented reports are pre-processed (faster, requires cron)",
"AutoArchiveRealTime": "segmented reports are processed in real time",
- "ChooseASegment": "Choose a segment, currently selected segment: %s",
+ "ChooseASegment": "Choose a segment",
+ "CurrentlySelectedSegment": "Currently selected segment: %s",
"DataAvailableAtLaterDate": "Your segmented analytics reports will be available later. We apologize for the inconvenience.",
"DefaultAllVisits": "All visits",
"DragDropCondition": "Drag & Drop condition",
diff --git a/plugins/SegmentEditor/templates/_segmentSelector.twig b/plugins/SegmentEditor/templates/_segmentSelector.twig
index c14921a046..dc269dc8b9 100644
--- a/plugins/SegmentEditor/templates/_segmentSelector.twig
+++ b/plugins/SegmentEditor/templates/_segmentSelector.twig
@@ -1,5 +1,5 @@
<div class="SegmentEditor" style="display:none;">
- <div class="segmentationContainer listHtml" title="{{ 'SegmentEditor_ChooseASegment'|translate(segmentDescription)|e('html_attr') }}">
+ <div class="segmentationContainer listHtml" title="{{ 'SegmentEditor_ChooseASegment'|translate|e('html_attr') }}. {{ 'SegmentEditor_CurrentlySelectedSegment'|translate(segmentDescription)|e('html_attr') }}">
<a class="title"><span class="icon icon-segment"></span><span class="segmentationTitle"></span></a>
<div class="dropdown dropdown-body">
<div class="segmentFilterContainer">