samwillis · JohnnyZhao · Jan 11, 2013 · Jan 11, 2013 · Jan 12, 2013 · Jan 12, 2013
diff --git a/Markdown.Editor.js b/Markdown.Editor.js
diff --git a/README.md b/README.md
@@ -1,8 +1,21 @@
-PageDown-Bootstrap
-==================
+PageDown-bootstrap with i18n and emotion support
+=======================
 
-This is a fork of http://code.google.com/p/pagedown/ changed to use Twitter Bootstrap for styling the editor and modal popups.
+> This is a fork of https://github.com/samwillis/pagedown-bootstrap to add i18n and emotions support
 
-The demo is viewable here: http://samwillis.co.uk/pagedown-bootstrap/demo/browser/demo.html
+**i18n support**
+
+Currenly the hint and the hover tooltips are seperated from Markdown.Editor.js to i18n/Markdown.i18n.LANGUAGE.js, where translations are located. Only chinese translation is complete, but you can add pretty much any language as you like. Just make sure the format looks like the i18n/Markdown.i18n.zh-cn.js file(Your pull requests are always welcome!).
+
+Usage:
+
+reference the translation file in your template and pass a language preference to set the editor language when you are constructing your editor in your js code
+
+**emotions**
+
+You have to call Markdown.SupportEmotions(imgPath,emotions) before constructing your
+editor if your want it to include emotions
+
+The demo is viewable here: http://shellfly.org/pagedown-with-emotions/demo/browser/demo.html
 
 New icons based on http://glyphicons.com/, http://dribbble.com/shots/365544-Mini-glyphs-12-px-Free-PSD and the origional icons.
diff --git a/demo/browser/demo.html b/demo/browser/demo.html
@@ -22,13 +22,14 @@
       <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+    <script src="../../jquery.min.js"></script>
     <script src="bootstrap/js/bootstrap-transition.js"></script>
     <script src="bootstrap/js/bootstrap-modal.js"></script>
     <script src="bootstrap/js/bootstrap-tooltip.js"></script>
     <script type="text/javascript" src="../../Markdown.Converter.js"></script>
     <script type="text/javascript" src="../../Markdown.Sanitizer.js"></script>
     <script type="text/javascript" src="../../Markdown.Editor.js"></script>
+    <script type="text/javascript" src="../../i18n/Markdown.i18n.zh_cn.js"></script>
 
 </head>
 <body>
@@ -81,6 +82,7 @@ <h2>2. This is a custom editor</h2>
 <textarea class="wmd-input" id="wmd-input-second">
 This is the *second* editor.
 ------------------------------
+It was created after Markdown.SupportEmotions ![](/img/icon_idea.gif)
 
 It has a plugin hook registered that surrounds all words starting with the
 letter A with asterisks before doing the Markdown conversion. Another one gives bare links
@@ -104,7 +106,17 @@ <h2>2. This is a custom editor</h2>
             var converter1 = Markdown.getSanitizingConverter();
             var editor1 = new Markdown.Editor(converter1);
             editor1.run();
-
+
+            var imgPath = '/img/';
+            var emotions = [['cool', 'arrow', 'biggrin', 'confused', 'cry', 'eek','neutral'],
+                            ['evil', 'exclaim', 'idea', 'lol', 'mad', 'mrgreen','question'],
+                            ['razz', 'redface', 'rolleyes', 'sad','smile','surprised', 'twisted'],
+                            ['wink']]
+            for (var i=0;i<emotions.length; i++)
+                for (j=0;j<emotions[i].length; j++)
+                    emotions[i][j] = 'icon_' + emotions[i][j] + '.gif'
+
+            Markdown.SupportEmotions(imgPath,emotions);
             var converter2 = new Markdown.Converter();
 
             converter2.hooks.chain("preConversion", function (text) {
@@ -117,7 +129,7 @@ <h2>2. This is a custom editor</h2>
 
             var help = function () { alert("Do you need help?"); }
 
-            var editor2 = new Markdown.Editor(converter2, "-second", { handler: help });
+            var editor2 = new Markdown.Editor(converter2, "-second", { handler: help },'zh-CN');
 
             editor2.run();
         })();

diff --git a/i18n/Markdown.i18n.zh_cn.js b/i18n/Markdown.i18n.zh_cn.js
@@ -0,0 +1,41 @@
+;(function($){
+    $.fn.markdown_editor.translations['zh-CN'] = {
+        tooltips: {
+            bold: '粗体 - Ctrl+B',
+            bold_insertion: '加粗文字内容',
+            italic: '斜体 - Ctrl+I',
+            italic_insertion: '斜体文字内容',
+            quote: '引用 - Ctrl+Q',
+            quote_insertion: '引用内容',
+            code: '代码示例 - Ctrl+K',
+            code_insertion: '在这里输入代码内容',
+            olist: '有序列表 - Ctrl+O',
+            olist_insertion: '列表项内容',
+            ulist: '无序列表 - Ctrl+U',
+            ulist_insertion: '列表项内容',
+            heading: '标题 - Ctrl+H',
+            heading_insertion: '标题内容',
+            image: '图片 - Ctrl+G',
+            link: '链接 - Ctrl+L',
+            hr: '水平分割线 - Ctrl+R',
+            undo: '撤销 - Ctrl+Z',
+            redo_pc: '重做 - Ctrl+Y',
+            redo_mac: '重做 - Ctrl+Shift+Z' ,
+            emotions: '表情 - Ctrl+E'
+        },
+        dialog_text: {
+            link_title: "插入链接",
+            link_example: "<p>http://example.com/ \"标题(选填)\"</p>",
+            link_description: "请在这里填写链接描述",
+            image_title: "插入图片",
+            image_example: "<p>http://example.com/images/diagram.jpg \"标题(选填)\"</p>",
+            image_description: "请在这里填写图片描述"
+        },
+        button_text: {
+            ok: "确定",
+            cancel: "取消"
+        },
+
+
+    }
+}(jQuery));
diff --git a/img/icon_arrow.gif b/img/icon_arrow.gif
diff --git a/img/icon_biggrin.gif b/img/icon_biggrin.gif
diff --git a/img/icon_confused.gif b/img/icon_confused.gif
diff --git a/img/icon_cool.gif b/img/icon_cool.gif
diff --git a/img/icon_cry.gif b/img/icon_cry.gif
diff --git a/img/icon_eek.gif b/img/icon_eek.gif
diff --git a/img/icon_evil.gif b/img/icon_evil.gif
diff --git a/img/icon_exclaim.gif b/img/icon_exclaim.gif
diff --git a/img/icon_idea.gif b/img/icon_idea.gif
diff --git a/img/icon_lol.gif b/img/icon_lol.gif
diff --git a/img/icon_mad.gif b/img/icon_mad.gif
diff --git a/img/icon_mrgreen.gif b/img/icon_mrgreen.gif
diff --git a/img/icon_neutral.gif b/img/icon_neutral.gif
diff --git a/img/icon_question.gif b/img/icon_question.gif
diff --git a/img/icon_razz.gif b/img/icon_razz.gif
diff --git a/img/icon_redface.gif b/img/icon_redface.gif
diff --git a/img/icon_rolleyes.gif b/img/icon_rolleyes.gif
diff --git a/img/icon_sad.gif b/img/icon_sad.gif
diff --git a/img/icon_smile.gif b/img/icon_smile.gif
diff --git a/img/icon_surprised.gif b/img/icon_surprised.gif
diff --git a/img/icon_twisted.gif b/img/icon_twisted.gif
diff --git a/img/icon_wink.gif b/img/icon_wink.gif
diff --git a/jquery.min.js b/jquery.min.js