From bf0aac03d1661104c3af52ee9de79f54df93556c Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Tue, 24 Nov 2015 16:54:31 +1300
Subject: [PATCH] Breaking a string into two strings to prevent regression as
this string is used in other places (scheduled report UI)
---
plugins/CustomDimensions | 2 +-
plugins/SegmentEditor/lang/en.json | 3 ++-
plugins/SegmentEditor/templates/_segmentSelector.twig | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions
index 2ffaa0d850..0820e539a9 160000
--- a/plugins/CustomDimensions
+++ b/plugins/CustomDimensions
@@ -1 +1 @@
-Subproject commit 2ffaa0d85057ab9908176994534f4cb374098ccf
+Subproject commit 0820e539a90be279a7ccd960655627bc880f6ccb
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">
--
GitLab