Ticket #7948: 7948.patch

_source/lang/en.js

@@ -121 +121 @@
                 alignBottom             : 'Bottom',
                 invalidHeight   : 'Height must be a number.',
                 invalidWidth    : 'Width must be a number.',
-                invalidCssLength        : 'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',
-                invalidHtmlLength       : 'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',
+                invalidCssLength        : 'Value specified for the "%1" field must be a positive number with or without a valid #{common.cssLengthUnit}',
+                invalidHtmlLength       : 'Value specified for the "%1" field must be a positive number with or without a valid #{common.htmlLengthUnit}',
+                cssLengthUnit : 'CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',
+                htmlLengthUnit : 'HTML measurement unit (px or %).',
 
                 // Put the voice-only part of the label in the span.
                 unavailable             : '%1<span class="cke_accessibility">, unavailable</span>'
@@ -257 +259 @@
                 rows            : 'Rows',
                 columns         : 'Columns',
                 border          : 'Border size',
+                widthTitle : 'Table width specified with or without a valid #{common.cssLengthUnit}',
+                heightTitle : 'Table height specified with or without a valid #{common.cssLengthUnit}',
                 widthPx         : 'pixels',
                 widthPc         : 'percent',
                 widthUnit       : 'width unit',

_source/plugins/table/dialogs/table.js

@@ -409 +409 @@
                                                                                                         id : 'txtWidth',
                                                                                                         controlStyle : 'width:5em',
                                                                                                         label : editor.lang.common.width,
+                                                                                                        title : editor.lang.table.widthTitle,
                                                                                                         'default' : 500,
                                                                                                         getValue : defaultToPixel,
                                                                                                         validate : CKEDITOR.dialog.validate.cssLength( editor.lang.common.invalidCssLength.replace( '%1', editor.lang.common.width ) ),
@@ -436 +437 @@
                                                                                                         id : 'txtHeight',
                                                                                                         controlStyle : 'width:5em',
                                                                                                         label : editor.lang.common.height,
+                                                                                                        title : editor.lang.table.heightTitle,
                                                                                                         'default' : '',
                                                                                                         getValue : defaultToPixel,
                                                                                                         validate : CKEDITOR.dialog.validate.cssLength( editor.lang.common.invalidCssLength.replace( '%1', editor.lang.common.height ) ),

_source/core/lang.js

@@ -7 +7 @@
 {
         var loadedLangs = {};
 
+        /*
+         * Process all references embedded in the translation entry.
+         */
+        function resolveLang( lang )
+        {
+                function replacer( match, property )
+                {
+                        var props= property.split( '.' ),
+                                val = lang;
+
+                        for ( var i = 0; i < props.length && val; i++ )
+                                val = val[ props[ i ] ];
+
+                        return val;
+                }
+
+                function traverse( obj )
+                {
+                        for ( var name in obj )
+                        {
+                                var val = obj[ name ];
+                                if ( typeof val == 'object' )
+                                         traverse( val );
+                                else
+                                        obj[ name ] = val.replace( /#\{(.*?)\}/g, replacer )
+                        }
+                }
+
+                traverse( lang );
+        }
+
         /**
          * @namespace Holds language related functions.
          */
@@ -108 +139 @@
                                         'lang/' + languageCode + '.js' ),
                                         function()
                                                 {
+                                                        resolveLang( this[ languageCode ] );
                                                         callback( languageCode, this[ languageCode ] );
                                                 }
                                                 , this );