From 05f895b4a2313c86da565104bcdb912f8360dc4e Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Mon, 15 Jun 2015 18:49:08 +0200
Subject: [PATCH] added note to changelog; updated comment

---
 CHANGELOG.md                    | 1 +
 core/Translation/Translator.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2b824dd80..5a8b31a643 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API'
 
 ### Breaking Changes
 * The `UserSettings` API has been removed. The API was deprecated in earlier versions. Use `DevicesDetection`, `Resolution` and `DevicePlugins` API instead.
+* Many translations have been moved to the new Intl plugin. Most of them will still work, but please update their usage. See https://github.com/piwik/piwik/pull/8101 for a full list 
 
 ### New features 
 * The JavaScript Tracker does now track outlinks and downloads if a user opens the context menu if the `enabled` parameter of the `enableLinkTracking()` method is set to `true`. To use this new feature use `tracker.enableLinkTracking(true)` or `_paq.push(['enableLinkTracking', true]);`. This is not industry standard and is vulnerable to false positives since not every user will select "Open in a new tab" when the context menu is shown. Most users will do though and it will lead to more accurate results in most cases.
diff --git a/core/Translation/Translator.php b/core/Translation/Translator.php
index ab179503c1..63ebeb8c19 100644
--- a/core/Translation/Translator.php
+++ b/core/Translation/Translator.php
@@ -270,7 +270,7 @@ class Translator
 
         /**
          * Fallback for keys moved to new Intl plugin to avoid untranslated string in non core plugins
-         * @todo remove this in a later version
+         * @todo remove this in Piwik 3.0
          */
         if ($plugin != 'Intl') {
             if (isset($this->translations[$lang]['Intl'])
-- 
GitLab