Ticket #7983: 7983_2.patch

_source/langtool.js

@@ -53 +53 @@
 
 CKLANGTOOL.isCompiled = isCompiled;
 CKLANGTOOL.load( 'cklangtool.includes.ckjpformat' );
+CKLANGTOOL.load( 'cklangtool.includes.ckpoformat' );
 CKLANGTOOL.load( 'cklangtool.includes.io' );
 
 if ( !arguments[0] || arguments[0] == '-help' || arguments[0] == '/?' )
-        error( 'Usage: ' + command + ' lang_dir [-jpformat=dest_dir]'
+        error( 'Usage: ' + command + ' lang_dir [-jpformat=dest_dir]|[-poformat=dest_dir]'
                         + '\n\n CKLangTool corrects translation files and creates report about missing translations.'
-                        + '\n\n -jpformat  Convert files to java properties format and save them in dest_dir.\n' );
+                        + '\n\n -jpformat  Convert files to java properties format and save them in dest_dir'
+                        + '\n\n -poformat  Convert files to GNU gettext PO format and save them in dest_dir.\n' );
 
 for ( var i = 0 ; i < arguments.length ; i++ )
 {
-        if ( arguments[i].indexOf( "-jpformat=" ) != -1 )
+        var arg = arguments[i], match;
+        if ( match = arg.match( /^-(\w+format)=(.*?)$/ ) )
         {
-                var destDir = arguments[i].substring( arguments[i].indexOf( "=" ) + 1 );
+                var destDir = match[ 2 ];
                 CKLANGTOOL.destinationDir = new File( destDir );
                 if ( CKLANGTOOL.destinationDir.exists() )
-                        error( 'Destination directory already exists: ' + CKLANGTOOL.destinationDir.getAbsolutePath() );
+                {
+                        print( 'Remove directory already exists: ' + CKLANGTOOL.destinationDir.getAbsolutePath() );
+                        CKLANGTOOL.destinationDir[ 'delete' ]();
+                }
                 else
                         CKLANGTOOL.destinationDir.mkdir();
-                CKLANGTOOL.operation = "jpformat";
+                CKLANGTOOL.format = match[ 1 ];
         }
 }
 
