Ticket #1172: LangMarks.diff

lang/de.js

@@ -3 +3 @@
 // Author: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
 {
   "language select": "Sprachauswahl",
-  "— language —":   "— Sprache —",
-  "Greek": "griechisch",
-  "English": "englisch",
-  "French": "französisch",
-  "Latin": "lateinisch"
 };
- No newline at end of file

lang/fr.js

@@ -2 +2 @@
 // LANG: "fr", ENCODING: UTF-8
 {
   "language select": "Sélection de la langue",
-  "— language —":   "— Langue —",
-  "Greek": "grec",
-  "English": "anglais",
-  "French": "français",
-  "Latin": "latin"
 };
- No newline at end of file

lang/ja.js

@@ -2 +2 @@
 // LANG: "ja", ENCODING: UTF-8
 {
   "language select": "蚀語の遞択",
-  "— language —":   "— 蚀語 —",
-  "Greek": "ギリシャ語",
-  "English": "英語",
-  "French": "フランス語",
-  "Latin": "ラテン語"
 };
- No newline at end of file

lang/lt.js

@@ +1 @@
+// I18N constants
+// LANG: "lt", ENCODING: UTF-8
+// Author: Rimas Kudelis, rq@akl.lt
+{
+  "language select": "Kalbos parinkimas",
+};
+ No newline at end of file

lang/nb.js

@@ -3 +3 @@
 // translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
 {
   "language select": "Språkvalg",
-  "— language —":   "— SprÃ¥k —",
-  "Greek": "grekisk",
-  "English": "engelsk",
-  "French": "fransk",
-  "Latin": "latin"
 };
- No newline at end of file

lang/nl.js

@@ -3 +3 @@
 // Author: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
 {
   "language select": "Taalkeuze",
-  "— language —":   "— taal —",
-  "Greek": "Grieks",
-  "English": "Engels",
-  "French": "Frans",
-  "Latin": "Latijns"
 };
- No newline at end of file

lang/pt_br.js

@@ -7 +7 @@
 // MSN: tomarshall@msn.com - ICQ: 69419933
 // Site: http://www.mpg.com.br
 //
-// Last revision: 06 september 2007
+// Last revision: 27 march 2008
 // Please donÂŽt remove this information
 // If you modify any source, please insert a comment with your name and e-mail
 //
@@ -15 +15 @@
 // This notice MUST stay intact for use (see license.txt).
 {
   "language select": "Selecionar idioma",
-  "— language —":   "— Idioma —",
-  "Greek": "Grego",
-  "English": "Inglês",
-  "French": "Francês",
-  "Latin": "Latim"
 };
- No newline at end of file

lang-marks.css

@@ -1 @@
-span.el, span.en, span.fr, span.la {
+span.haslang {
         color: red;
-        padding-right: 25px;
-        background-repeat: no-repeat;
-        background-position: right top;
+        background: white;
         border-bottom: 1px solid red;
         white-space : nowrap;
 }
-span.el { /*Griechisch*/
-        background-image: url(img/el.gif);
-}
-span.en { /*Englisch*/
-        background-image: url(img/en.gif);
-}
-span.fr { /*Französisch*/
-        background-image: url(img/fr.gif);
-}
-span.la { /*Latein*/
-        background-image: url(img/la.gif);
+span.haslang::after {
+        content: attr(lang);
+        text-transform: uppercase;
+        font-family: sans-serif;
+        color: white;
+        background: red;
+        border: 1px solid red;
+        font-size: x-small;
+        font-weight: normal;
+        vertical-align: top;
 }
+ No newline at end of file

lang-marks.js

@@ -9 +9 @@
   this.editor = editor;
   var cfg = editor.config;
   var self = this;
-  var options = {};
-  options[this._lc("— language —")] = "";
-  options[this._lc("Greek")] = "el";
-  options[this._lc("English")] = "en";
-  options[this._lc("French")] = "fr";
-  options[this._lc("Latin")] = "la";
+  var options = cfg.LangMarks;
 
   cfg.registerDropdown({
     id  : "langmarks",
@@ -37 +32 @@
   license       : "htmlArea"
 };
 
+Xinha.Config.prototype.LangMarks = {
+  "— language —" : "",
+  "Greek" : "el",
+  "English" : "en",
+  "French" : "fr",
+  "Latin" : "la"
+};
+
 LangMarks.prototype._lc = function(string) {
   return Xinha._lc(string, 'LangMarks');
 };
@@ -56 +59 @@
 LangMarks.prototype.onSelect = function(editor, obj, context, updatecontextclass) {
   var tbobj = editor._toolbarObjects[obj.id];
   var index = tbobj.element.selectedIndex;
-  var className = tbobj.element.value;
+  var language = tbobj.element.value;
 
   // retrieve parent element of the selection
   var parent = editor.getParentElement();
@@ -66 +69 @@
   var update_parent = (context && updatecontextclass && parent && parent.tagName.toLowerCase() == context);
 
   if (update_parent) {
-    parent.className = className;
-    parent.lang = className;
+    parent.className = "haslang";
+    parent.lang = language;
     editor.updateToolbar();
     return;
   }
@@ -84 +87 @@
   if (is_span) {
     // maybe we could simply change the class of the parent node?
     if (parent.childNodes.length == 1) {
-      parent.className = className;
-      parent.lang = className;
+      parent.className = "haslang";
+      parent.lang = language;
       surround = false;
       // in this case we should handle the toolbar updation
       // ourselves.
@@ -99 +102 @@
     // shit happens ;-) most of the time.  this method works, but
     // it's dangerous when selection spans multiple block-level
     // elements.
-    editor.surroundHTML('<span lang="' + className + '" class="' + className + '">', '</span>');
+    editor.surroundHTML('<span lang="' + language + '" class="haslang">', '</span>');
   }
 };