From ef0f43d7e47019d3ebd8e79c89553df4b854a254 Mon Sep 17 00:00:00 2001
From: Dmitriy Simushev <simushevds@ossg.ru>
Date: Fri, 6 Jun 2014 08:54:16 +0000
Subject: [PATCH] Remove markup from "old browsers" localization constants

---
 src/mibew/libs/chat.php                         | 17 +++++++++++++++++
 .../Controller/Chat/UserChatController.php      |  5 ++---
 src/mibew/locales/en/properties                 |  3 +--
 .../templates_src/server_side/nochat.handlebars |  8 ++++++--
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/mibew/libs/chat.php b/src/mibew/libs/chat.php
index e780865e..e4c68383 100644
--- a/src/mibew/libs/chat.php
+++ b/src/mibew/libs/chat.php
@@ -134,6 +134,23 @@ function get_remote_level($user_agent)
     return "ajaxed";
 }
 
+/**
+ * Returns a list of supported browsers.
+ *
+ * @return array List of supported browsers names.
+ */
+function get_supported_browsers()
+{
+    return array(
+        'Internet Explorer 5.5+',
+        'Firefox 1.0+',
+        'Opera 8.0+',
+        'Mozilla 1.4+',
+        'Netscape 7.1+',
+        'Safari 1.2+',
+    );
+}
+
 /**
  * Returns a list of known user agents code names.
  *
diff --git a/src/mibew/libs/classes/Mibew/Controller/Chat/UserChatController.php b/src/mibew/libs/classes/Mibew/Controller/Chat/UserChatController.php
index 78be3246..4167673f 100644
--- a/src/mibew/libs/classes/Mibew/Controller/Chat/UserChatController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/Chat/UserChatController.php
@@ -73,9 +73,8 @@ class UserChatController extends AbstractController
         // Do not support old browsers at all
         if (get_remote_level($request->headers->get('User-Agent')) == 'old') {
             // Create page array
-            $page = array_merge_recursive(
-                setup_logo()
-            );
+            $page = setup_logo();
+            $page['supportedBrowsers'] = get_supported_browsers();
 
             return $this->render('nochat', $page);
         }
diff --git a/src/mibew/locales/en/properties b/src/mibew/locales/en/properties
index 5f80bae6..76c72e97 100644
--- a/src/mibew/locales/en/properties
+++ b/src/mibew/locales/en/properties
@@ -269,8 +269,7 @@ page.analysis.trackedpath.title=Tracked visitor's path
 page.analysis.userhistory.intro=You can find the chat history of your visitors here.
 page.analysis.userhistory.title=Visit history
 page.chat.old_browser.close=Close...
-page.chat.old_browser.list=<ul>\n<li>Internet Explorer 5.5+</li>\n<li>Firefox 1.0+</li>\n<li>Opera 8.0+</li>\n<li>Mozilla 1.4+</li>\n<li>Netscape 7.1+</li>\n<li>Safari 1.2+</li>\n</ul>\n<p>Also, we support some old browsers:</p>\n<ul>\n<li>Internet Explorer 5.0</li>\n<li>Opera 7.0</li>\n</ul>
-page.chat.old_browser.problem=<p>Your web browser is not fully supported. \nPlease, use one of the following web browsers:</p>
+page.chat.old_browser.problem=Your web browser is not fully supported. \nPlease, use one of the following web browsers:
 page.chat.old_browser.title=Please use a more recent browser
 page.gen_button.button=button
 page.gen_button.choose_group=Code for group
diff --git a/src/mibew/styles/dialogs/default/templates_src/server_side/nochat.handlebars b/src/mibew/styles/dialogs/default/templates_src/server_side/nochat.handlebars
index 5806383c..e4066691 100644
--- a/src/mibew/styles/dialogs/default/templates_src/server_side/nochat.handlebars
+++ b/src/mibew/styles/dialogs/default/templates_src/server_side/nochat.handlebars
@@ -7,9 +7,13 @@
         </a>
     {{/override}}
 
-    {{#override "message"}}{{l10n "page.chat.old_browser.problem"}}{{/override}}
+    {{#override "message"}}<p>{{l10n "page.chat.old_browser.problem"}}</p>{{/override}}
 
     {{#override "content"}}
-        {{l10n "page.chat.old_browser.list"}}
+        <ul>
+            {{#each supportedBrowsers}}
+            <li>{{this}}</li>
+            {{/each}}
+        </ul>
     {{/override}}
 {{/extends}}
\ No newline at end of file