Merge pull request #97 from StepicOrg/feature/meta_charset

meanmail · web-flow · commit 66d96916f29c · 2017-04-06T16:57:05.000+07:00
Added meta tag with charset to templates
diff --git a/stepik-union/src/main/java/org/stepik/core/ui/StudyBrowserWindow.java b/stepik-union/src/main/java/org/stepik/core/ui/StudyBrowserWindow.java
@@ -48,6 +48,7 @@
 import javax.swing.*;
 import java.awt.*;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
@@ -145,6 +146,7 @@ private String createHtmlWithCodeHighlighting(@NotNull final String content) {
             map.put("css_highlight", getExternalURL("/highlight/styles/idea.css"));
         }
         map.put("code", content);
+        map.put("charset", Charset.defaultCharset().displayName());
 
         return Templater.processTemplate("template", map);
     }
diff --git a/stepik-union/src/main/resources/templates/template.ftl b/stepik-union/src/main/resources/templates/template.ftl
@@ -5,6 +5,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+    <meta charset="${charset}">
     <link rel="stylesheet" href="${css_highlight}">
     <script src="${highlight}"></script>
     <style media="screen" type="text/css">

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@`
`48`	`48`	`import javax.swing.*;`
`49`	`49`	`import java.awt.*;`
`50`	`50`	`import java.io.IOException;`
	`51`	`+import java.nio.charset.Charset;`
`51`	`52`	`import java.util.HashMap;`
`52`	`53`	`import java.util.Map;`
`53`	`54`	`import java.util.concurrent.ExecutorService;`
`@@ -145,6 +146,7 @@ private String createHtmlWithCodeHighlighting(@NotNull final String content) {`
`145`	`146`	`map.put("css_highlight", getExternalURL("/highlight/styles/idea.css"));`
`146`	`147`	`}`
`147`	`148`	`map.put("code", content);`
	`149`	`+ map.put("charset", Charset.defaultCharset().displayName());`
`148`	`150`
`149`	`151`	`return Templater.processTemplate("template", map);`
`150`	`152`	`}`