Changeset 290

Timestamp:

08/05/05 10:04:54 (8 years ago)

Author:

niko

Message:

#39: images as internationalized resources
for German bold, italic and underline icons
see wiki:Documentation/Internationalisation for details on how to use it

also changed the syntax for replacements in i18n-strings #291 (the old one still works)

Location:

trunk

Files:

• htmlarea.js (modified) (3 diffs)
• images/de (added)
• images/de/bold.gif (added)
• images/de/italic.gif (added)
• images/de/underline.gif (added)
• lang/de.js (modified) (1 diff)
• plugins/ContextMenu/context-menu.js (modified) (1 diff)

trunk/htmlarea.js

@@ -395 +395 @@
   //    - Enabled in text mode: if false the button gets disabled for text-only mode; otherwise enabled all the time.
   this.btnList = {
-    bold:          [ "Bold",   ["ed_buttons_main.gif",3,2], false, function(e) {e.execCommand("bold");} ],
-    italic:        [ "Italic", ["ed_buttons_main.gif",2,2], false, function(e) {e.execCommand("italic");} ],
-    underline:     [ "Underline", ["ed_buttons_main.gif",2,0], false, function(e) {e.execCommand("underline");} ],
-    strikethrough: [ "Strikethrough", ["ed_buttons_main.gif",3,0], false, function(e) {e.execCommand("strikethrough");} ],
-    subscript:     [ "Subscript", ["ed_buttons_main.gif",3,1], false, function(e) {e.execCommand("subscript");} ],
-    superscript:   [ "Superscript", ["ed_buttons_main.gif",2,1], false, function(e) {e.execCommand("superscript");} ],
+    bold:          [ "Bold",   HTMLArea._lc({key: 'button_bold', string: ["ed_buttons_main.gif",3,2]}, 'HTMLArea'), false, function(e) {e.execCommand("bold");} ],
+    italic:        [ "Italic", HTMLArea._lc({key: 'button_italic', string: ["ed_buttons_main.gif",2,2]}, 'HTMLArea'), false, function(e) {e.execCommand("italic");} ],
+    underline:     [ "Underline", HTMLArea._lc({key: 'button_underline', string: ["ed_buttons_main.gif",2,0]}, 'HTMLArea'), false, function(e) {e.execCommand("underline");} ],
+    strikethrough: [ "Strikethrough", HTMLArea._lc({key: 'button_strikethrough', string: ["ed_buttons_main.gif",3,0]}, 'HTMLArea'), false, function(e) {e.execCommand("strikethrough");} ],
+    subscript:     [ "Subscript", HTMLArea._lc({key: 'button_subscript', string: ["ed_buttons_main.gif",3,1]}, 'HTMLArea'), false, function(e) {e.execCommand("subscript");} ],
+    superscript:   [ "Superscript", HTMLArea._lc({key: 'button_superscript', string: ["ed_buttons_main.gif",2,1]}, 'HTMLArea'), false, function(e) {e.execCommand("superscript");} ],
 
     justifyleft:   [ "Justify Left", ["ed_buttons_main.gif",0,0], false, function(e) {e.execCommand("justifyleft");} ],
@@ -5213 +5213 @@
   if(_editor_lang == "en")
   {
-    ret = string;
+    if(typeof string == 'object' && string.string) {
+        ret = string.string;
+    } else {
+        ret = string;
+    }
   }
   else
@@ -5232 +5236 @@
     }
 
-    if(typeof HTMLArea._lc_catalog[context][string] == 'undefined')
+    var key;
+    if(typeof string == 'object' && string.key)
+    {
+      key = string.key;
+    }
+    else
+    {
+      key = string;
+    }
+
+    if(typeof HTMLArea._lc_catalog[context][key] == 'undefined')
     {
       if(context=='HTMLArea')
       {
-        ret = string; // Indicate it's untranslated
+        // Indicate it's untranslated
+        if(typeof string == 'object' && string.string) {
+          ret = string.string;
+        } else {
+          ret = string;
+        }
       }
       else
       {
         //if string is not found and context is not HTMLArea try if it is in HTMLArea
-        ret = HTMLArea._lc(string, 'HTMLArea');
+        return HTMLArea._lc(string, 'HTMLArea', replace);
       }
     }
     else
     {
-      ret = HTMLArea._lc_catalog[context][string];
-    }
-  }
-
+      ret = HTMLArea._lc_catalog[context][key];
+    }
+  }
+
+  if(typeof string == 'object' && string.replace)
+  {
+    replace = string.replace;
+  }
   if(typeof replace != "undefined")
   {

trunk/lang/de.js

@@ -130 +130 @@
         "Positioning of this image": "Positionierung dieses Bildes",
         "Image Preview:": "Bild Voransicht:",
-        "You must enter the URL": "Bitte geben Sie die URL ein"
+        "You must enter the URL": "Bitte geben Sie die URL ein",
+
+        "button_bold": "de/bold.gif",
+        "button_italic": "de/italic.gif",
+        "button_underline": "de/underline.gif"
+        
 }

trunk/plugins/ContextMenu/context-menu.js

@@ -214 +214 @@
         if (!/html|body/i.test(currentTarget.tagName))
                 menu.push(null,
-                          [ HTMLArea._lc("Remove the $elem Element...", "ContextMenu", {elem: "<" + currentTarget.tagName + ">"}),
+                          [ HTMLArea._lc({string: "Remove the $elem Element...", replace: {elem: "<" + currentTarget.tagName + ">"}}, "ContextMenu"),
                             function() {
                                     if (confirm(HTMLArea._lc("Please confirm that you want to remove this element:", "ContextMenu") + " " +