The font style menu is now translatable (Heading, etc)

diff --git a/lang/en/editor.php b/lang/en/editor.php
index 449d570bd1b3c9e36c6ca1870e756a737a429caf..454a59f9ce6e0093b7d6a8c10b890dc475b028d8 100644 (file)
--- a/lang/en/editor.php
+++ b/lang/en/editor.php
@@ -4,6 +4,7 @@
 $string['about'] = "About this editor";
 $string['absbottom'] = "Absbottom";
 $string['absmiddle'] = "Absmiddle";
+$string['address'] = "Address";
 $string['alignment'] = "Alignment";
 $string['alternatetext'] = "Alternate text";
 $string['baseline'] = "Baseline";
@@ -22,6 +23,7 @@ $string['copy'] = "Copy selection";
 $string['createlink'] = "Insert Web Link";
 $string['cut'] = "Cut selection";
 $string['forecolor'] = "Font Color";
+$string['heading'] = "Heading";
 $string['hilitecolor'] = "Background Color";
 $string['horizontal'] = "Horizontal";
 $string['horizontalrule'] = "Horizontal Rule";
@@ -40,6 +42,7 @@ $string['justifyright'] = "Justify Right";
 $string['layout'] = "Layout";
 $string['left'] = "Left";
 $string['middle'] = "Middle";
+$string['normal'] = "Normal";
 $string['notset'] = "Not Set";
 $string['ok'] = "OK";
 $string['orderedlist'] = "Ordered List";
@@ -49,6 +52,7 @@ $string['path'] = "Path";
 $string['percent'] = "Percent";
 $string['pixels'] = "Pixels";
 $string['popupeditor'] = "Enlarge Editor";
+$string['preformatted'] = "Preformatted";
 $string['preview'] = "Preview";
 $string['redo'] = "Redo your last action";
 $string['right'] = "Right";

diff --git a/lib/editor/htmlarea.php b/lib/editor/htmlarea.php
index a96d436724bf04743b455b7fec49a128259bb62e..d5870e22efb3fb836053bf5f7d117b5347c44b89 100644 (file)
--- a/lib/editor/htmlarea.php
+++ b/lib/editor/htmlarea.php
@@ -15,6 +15,11 @@
        if (empty($lang)) {
                $lang = "en";
        }
+
+    $strheading = get_string("heading", "editor");
+    $strnormal = get_string("normal", "editor");
+    $straddress = get_string("address", "editor");
+    $strpreformatted = get_string("preformatted", "editor");
 ?>
 
 //
@@ -122,10 +127,10 @@ HTMLArea.Config = function () {
                "Arial":           'arial,helvetica,sans-serif',
                "Courier New":     'courier new,courier,monospace',
                "Georgia":         'georgia,times new roman,times,serif',
+               "Impact":          'impact',
                "Tahoma":          'tahoma,arial,helvetica,sans-serif',
                "Times New Roman": 'times new roman,times,serif',
                "Verdana":         'verdana,arial,helvetica,sans-serif',
-               "impact":          'impact',
                "WingDings":       'wingdings'
        };
 
@@ -140,15 +145,15 @@ HTMLArea.Config = function () {
        };
 
        this.formatblock = {
-               "Heading 1": "h1",
-               "Heading 2": "h2",
-               "Heading 3": "h3",
-               "Heading 4": "h4",
-               "Heading 5": "h5",
-               "Heading 6": "h6",
-               "Normal": "p",
-               "Address": "address",
-               "Formatted": "pre"
+               "<?php echo $strheading ?> 1": "h1",
+               "<?php echo $strheading ?> 2": "h2",
+               "<?php echo $strheading ?> 3": "h3",
+               "<?php echo $strheading ?> 4": "h4",
+               "<?php echo $strheading ?> 5": "h5",
+               "<?php echo $strheading ?> 6": "h6",
+               "<?php echo $strnormal ?>": "p",
+               "<?php echo $straddress ?>": "address",
+               "<?php echo $strpreformatted ?>": "pre"
        };
 
        this.customSelects = {};
@@ -197,7 +202,7 @@ HTMLArea.Config = function () {
                outdent: [ "Decrease Indent", "ed_indent_less.gif", false, function(e) {e.execCommand("outdent");} ],
                indent: [ "Increase Indent", "ed_indent_more.gif", false, function(e) {e.execCommand("indent");} ],
                forecolor: [ "Font Color", "ed_color_fg.gif", false, function(e) {e.execCommand("forecolor");} ],
-               hilitecolor: [ "Background Color", "ed_color_bg.gif", false, function(e) {e.execCommand("hilitecolor");} ],
+               hilitecolor: [ "Background Colorxxx", "ed_color_bg.gif", false, function(e) {e.execCommand("hilitecolor");} ],
                inserthorizontalrule: [ "Horizontal Rule", "ed_hr.gif", false, function(e) {e.execCommand("inserthorizontalrule");} ],
                createlink: [ "Insert Web Link", "ed_link.gif", false, function(e) {e.execCommand("createlink", true);} ],
                insertimage: [ "Insert Image", "ed_image.gif", false, function(e) {e.execCommand("insertimage");} ],