Merge branch 'develop'

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "trumbowyg",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "homepage": "https://github.com/Alex-D/Trumbowyg",
   "authors": [
     {

docs/documentation/plugins/index.html

@@ -764,19 +764,27 @@ <h4>How to use it?</h4>
 &lt;script src="node_modules/trumbowyg/dist/plugins/template/trumbowyg.template.min.js">&lt;/script>
             </code></pre>
             <p>
-                Then you can use the new button definition <code>template</code>
+                Then you can use the new button definition <code>template</code> and can add your template code.
             </p>
             <pre><code class="javascript">
 $('#my-editor').trumbowyg({
     btns: [
         ['template']
-    ]
+    ],
+    plugins: {
+        templates: [
+            {
+                name: 'Template 1',
+                html: '<p>I am a template!</p>'
+            },
+            {
+                name: 'Template 2',
+                html: '<p>I am a different template!</p>'
+            }
+        ]
+    }
 });
             </code></pre>
-            <p class="note">
-                Some doc to write about template options/definition... <br>
-                You can contribute to this documentation by submitting a Pull Request :)
-            </p>
         </div>
 
         <div class="feature">

package.json

@@ -2,7 +2,7 @@
   "name": "trumbowyg",
   "title": "Trumbowyg",
   "description": "A lightweight WYSIWYG editor",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "main": "dist/trumbowyg.js",
   "homepage": "http://alex-d.github.io/Trumbowyg",
   "author": {

plugins/base64/trumbowyg.base64.js

@@ -26,6 +26,12 @@
                 errFileReaderNotSupported: 'FileReader is not supported by your browser.',
                 errInvalidImage: 'Invalid image file.'
             },
+            da: {
+                base64: 'Billede som base64',
+                file: 'Fil',
+                errFileReaderNotSupported: 'FileReader er ikke understøttet af din browser.',
+                errInvalidImage: 'Ugyldig billedfil.'
+            },
             fr: {
                 base64: 'Image en base64',
                 file: 'Fichier'
@@ -61,7 +67,13 @@
                 file: 'Dosya',
                 errFileReaderNotSupported: 'FileReader tarayıcınız tarafından desteklenmiyor.',
                 errInvalidImage: 'Geçersiz resim dosyası.'
-            }
+            },
+            zh_tw: {
+                base64: '圖片(base64編碼)',
+                file: '檔案',
+                errFileReaderNotSupported: '你的瀏覽器不支援FileReader',
+                errInvalidImage: '不正確的檔案格式'
+             },
         },
         // jshint camelcase:true
 

plugins/colors/trumbowyg.colors.js

@@ -22,10 +22,18 @@
                 foreColor: 'Text color',
                 backColor: 'Background color'
             },
+            da: {
+                foreColor: 'Tekstfarve',
+                backColor: 'Baggrundsfarve'
+            },
             fr: {
                 foreColor: 'Couleur du texte',
                 backColor: 'Couleur de fond'
             },
+            de: {
+                foreColor: 'Textfarbe',
+                backColor: 'Hintergrundfarbe'
+            },
             nl: {
                 foreColor: 'Tekstkleur',
                 backColor: 'Achtergrondkleur'
@@ -38,6 +46,10 @@
                 foreColor: '文字颜色',
                 backColor: '背景颜色'
             },
+            zh_tw: {
+                foreColor: '文字顏色',
+                backColor: '背景顏色'
+            },
             ru: {
                 foreColor: 'Цвет текста',
                 backColor: 'Цвет выделения текста'
@@ -163,6 +175,7 @@
                         {
                             color: {
                                 label: fn,
+                                type: 'color',
                                 value: '#FFFFFF'
                             }
                         },
@@ -182,4 +195,4 @@
 
         return dropdown;
     }
-})(jQuery);
+})(jQuery);

plugins/emoji/trumbowyg.emoji.js

@@ -897,6 +897,9 @@
             en: {
                 emoji: 'Add an emoji'
             },
+            da: {
+                emoji: 'Tilføj et humørikon'
+            },
             fr: {
                 emoji: 'Ajouter un emoji'
             },

plugins/fontfamily/trumbowyg.fontfamily.js

@@ -7,14 +7,23 @@
             en: {
                 fontFamily: 'Font'
             },
+            da: {
+                fontFamily: 'Skrifttype'
+            },
             fr: {
                 fontFamily: 'Police'
             },
+            de: {
+                fontFamily: 'Schriftart'
+            },
             nl: {
                 fontFamily: 'Lettertype'
             },
             tr: {
                 fontFamily: 'Yazı Tipi'
+            },
+            zh_tw:{
+                fontFamily: '字體',
             }
         }
     });

plugins/fontsize/trumbowyg.fontsize.js

@@ -13,6 +13,22 @@
                     'large': 'Large',
                     'x-large': 'Extra large',
                     'custom': 'Custom'
+                },
+                fontCustomSize: {
+                    title: 'Custom Font Size',
+                    label: 'Font Size',
+                    value: '48px'
+                }
+            },
+            da: {
+                fontsize: 'Skriftstørrelse',
+                fontsizes: {
+                    'x-small': 'Ekstra lille',
+                    'small': 'Lille',
+                    'medium': 'Normal',
+                    'large': 'Stor',
+                    'x-large': 'Ekstra stor',
+                    'custom': 'Brugerdefineret'
                 }
             },
             fr: {
@@ -26,6 +42,17 @@
                     'custom': 'Douane'
                 }
             },
+            de: {
+                fontsize: 'Font size',
+                fontsizes: {
+                    'x-small': 'Sehr klein',
+                    'small': 'Klein',
+                    'medium': 'Normal',
+                    'large': 'Groß',
+                    'x-large': 'Sehr groß',
+                    'custom': 'Benutzerdefiniert'
+                }
+            },
             nl: {
                 fontsize: 'Lettergrootte',
                 fontsizes: {
@@ -47,6 +74,22 @@
                     'x-large': 'Çok Büyük',
                     'custom': 'Görenek'
                 }
+            },
+            zh_tw: {
+                fontsize: '字體大小',
+                fontsizes: {
+                    'x-small': '最小',
+                    'small': '小',
+                    'medium': '中',
+                    'large': '大',
+                    'x-large': '最大',
+                    'custom': '自訂大小',
+                },
+                fontCustomSize: {
+                    title: '自訂義字體大小',
+                    label: '字體大小',
+                    value: '48px'
+                }
             }
         }
     });
@@ -83,11 +126,11 @@
         var freeSizeButtonName = 'fontsize_custom',
             freeSizeBtnDef = {
                 fn: function () {
-                    trumbowyg.openModalInsert('Custom Font Size',
+                    trumbowyg.openModalInsert(trumbowyg.lang.fontCustomSize.title,
                         {
                             size: {
-                                label: 'Font Size',
-                                value: '48px'
+                                label: trumbowyg.lang.fontCustomSize.label,
+                                value: trumbowyg.lang.fontCustomSize.value
                             }
                         },
                         function (values) {
@@ -114,4 +157,4 @@
 
         return dropdown;
     }
-})(jQuery);
+})(jQuery);

plugins/history/trumbowyg.history.js

@@ -22,11 +22,23 @@
                     undo: 'Undo'
                 }
             },
+            da: {
+                history: {
+                    redo: 'Annuller fortryd',
+                    undo: 'Fortryd'
+                }
+            },
             fr: {
                 history: {
                     redo: 'Annuler',
                     undo: 'Rétablir'
                 }
+            },
+            zh_tw: {
+               history: {
+                   redo: '重做',
+                   undo: '復原'
+               }
             }
         },
         plugins: {
@@ -187,4 +199,4 @@
             }
         }
     });
-})(jQuery);
+})(jQuery);

plugins/insertaudio/trumbowyg.insertaudio.js

@@ -36,6 +36,9 @@
             en: {
                 insertAudio: 'Insert Audio'
             },
+            da: {
+                insertAudio: 'Indsæt lyd'
+            },
             fr: {
                 insertAudio: 'Insérer un son'
             },

plugins/lineheight/trumbowyg.lineheight.js

@@ -13,6 +13,15 @@
                     '2.0':    'Extra large'
                 }
             },
+            da: {
+                lineheight: 'Linjehøjde',
+                lineheights: {
+                    '0.9':    'Lille',
+                    'normal': 'Normal',
+                    '1.5':    'Stor',
+                    '2.0':    'Ekstra stor'
+                }
+            },
             fr: {
                 lineheight: 'Hauteur de ligne',
                 lineheights: {
@@ -39,7 +48,16 @@
                     '1.5':    'Büyük',
                     '2.0':    'Çok Büyük'
                 }
-            }
+            },
+            zh_tw: {
+                lineheight: '文字間距',
+                lineheights: {
+                    '0.9': '小',
+                    'normal': '正常',
+                    '1.5': '大',
+                    '2.0': '特大'
+                }
+            },
         }
     });
     // jshint camelcase:true

plugins/mathml/trumbowyg.mathml.js

@@ -16,6 +16,11 @@
                 formulas: 'Formulas',
                 inline: 'Inline'
             },
+            da: {
+                mathml: 'Indsæt formler',
+                formulas: 'Formler',
+                inline: 'Inline'
+            },
             fr: {
                 mathml: 'Inserer une formule',
                 formulas: 'Formule',
@@ -25,7 +30,12 @@
                 mathml: 'Formül Ekle',
                 formulas: 'Formüller',
                 inline: 'Satır içi'
-            }
+            },
+            zh_tw: {
+                mathml: '插入方程式',
+                formulas: '方程式',
+                inline: '內嵌'
+            },
         },
         plugins: {
             mathml: {

plugins/mention/trumbowyg.mention.js

@@ -22,6 +22,9 @@
             en: {
                 mention: 'Mention'
             },
+            da: {
+                mention: 'Nævn'
+            },
             fr: {
                 mention: 'Mentioner'
             },
@@ -30,7 +33,10 @@
             },
             tr: {
                 mention: 'Bahset'
-            }
+            },
+            zh_tw: {
+                mention: '標記'
+            },
         },
 
         plugins: {

plugins/noembed/trumbowyg.noembed.js

@@ -23,6 +23,9 @@
                 noembed: 'Noembed',
                 noembedError: 'Error'
             },
+            da: {
+                noembedError: 'Fejl'
+            },
             sk: {
                 noembedError: 'Chyba'
             },
@@ -40,7 +43,11 @@
             },
             tr: {
                 noembedError: 'Hata'
-            }
+            },
+            zh_tw: {
+                noembed: '插入影片',
+                noembedError: '錯誤'
+            },
         },
 
         plugins: {
@@ -101,4 +108,4 @@
             }
         }
     });
-})(jQuery);
+})(jQuery);