Changeset 7311

Timestamp:

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

Author:

wwalc

Message:

CKLangTool can now generate meta files.

Location:

CKLangTool/trunk

Files:

• _dev/build.xml (modified) (2 diffs)
• _source/includes/ckmetaformat.js (added)
• _source/langtool.js (modified) (3 diffs)
• bin/langtool.exe (modified) (previous)
• bin/langtool.jar (modified) (previous)
• test/_assets/meta (added)
• test/_assets/meta/en.js (added)
• test/_assets/meta/meta.txt (added)
• test/_assets/meta/meta.txt.correct.txt (added)
• test/test.js (modified) (3 diffs)

CKLangTool/trunk/_dev/build.xml

@@ -27 +27 @@
                         <arg value="${source.dir}/includes/cklangtool.js" />
                         <arg value="${source.dir}/includes/ckjpformat.js" />
+                        <arg value="${source.dir}/includes/ckmetaformat.js" />
                         <arg value="${source.dir}/includes/ckpoformat.js" />
                         <arg value="${source.dir}/includes/po_parser.js" />
@@ -39 +40 @@
                 <copy file="${source.dir}/includes/cklangtool/includes/cklangtool.class" tofile="${build.dir}/cklangtool/includes/cklangtool.class" overwrite="true" />
                 <copy file="${source.dir}/includes/cklangtool/includes/ckjpformat.class" tofile="${build.dir}/cklangtool/includes/ckjpformat.class" overwrite="true" />
+                <copy file="${source.dir}/includes/cklangtool/includes/ckmetaformat.class" tofile="${build.dir}/cklangtool/includes/ckmetaformat.class" overwrite="true" />
                 <copy file="${source.dir}/includes/cklangtool/includes/ckpoformat.class" tofile="${build.dir}/cklangtool/includes/ckpoformat.class" overwrite="true" />
                 <copy file="${source.dir}/includes/cklangtool/includes/po_parser.class" tofile="${build.dir}/cklangtool/includes/po_parser.class" overwrite="true" />

CKLangTool/trunk/_source/langtool.js

@@ -56 +56 @@
 CKLANGTOOL.load( 'cklangtool.includes.ckjpformat' );
 CKLANGTOOL.load( 'cklangtool.includes.ckpoformat' );
+CKLANGTOOL.load( 'cklangtool.includes.ckmetaformat' );
 CKLANGTOOL.load( 'cklangtool.includes.po_parser' );
 CKLANGTOOL.load( 'cklangtool.includes.io' );
@@ -68 +69 @@
 
                         + '\n\nOptions:'
-                        + '\n[-f|--format]=json|gettext|jprops  Format of language file when update from or export translation entries to, default to json.'
+                        + '\n[-f|--format]=json|gettext|jprops|meta  Format of language file when update from or export translation entries to, default to json.'
                         + '\n\t json - A private JavaScript format used as runtime language files in CKEditor.'
-                        + '\n\t getext - The versatile GNU Gettext format, simplified to fit for CKEditor.'
+                        + '\n\t gettext - The versatile GNU Gettext format, simplified to fit for CKEditor.'
                         + '\n\t jprops - The Java Properties file format.'
+                        + '\n\t meta - The meta file with context information (used by the gettext method).'
                         + '\n[-m|--metafile]=path  Specify the path to an optional meta file which used only by the Gettext format for context information.'
                         + '\n[-c|--config]=path  Specify the path to an optional configuration file.'
@@ -159 +161 @@
 if ( action == 'update' )
 {
-        var translator = new CKLANGTOOL.translator();
-        translator.run( CKLANGTOOL.destinationDir || CKLANGTOOL.languageDir );
+        if ( CKLANGTOOL.format == 'meta' )
+        {
+                new CKLANGTOOL.meta().run();
+        }
+        else
+        {
+                var translator = new CKLANGTOOL.translator();
+                translator.run( CKLANGTOOL.destinationDir || CKLANGTOOL.languageDir );
+        }
 }
 // Export translations to other formats.

CKLangTool/trunk/test/test.js

@@ -99 +99 @@
                         error( "Can't create temp directory: " + tempDir );
 
-                var tests = [ 'gettext', 'gettext/out', 'jprops', 'jprops/out', 'translator', 'translator2' ];
+                var tests = [ 'gettext', 'gettext/out', 'jprops', 'jprops/out', 'translator', 'translator2', 'meta', 'meta/out' ];
 
                 for ( var i = 0 ; i < tests.length ; i++ )
@@ -149 +149 @@
                 CKLANGTOOL.destinationDir = new File( tmpDir + '/out' );
                 CKLANGTOOL.templateFile = new File( tmpDir, 'en.js' );
-                
+
+                if ( format == 'meta' )
+                {
+                        CKLANGTOOL.metaFile = '_assets/meta/meta.txt';
+                }
                 var dir = new File( '_assets/' + format );
                 var dirList = dir.list();
@@ -184 +188 @@
         testFormat('gettext');
         testFormat('jprops');
+        testFormat('meta');
 
         print( '' );