Refs #4569 Tweak to message + display as raw for segment names with e…

…ntities to display ok
matomo-org · Feb 4, 2014 · 975d2ce · 975d2ce
1 parent db7d1b5
commit 975d2ce
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 9 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -2413,7 +2413,7 @@
         "AutoArchiveRealTime": "segmented reports are processed in real time",
         "AutoArchivePreProcessed": "segmented reports are pre-processed (faster, requires archive.php cron)",
         "SegmentNotApplied": "Segment '%s' not applied",
-        "SegmentNotAppliedExplanation": "You are requesting data for the Custom Segment '%s', the current Piwik configuration prevents the real time processing of this segment. Please ask your Piwik admin to change the setting in the config file (browser_archiving_disabled_enforce) or edit this Segment to be Processed by the cron archive.php script."
+        "SegmentNotAppliedExplanation": "You are requesting data for the Custom Segment '%s', the current Piwik configuration prevents the real time processing of reports for this segment. Please ask your Piwik admin to change the setting in the config file (%s). You may also edit this Segment and choose '%s'."
     },
     "Events": {
         "Events": "Events",

diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
diff --git a/plugins/Dashboard/stylesheets/dashboard.less b/plugins/Dashboard/stylesheets/dashboard.less
@@ -162,6 +162,10 @@
   min-height: 0 !important;
 }
 
+.ui-confirm p {
+  margin-top:10px;
+
+}
 .ui-confirm h2 {
   text-align: center;
   font-weight: bold;

diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo
diff --git a/plugins/SegmentEditor/templates/_segmentSelector.twig b/plugins/SegmentEditor/templates/_segmentSelector.twig
@@ -146,8 +146,9 @@
 </div>
 
 <div class="ui-confirm" id="pleaseChangeBrowserAchivingDisabledSetting">
-    <h2>{{ 'SegmentEditor_SegmentNotApplied'|translate(nameOfCurrentSegment) }}</h2>
-    <p class="description">{{ 'SegmentEditor_SegmentNotAppliedExplanation'|translate(nameOfCurrentSegment) }}</p>
+    <h2>{{ 'SegmentEditor_SegmentNotApplied'|translate(nameOfCurrentSegment)|raw }}</h2>
+    {% set segmentSetting %}{{ 'SegmentEditor_AutoArchivePreProcessed'|translate }}{% endset %}
+    <p class="description">{{ 'SegmentEditor_SegmentNotAppliedExplanation'|translate(nameOfCurrentSegment, 'browser_archiving_disabled_enforce', segmentSetting)|raw }}</p>
     <input role="yes" type="button" value="{{ 'General_Ok'|translate }}"/>
 </div>
 

diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable
diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization
diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI