From 02db4c134072ee950b0a927459f6ec397b24751a Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 12 Nov 2018 13:26:28 -0500
Subject: [PATCH] Avoid svg xml in locale strings

---
 .../discourse/connectors/user-summary-stat/solved-count.hbs | 2 +-
 .../discourse/initializers/extend-for-solved-button.js.es6  | 2 ++
 config/locales/client.en.yml                                | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/assets/javascripts/discourse/connectors/user-summary-stat/solved-count.hbs b/assets/javascripts/discourse/connectors/user-summary-stat/solved-count.hbs
index 1113352..ee330d5 100644
--- a/assets/javascripts/discourse/connectors/user-summary-stat/solved-count.hbs
+++ b/assets/javascripts/discourse/connectors/user-summary-stat/solved-count.hbs
@@ -1,3 +1,3 @@
 {{#link-to 'userActivity.solved'}}
-  {{user-stat value=model.solved_count label="solved.solution_summary"}}
+  {{user-stat value=model.solved_count label="solved.solution_summary" icon="check-square"}}
 {{/link-to}}
diff --git a/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6 b/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6
index af66e96..060be5a 100644
--- a/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6
+++ b/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6
@@ -6,6 +6,7 @@ import { withPluginApi } from "discourse/lib/plugin-api";
 import { ajax } from "discourse/lib/ajax";
 import PostCooked from "discourse/widgets/post-cooked";
 import { formatUsername } from "discourse/lib/utilities";
+import { iconHTML } from "discourse-common/lib/icon-library";
 
 function clearAccepted(topic) {
   const posts = topic.get("postStream.posts");
@@ -201,6 +202,7 @@ export default {
         }
 
         return I18n.t("solved.accepted_html", {
+          icon: iconHTML('check-square'),
           username_lower: username.toLowerCase(),
           username: formatUsername(username),
           post_path: this.get("url") + "/" + postNumber,
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 0ecf60c..4157acf 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -15,7 +15,7 @@ en:
       accepted_answer: "Solution"
       solution: "Solution"
       solution_summary:
-        one: "solution <svg class='fa d-icon d-icon-check-square svg-icon' aria-hidden='true'><use xlink:href='#check-square'></use></svg>"
-        other: "solutions <svg class='fa d-icon d-icon-check-square svg-icon' aria-hidden='true'><use xlink:href='#check-square'></use></svg>"
-      accepted_html: "<svg class='fa d-icon d-icon-check-square svg-icon' aria-hidden='true'><use xlink:href='#check-square'></use></svg> Solved <span class='by'>by <a href data-user-card='{{username_lower}}'>{{username}}</a></span> in <a href='{{post_path}}' class='back'>post #{{post_number}}</a>"
+        one: "solution"
+        other: "solutions"
+      accepted_html: "{{icon}} Solved <span class='by'>by <a href data-user-card='{{username_lower}}'>{{username}}</a></span> in <a href='{{post_path}}' class='back'>post #{{post_number}}</a>"
       accepted_notification: "<p><span>{{username}}</span> {{description}}</p>"