From d42a4ff16cc9bd6c0029a458de784e52b982e618 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Thu, 23 Mar 2017 00:48:16 +0900
Subject: [PATCH] Removed Japanese fonts support

Now Electron chooses proper fonts. So the feature is no longer necessary.
---
 CHANGELOG.md                              |  3 +++
 src/browser/components/MattermostView.jsx | 21 ---------------------
 src/browser/css/jp_fonts.css              | 14 --------------
 src/package.json                          |  1 -
 4 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 src/browser/css/jp_fonts.css

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e3d4b48..37ef057f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,9 @@ Release date: TBD
 ### Improvements
 - Removed "Display secure content only" option it's no longer necessary.
 
+#### Windows
+- Removed Japanese fonts support it's no longer necessary.
+
 ### Bug Fixes
 
 #### All Platforms
diff --git a/src/browser/components/MattermostView.jsx b/src/browser/components/MattermostView.jsx
index 1df90318..530b0307 100644
--- a/src/browser/components/MattermostView.jsx
+++ b/src/browser/components/MattermostView.jsx
@@ -1,9 +1,7 @@
 const React = require('react');
 const {findDOMNode} = require('react-dom');
 const {ipcRenderer, remote, shell} = require('electron');
-const fs = require('fs');
 const url = require('url');
-const osLocale = require('os-locale');
 const electronContextMenu = require('electron-context-menu');
 
 const ErrorView = require('./ErrorView.jsx');
@@ -79,25 +77,6 @@ const MattermostView = React.createClass({
     webview.addEventListener('dom-ready', () => {
       // webview.openDevTools();
 
-      // Use 'Meiryo UI' and 'MS Gothic' to prevent CJK fonts on Windows(JP).
-      if (process.platform === 'win32') {
-        function applyCssFile(cssFile) {
-          fs.readFile(cssFile, 'utf8', (err, data) => {
-            if (err) {
-              console.log(err);
-              return;
-            }
-            webview.insertCSS(data);
-          });
-        }
-
-        osLocale().then((locale) => {
-          if (locale === 'ja_JP') {
-            applyCssFile(remote.app.getAppPath() + '/css/jp_fonts.css');
-          }
-        });
-      }
-
       if (!this.state.isContextMenuAdded) {
         electronContextMenu({
           window: webview
diff --git a/src/browser/css/jp_fonts.css b/src/browser/css/jp_fonts.css
deleted file mode 100644
index 27e41d3c..00000000
--- a/src/browser/css/jp_fonts.css
+++ /dev/null
@@ -1,14 +0,0 @@
-@font-face {
-  font-family: sans-serif;
-  src: local('Meiryo UI');
-}
-
-@font-face {
-  font-family: 'sans-serif';
-  src: local('Meiryo UI');
-}
-
-@font-face {
-  font-family: monospace;
-  src: local('MS Gothic');
-}
diff --git a/src/package.json b/src/package.json
index aefbd56b..9682da18 100644
--- a/src/package.json
+++ b/src/package.json
@@ -18,7 +18,6 @@
     "electron-devtools-installer": "^2.1.0",
     "electron-is-dev": "^0.1.2",
     "electron-squirrel-startup": "^1.0.0",
-    "os-locale": "^2.0.0",
     "react": "^15.4.2",
     "react-addons-css-transition-group": "^15.4.2",
     "react-bootstrap": "~0.30.7",