From ca460ec88ac0c7bcebfaad1af7f733bfd243643b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Mart=C3=ADnez?=
 <adrian.martinez@interactiv4.com>
Date: Mon, 29 Jan 2018 04:12:40 +0100
Subject: [PATCH] Adapt
 \Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel::render
 method to use current locale to render time zone label, as done in
 \Magento\Framework\Locale\TranslatedLists::getOptionTimezones

---
 .../System/Config/CollectionTimeLabel.php     | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php
index c4118792255cd..34f2b7d53d9be 100644
--- a/app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php
+++ b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php
@@ -5,13 +5,35 @@
  */
 namespace Magento\Analytics\Block\Adminhtml\System\Config;
 
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Provides label with default Time Zone
  */
 class CollectionTimeLabel extends \Magento\Config\Block\System\Config\Form\Field
 {
     /**
-     * Add default time zone to comment
+     * @var \Magento\Framework\Locale\ResolverInterface
+     */
+    private $localeResolver;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param array $data
+     * @param \Magento\Framework\Locale\ResolverInterface|null $localeResolver
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        array $data = [],
+        \Magento\Framework\Locale\ResolverInterface $localeResolver = null
+    ) {
+        $this->localeResolver = $localeResolver ?:
+            ObjectManager::getInstance()->get(\Magento\Framework\Locale\ResolverInterface::class);
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Add current time zone to comment, properly translated according to locale
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
@@ -19,7 +41,9 @@ class CollectionTimeLabel extends \Magento\Config\Block\System\Config\Form\Field
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
         $timeZoneCode = $this->_localeDate->getConfigTimezone();
-        $getLongTimeZoneName = \IntlTimeZone::createTimeZone($timeZoneCode)->getDisplayName();
+        $locale = $this->localeResolver->getLocale();
+        $getLongTimeZoneName = \IntlTimeZone::createTimeZone($timeZoneCode)
+            ->getDisplayName(false, \IntlTimeZone::DISPLAY_LONG, $locale);
         $element->setData(
             'comment',
             sprintf("%s (%s)", $getLongTimeZoneName, $timeZoneCode)