diff options
author | mattab <matthieu.aubry@gmail.com> | 2014-02-04 08:51:58 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2014-02-04 08:51:58 +0400 |
commit | 975d2ce2d6c66a8f6e10c98cd4151cda6883af46 (patch) | |
tree | 0a954f753b26cfc9fc52972a2ba6ee63d6a1a1c0 | |
parent | db7d1b5bb0d1a760d757483c05ef516409c4002b (diff) |
Refs #4569 Tweak to message + display as raw for segment names with entities to display ok
-rw-r--r-- | lang/en.json | 2 | ||||
m--------- | plugins/CustomAlerts | 0 | ||||
-rw-r--r-- | plugins/Dashboard/stylesheets/dashboard.less | 4 | ||||
m--------- | plugins/SecurityInfo | 0 | ||||
-rw-r--r-- | plugins/SegmentEditor/templates/_segmentSelector.twig | 5 | ||||
m--------- | plugins/TasksTimetable | 0 | ||||
m--------- | plugins/TreemapVisualization | 0 | ||||
m--------- | plugins/VisitorGenerator | 0 | ||||
m--------- | tests/PHPUnit/UI | 0 |
9 files changed, 8 insertions, 3 deletions
diff --git a/lang/en.json b/lang/en.json index 68230a1661..1dbcea0f44 100644 --- 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 -Subproject 277529fa331cf9ddddc94a6bce0774cabd0201e +Subproject dd693992a438a51c2bb6e48be740b06f30a6480 diff --git a/plugins/Dashboard/stylesheets/dashboard.less b/plugins/Dashboard/stylesheets/dashboard.less index d8bb57e4e8..ea67e3137b 100644 --- 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 -Subproject cd98a60c785ce56b45e4d142e9af3a470619a60 +Subproject 2d1f5e5a70ddcf5e7a88514c07b9e0ef501051e diff --git a/plugins/SegmentEditor/templates/_segmentSelector.twig b/plugins/SegmentEditor/templates/_segmentSelector.twig index f66dbf4e2b..f036a98976 100644 --- 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 -Subproject f6e252d5dc5e3cf004263f7450c2ca55bd2c5a7 +Subproject 2646ac6b7856fc46e20a0213a5467cd6cd7c731 diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization -Subproject 2cb15300a88f7ff2a1fc27ef633a1a1f4d5fef0 +Subproject 19978cb7cd926ec0fba111ce257b8f0450f34ce diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator -Subproject 0e0066e5358aea60026b8f53bd7a33e854dbb67 +Subproject 6cd5e94ca5cca57ed5132b9f929d7a952e41041 diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI -Subproject ba9eecdcc8be1a0a3114c99e9810b9b98ff15af +Subproject ec7b2f65c0ef8c8570c1da0f9b3263dc37f8863 |