From 742424228414793e6aaa06ce8a9de182cdfb2957 Mon Sep 17 00:00:00 2001
From: Florian Orben <florian.orben@gmail.com>
Date: Sat, 24 Oct 2015 21:55:16 +0200
Subject: Add java and ini language

Forgot to add those altough they are quite common
---
 web/react/utils/constants.jsx | 4 +++-
 web/react/utils/markdown.jsx  | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index 2c9959d4a..1593f6706 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -347,6 +347,8 @@ module.exports = {
         cpp: 'C++',
         sql: 'SQL',
         go: 'Go',
-        ruby: 'Ruby'
+        ruby: 'Ruby',
+        java: 'Java',
+        ini: 'ini'
     }
 };
diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx
index ca26f7701..b5d239eb5 100644
--- a/web/react/utils/markdown.jsx
+++ b/web/react/utils/markdown.jsx
@@ -28,6 +28,8 @@ const highlightJsCpp = require('highlight.js/lib/languages/cpp.js');
 const highlightJsSql = require('highlight.js/lib/languages/sql.js');
 const highlightJsGo = require('highlight.js/lib/languages/go.js');
 const highlightJsRuby = require('highlight.js/lib/languages/ruby.js');
+const highlightJsJava = require('highlight.js/lib/languages/java.js');
+const highlightJsIni = require('highlight.js/lib/languages/ini.js');
 
 const Constants = require('../utils/constants.jsx');
 const HighlightedLanguages = Constants.HighlightedLanguages;
@@ -99,6 +101,8 @@ class MattermostMarkdownRenderer extends marked.Renderer {
         highlightJs.registerLanguage('sql', highlightJsSql);
         highlightJs.registerLanguage('go', highlightJsGo);
         highlightJs.registerLanguage('ruby', highlightJsRuby);
+        highlightJs.registerLanguage('java', highlightJsJava);
+        highlightJs.registerLanguage('ini', highlightJsIni);
     }
 
     code(code, language) {
-- 
cgit v1.2.3-1-g7c22