@@ -98 +104 @@
 {
         try
         {
-                if ( CKLANGTOOL.operation == "jpformat" )
+                // Convert or sync languages files from other format.
+                if ( CKLANGTOOL.format )
                 {
-                        var jpformat = new CKLANGTOOL.jpformat();
-                        jpformat.run();
+                        var format = new CKLANGTOOL[ CKLANGTOOL.format ]();
+                        format.run();
                 }
                 else
                 {

_source/includes/cklangtool.js

@@ -10 +10 @@
         isCompiled : false,
         languageDir : "",
         templateFile : "",
-        operation : "default",
+        format : "default",
         /**
          * Holds the content of en.js language file where strings are replaced with
          * special placeholders: #ckeditor_translation.placeholder.key#.
@@ -37 +37 @@
 
 /**
  * Load language file and return an object with the whole translation.
+ * @param {Boolean} translatedOnly When set to true will ignore all entries that are marked as missing.
  */
-CKLANGTOOL.loadLanguageFile = function( file )
+CKLANGTOOL.loadLanguageFile = function( file, translatedOnly )
 {
-        var translationCode = 'var CKEDITOR = { lang : {} }; ' + CKLANGTOOL.io.readFile( file );
+        var content = CKLANGTOOL.io.readFile( file );
 
+        // Dismiss line marked by comment marker - MISSING.
+        if( translatedOnly )
+                content = content.replace( /^.*\/\/ MISSING$/gm, '' );
+
+        var translationCode = 'var CKEDITOR = { lang : {} }; ' + content;
+
         var cx = Context.enter(), scope = cx.initStandardObjects();
 
         try
@@ -266 +273 @@
          * #ckeditor_translation.__fileOverview# (the block comment with the file
          * description)
          */
-        function createTemplate( file )
+        CKLANGTOOL.translator.createTemplate = function( file )
         {
                 var key = "ckeditor_translation";
                 var out = [];
@@ -427 +434 @@
          * If translation contains dots, for example: common.textField then return
          * translation[common][textfield]
          */
-        function getTranslation( translation, translationKey )
+        CKLANGTOOL.translator.getTranslation = function( translation, translationKey )
         {
                 var dotPos;
                 var result = translation;
@@ -507 +514 @@
                          * #ckeditor_translation.common.textField# -> common.textField
                          */
                         translationKey = matchResult.group( 0 ).slice( 22, -1 );
-                        replacement = getTranslation( translation, translationKey );
+                        replacement = CKLANGTOOL.translator.getTranslation( translation, translationKey );
 
                         /*
                          * common.textField[1] -> common.textField
@@ -518 +525 @@
                                  * FoldersTitle : '#ckeditor_translation.FoldersTitle#', ->
                                  * FoldersTitle : '[MISSING_TRANSLATION]Folders',
                                  */
-                                replacement = "[MISSING_TRANSLATION]" + getTranslation( CKLANGTOOL.englishTranslation, translationKey );
+                                replacement = "[MISSING_TRANSLATION]" + CKLANGTOOL.translator.getTranslation( CKLANGTOOL.englishTranslation, translationKey );
                                 string = (string.substring( 0, matchResult.start() ) + replacement + string.substring( matchResult.end() ));
 
                                 if ( translationKey.substring( 0, 2 ) != "__" )
@@ -576 +583 @@
         {
                 run : function()
                 {
-                        CKLANGTOOL.template = createTemplate( CKLANGTOOL.templateFile );
+                        CKLANGTOOL.template = CKLANGTOOL.translator.createTemplate( CKLANGTOOL.templateFile );
                         var result = CKLANGTOOL.loadLanguageFile( CKLANGTOOL.templateFile ); 
                         CKLANGTOOL.englishTranslation = result.translation; 
 

_source/includes/ckpoformat.js

@@ +1 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+importPackage( java.util.regex );
+
+( function()
+{
+        CKLANGTOOL.poformat = function()
+        {
+                return {
+                        run : function()
+                        {
+                                var children = CKLANGTOOL.languageDir.list();
+                                var file, poFile;
+                                var foundFiles = false;
+
+                                for ( var i = 0 ; i < children.length ; i++ )
+                                {
+                                        if ( CKLANGTOOL.io.getExtension( children[ i ] ) != "js" || children[ i ].indexOf( '_' ) == 0 )
+                                                continue;
+
+                                        file = new File( CKLANGTOOL.languageDir, children[ i ] );
+                                        if ( file.isFile() )
+                                        {
+                                                poFile =  new File( CKLANGTOOL.destinationDir, children[i].replaceAll( '.js', '.po' ) );
+                                                print( "Processing " + file.getAbsolutePath() );
+
+                                                CKLANGTOOL.io.saveFile( poFile, processFile(file), false );
+                                                foundFiles = true;
+                                        }
+                                }
+
+                                if ( !foundFiles )
+                                {
+                                        print( "WARNING: language files not found." );
+                                }
+
+                                print( "Process completed." );
+                        }
+                };
+        };
+
+        /**
+         * Language code of currently processed file (taken from
+         * CKEDITOR.lang['code']).
+         */
+        var fileOverviewBlock;
+
+        function printObject( prefix, o )
+        {
+                var result = [];
+
+                for ( var key in o )
+                {
+                        var entry = o[ key ],
+                                entryName = prefix ? ( prefix + '.' + key ) : key;
+
+                        if ( typeof entry == 'object' )
+                                result.push( printObject( entryName, entry ) );
+                        else
+                                result.push( poEntry( entryName, entry ) );
+                }
+                
+                return result.join( '' );
+        }
+
+        function msgstrEscape( str )
+        {
+                return str.replace( /"/g, '\\"' ).replace( /\r\n|\n/g, '\\n"$&"' );
+        }
+
+        /**
+         *  Generate a PO translation entry with the following schematic structure:
+         *      whte-space
+         *      # translator-comments
+         *      #.extracted-comments
+         *      #:reference...
+         *      #,flag...
+         *      #|msgid previous-untranslated-string
+         *      msid untranslated-string
+         *      msstr translated-string
+         *
+         * @param {String} id The untranslated string part.
+         * @param {String} str The translated-string part.
+         * @param {String} [ comment1, comment2... ] Translator comments.
+         */
+        function poEntry( id, str, comment )
+        {
+                var entry = [];
+                var comments = Array.prototype.slice.call( arguments, 2 );
+                for ( var i = 0; i < comments.length; i++ )
+                        entry.push( comments[ i ] );
+                entry.push( 'msgid "' + id + '"', 'msgstr "' + msgstrEscape( str ) + '"', '\n' );
+                return entry.join( '\n' );
+        }
+
+        function poHeader()
+        {
+                return [
+                '"Project-Id-Version: CKEditor\\n"',
+                '"Report-Msgid-Bugs-To: http://dev.ckeditor.com/newticket\\n"',
+                '"POT-Creation-Date: 2011-05-31 00:00+0000\\n"',
+                '"PO-Revision-Date: 2011-05-31 00:30+0000\\n"',
+                '"Last-Translator: CKEditor\\n"',
+                '"Language-Team: CKEditor translation team\\n"',
+                '"MIME-Version: 1.0\\n"',
+                '"Content-Type: text/plain; charset=UTF-8\\n"',
+                '"Content-Transfer-Encoding: 8bit\\n"',
+                '"Language: en\\n"',
+                '"Plural-Forms: nplurals=2; plural=(n != 1)\\n"',
+                '\n'
+                ].join( '\n' );
+        }
+        
+        function processFile( file )
+        {
+                // License Info
+                var license = '# Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\n# For licensing, see LICENSE.html or http://ckeditor.com/license';
+                var overview = getFileOverview( file.getAbsolutePath() ).replace( /\{.*?\}/g, '' ).replace( /@fileOverview/g, '' ).replace(/\s*(\/)?\s*(\*)+(\/)?/g , '').replace(/\s+/g, ' ');
+
+                // File Overview
+                var language = CKLANGTOOL.loadLanguageFile( file, true );
+                return poEntry( '', '', license, overview ) + poHeader() + printObject( '', language.translation );
+        }
+
+        var regexLib =
+        {
+                inlineComment :Pattern.compile( "^\\s*\\/\\/" ),
+                blockCommentStart :Pattern.compile( "\\/\\*" ),
+                blockCommentEnd :Pattern.compile( "\\*\\/" ),
+                fileOverview :Pattern.compile( " @fileOverview" )
+        };
+        
+        /**
+         * Returns an array with missing keys (already marked as //MISSING).
+         */
+        function getFileOverview( file )
+        {
+                fileOverviewBlock = '/**\n* @fileOverview \n*/';
+
+                var inBlockComment = false;
+                var blockComment = [];
+                var matcher, line;
+                var lines = CKLANGTOOL.io.readFileIntoArray( file );
+
+                for ( var j = 0 ; j < lines.length ; j++ )
+                {
+                        line = lines[ j ];
+                        if ( !inBlockComment )
+                        {
+                                matcher = regexLib.inlineComment.matcher( line );
+                                if ( matcher.find() )
+                                        continue;
+
+                                matcher = regexLib.blockCommentStart.matcher( line );
+                                if ( matcher.find() )
+                                {
+                                        inBlockComment = true;
+                                        blockComment.push( line );
+                                        continue;
+                                }
+                        }
+                        else
+                        {
+                                blockComment.push( line );
+
+                                matcher = regexLib.blockCommentEnd.matcher( line );
+                                if ( matcher.find() )
+                                {
+                                        inBlockComment = false;
+
+                                        matcher = regexLib.fileOverview.matcher( blockComment.join( "" ) );
+                                        if ( matcher.find() )
+                                                fileOverviewBlock = blockComment.join( "\n" );
+                                        blockComment = [];
+                                }
+                        }
+                }
+
+                return '#' + fileOverviewBlock;
+        }
+        
+})();