Changeset 7294

Timestamp:

10/25/11 10:33:09 (19 months ago)

Author:

wwalc

Message:

CKLangTool can now process language files located in plugins folders.

Location:

CKLangTool/trunk

Files:

• _source/includes/cklangtool.js (modified) (3 diffs)
• bin/langtool.exe (modified) (previous)
• bin/langtool.jar (modified) (previous)
• test/_assets/translator2 (added)
• test/_assets/translator2/_translationstatus.txt.correct.txt (added)
• test/_assets/translator2/en.js (added)
• test/_assets/translator2/he.js (added)
• test/_assets/translator2/he.js.correct.txt (added)
• test/test.js (modified) (5 diffs)

CKLangTool/trunk/_source/includes/cklangtool.js

@@ -56 +56 @@
                 {
                         case CKLANGTOOL.FORMAT_JSON:
-                                var translationCode = 'var CKEDITOR = { lang : {} }; ' + CKLANGTOOL.io.readFile( file );
+                                var translationCode = 'var CKEDITOR = { lang : {}, plugins : { setLang : function(plugin, langCode, obj) { CKEDITOR.lang[langCode] = obj; } } }; ' + CKLANGTOOL.io.readFile( file );
 
                                 var cx = Context.enter(), scope = cx.initStandardObjects();
@@ -243 +243 @@
                 fileOverview :Pattern.compile( " @fileOverview" ),
                 translation :Pattern.compile( "#ckeditor_translation[^#]*?#" ),
-                ckeditorLang :Pattern.compile( "(.*CKEDITOR\\.lang\\[).*?(\\]\\s*=.*)" )
+                ckeditorLang :Pattern.compile( "(.*CKEDITOR\\.lang\\[).*?(\\]\\s*=.*)" ),
+                ckeditorSetLang :Pattern.compile( "(.*CKEDITOR\\.plugins\\.setLang\\s*\\(.*?,)\\s*['\"][a-z-]+['\"](.*)" )
         };
 
@@ -440 +441 @@
                                 }
 
+                                /*
+                                 * CKEDITOR.plugins.setLang( 'uicolor', 'en',
+                                 */
+                                matcher = regexLib.ckeditorSetLang.matcher( line );
+                                if ( matcher.find() )
+                                {
+                                        out.push( matcher.group( 1 ) + "'#ckeditor_translation.__languageCode#'" + matcher.group( 2 ) );
+                                        continue;
+                                }
+
                                 /* 
                                  * Get rid of all escaped quotes, we don't need the exact content at this stage, just the key.

CKLangTool/trunk/test/test.js

@@ -1 +1 @@
 /*
-Copyright (c) 2003-2008, Frederico Caldeira Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -99 +99 @@
                         error( "Can't create temp directory: " + tempDir );
 
-                var tests = [ 'gettext', 'gettext/out', 'jprops', 'jprops/out', 'translator' ];
+                var tests = [ 'gettext', 'gettext/out', 'jprops', 'jprops/out', 'translator', 'translator2' ];
 
                 for ( var i = 0 ; i < tests.length ; i++ )
@@ -109 +109 @@
         }
         
-        function testTranslator()
+        function testTranslator( folder )
         {
-                CKLANGTOOL.languageDir = new File( 'tmp/translator' );
-                CKLANGTOOL.templateFile = new File( 'tmp/translator', 'en.js' );
+                CKLANGTOOL.languageDir = new File( 'tmp/' + folder );
+                CKLANGTOOL.templateFile = new File( 'tmp/' + folder, 'en.js' );
                 
-                var name = 'translator';
-                var dir = new File( '_assets/translator' );
+                var dir = new File( '_assets/' + folder );
                 var dirList = dir.list();
                 
@@ -135 +134 @@
                         testName = dirList[i].replace( ".correct.txt", "" );
 
-                        tempFile = new File( 'tmp/' + name + '/' + testName );
-                        correctFile = new File( 'tmp/' + name + '/' + testName + '.correct.txt' );
+                        tempFile = new File( 'tmp/' + folder + '/' + testName );
+                        correctFile = new File( 'tmp/' + folder + '/' + testName + '.correct.txt' );
 
                         var date = new Date(),
@@ -181 +180 @@
 
         prepareTempDirs();
-        testTranslator();
+        testTranslator('translator');
+        testTranslator('translator2');
         testFormat('gettext');
         testFormat('jprops');