1 files changed, 6 insertions, 12 deletions

diff --git a/webapp/components/code_preview.jsx b/webapp/components/code_preview.jsx
index 6625f45f4..852b26e25 100644
--- a/webapp/components/code_preview.jsx
+++ b/webapp/components/code_preview.jsx
@@ -38,7 +38,7 @@ export default class CodePreview extends React.Component {
     }
 
     updateStateFromProps(props) {
-        var usedLanguage = SyntaxHighlighting.getLanguageFromFilename(props.filename);
+        const usedLanguage = SyntaxHighlighting.getLanguageFromFileExtension(props.fileInfo.extension);
 
         if (!usedLanguage || props.fileInfo.size > Constants.CODE_PREVIEW_MAX_FILE_SIZE) {
             this.setState({code: '', lang: '', loading: false, success: false});
@@ -64,8 +64,8 @@ export default class CodePreview extends React.Component {
         this.setState({loading: false, success: false});
     }
 
-    static support(filename) {
-        return Boolean(SyntaxHighlighting.getLanguageFromFilename(filename));
+    static supports(fileInfo) {
+        return Boolean(SyntaxHighlighting.getLanguageFromFileExtension(fileInfo.extension));
     }
 
     render() {
@@ -83,10 +83,8 @@ export default class CodePreview extends React.Component {
         if (!this.state.success) {
             return (
                 <FileInfoPreview
-                    filename={this.props.filename}
-                    fileUrl={this.props.fileUrl}
                     fileInfo={this.props.fileInfo}
-                    formatMessage={this.props.formatMessage}
+                    fileUrl={this.props.fileUrl}
                 />
             );
         }
@@ -106,12 +104,10 @@ export default class CodePreview extends React.Component {
 
         const highlighted = SyntaxHighlighting.highlight(this.state.lang, this.state.code);
 
-        const fileName = this.props.filename.substring(this.props.filename.lastIndexOf('/') + 1, this.props.filename.length);
-
         return (
             <div className='post-code'>
                 <span className='post-code__language'>
-                    {`${fileName} - ${language}`}
+                    {`${this.props.fileInfo.name} - ${language}`}
                 </span>
                 <code className='hljs'>
                     <table>
@@ -129,8 +125,6 @@ export default class CodePreview extends React.Component {
 }
 
 CodePreview.propTypes = {
-    filename: React.PropTypes.string.isRequired,
-    fileUrl: React.PropTypes.string.isRequired,
     fileInfo: React.PropTypes.object.isRequired,
-    formatMessage: React.PropTypes.func.isRequired
+    fileUrl: React.PropTypes.string.isRequired
 };