Merge pull request #12 from pepr/master

Almost all translators converted to UTF-8

doc/.gitignore

+mailto.txt
\ No newline at end of file

doc/language.doc

@@ -91,7 +91,7 @@ when the translator was updated.
     <td>Chinese Traditional</td>
     <td>Daniel YC Lin<br/>Gary Lee</td>
     <td>dlin dot tw at gmail dot com<br/>garywlee at gmail dot com</td>
-    <td>1.8.0</td>
+    <td>up-to-date</td>
   </tr>
   <tr bgcolor="#ffffff">
     <td>Croatian</td>
@@ -173,7 +173,7 @@ when the translator was updated.
   </tr>
   <tr bgcolor="#ffffff">
     <td>Japanese</td>
-    <td>Hiroki Iseri<br/>Ryunosuke Satoh<br/>Kenji Nagamatsu<br/>Iwasa Kazmi</td>
+    <td>Hiroki Iseri<br/>Ryūnosuke Satoh<br/>Kenji Nagamatsu<br/>Iwasa Kazmi</td>
     <td>goyoki at gmail dot com<br/>sun594 at hotmail dot com<br/>naga at joyful dot club dot ne dot jp<br/><span style="color: brown">[unreachable]</span></td>
     <td>1.6.0</td>
   </tr>
@@ -335,7 +335,7 @@ when the translator was updated.
   ~ & Li Daobing & {\tt\tiny lidaobing at gmail dot com} & ~ \\
   ~ & Wei Liu & {\tt\tiny liuwei at asiainfo dot com} & ~ \\
   \hline
-  Chinese Traditional & Daniel YC Lin & {\tt\tiny dlin dot tw at gmail dot com} & 1.8.0 \\
+  Chinese Traditional & Daniel YC Lin & {\tt\tiny dlin dot tw at gmail dot com} & up-to-date \\
   ~ & Gary Lee & {\tt\tiny garywlee at gmail dot com} & ~ \\
   \hline
   Croatian & Boris Bralo & {\tt\tiny boris dot bralo at gmail dot com} & 1.8.2 \\
@@ -371,7 +371,7 @@ when the translator was updated.
   ~ & Ahmed Aldo Faisal & {\tt\tiny aaf23 at cam dot ac dot uk} & ~ \\
   \hline
   Japanese & Hiroki Iseri & {\tt\tiny goyoki at gmail dot com} & 1.6.0 \\
-  ~ & Ryunosuke Satoh & {\tt\tiny sun594 at hotmail dot com} & ~ \\
+  ~ & Ryūnosuke Satoh & {\tt\tiny sun594 at hotmail dot com} & ~ \\
   ~ & Kenji Nagamatsu & {\tt\tiny naga at joyful dot club dot ne dot jp} & ~ \\
   ~ & Iwasa Kazmi & {\tt\tiny [unreachable] iwasa at cosmo-system dot jp} & ~ \\
   \hline

doc/maintainers.txt

@@ -86,7 +86,7 @@ Ahmed Aldo Faisal: aaf23 at cam dot ac dot uk
 
 TranslatorJapanese
 Hiroki Iseri: goyoki at gmail dot com
-Ryunosuke Satoh: sun594 at hotmail dot com
+Ryūnosuke Satoh: sun594 at hotmail dot com
 Kenji Nagamatsu: naga at joyful dot club dot ne dot jp
 Iwasa Kazmi: [unreachable] iwasa at cosmo-system dot jp
 

doc/translator.py

@@ -16,9 +16,7 @@
   Originally, the script was written in Perl and was known as translator.pl.
   The last Perl version was dated 2002/05/21 (plus some later corrections)
 
-  $Id$
-
-                                         Petr Prikryl (prikrylp@skil.cz)
+                                         Petr Prikryl (prikryl at atlas dot cz)
 
   History:
   --------

doc/translator_report.txt

@@ -10,7 +10,7 @@ Macedonian, Norwegian, Persian, Polish, Portuguese, Romanian, Russian,
 Serbian, SerbianCyrilic, Slovak, Slovene, Spanish, Swedish, Turkish,
 Ukrainian, and Vietnamese.
 
-Of them, 9 translators are up-to-date, 31 translators are based on
+Of them, 10 translators are up-to-date, 30 translators are based on
 some adapter class, and 2 are English based.
 
 ----------------------------------------------------------------------
@@ -19,6 +19,7 @@ alphabetically). This means that they derive from the Translator class
 and they implement all 250 of the required methods. Anyway, there
 still may be some details listed even for them:
 
+  TranslatorChinesetraditional -- The MAX_DOT_GRAPH_HEIGHT found in trLegendDocs()
   TranslatorCzech
   TranslatorDutch
   TranslatorEnglish
@@ -45,12 +46,7 @@ must be implemented to become up-to-date:
   TranslatorChinese               1.8.2 	15 methods to implement (6 %)
   TranslatorPortuguese            1.8.0 	22 methods to implement (8 %)
   TranslatorIndonesian            1.8.0 	22 methods to implement (8 %)
-	Note: Reimplementation using UTF-8 suggested.
-
   TranslatorDanish                1.8.0 	22 methods to implement (8 %)
-  TranslatorChinesetraditional    1.8.0 	22 methods to implement (8 %)
-	Note: Reimplementation using UTF-8 suggested.
-
   TranslatorCatalan               1.8.0 	22 methods to implement (8 %)
   TranslatorBrazilian             1.8.0 	22 methods to implement (8 %)
   TranslatorArmenian              1.8.0 	22 methods to implement (8 %)
@@ -59,23 +55,13 @@ must be implemented to become up-to-date:
   TranslatorPersian               1.7.5 	25 methods to implement (10 %)
   TranslatorVietnamese            1.6.0 	34 methods to implement (13 %)
   TranslatorSwedish               1.6.0 	34 methods to implement (13 %)
-	Note: Reimplementation using UTF-8 suggested.
-
   TranslatorSerbian               1.6.0 	34 methods to implement (13 %)
-	Note: Reimplementation using UTF-8 suggested.
-
   TranslatorSerbianCyrilic        1.6.0 	34 methods to implement (13 %)
   TranslatorMacedonian            1.6.0 	34 methods to implement (13 %)
   TranslatorJapanese              1.6.0 	33 methods to implement (13 %)
-	Note: Reimplementation using UTF-8 suggested.
-
   TranslatorFinnish               1.6.0 	34 methods to implement (13 %)
   TranslatorAfrikaans             1.6.0 	34 methods to implement (13 %)
-	Note: Reimplementation using UTF-8 suggested.
-
   TranslatorSlovene               1.4.6 	58 methods to implement (23 %)
-	Note: Reimplementation using UTF-8 suggested.
-
   TranslatorNorwegian             1.4.6 	56 methods to implement (22 %)
   TranslatorLithuanian            1.4.6 	58 methods to implement (23 %)
   TranslatorHungarian             1.4.6 	58 methods to implement (23 %)
@@ -348,35 +334,10 @@ TranslatorChinese   (TranslatorAdapter_1_8_2)  15 methods to implement (6 %)
     virtual QCString trInstanceMethods()
 
 
-TranslatorChinesetraditional   (TranslatorAdapter_1_8_0)  22 methods to implement (8 %)
+TranslatorChinesetraditional   (Translator)
 ----------------------------
 
-  Implements 228 of the required methods (91 %).
-
-  Missing methods (should be implemented):
-
-    virtual QCString trDetailLevel()
-    virtual QCString trTemplateParameters()
-    virtual QCString trServices()
-    virtual QCString trClassMethods()
-    virtual QCString trProvidedByCategory()
-    virtual QCString trSingletonGeneratedFromFiles(bool single)
-    virtual QCString trServiceReference(const char * sName)
-    virtual QCString trDesignOverview()
-    virtual QCString trAndMore(const QCString & number)
-    virtual QCString trConstantGroups()
-    virtual QCString trMethodDocumentation()
-    virtual QCString trEnumReference(const char * name)
-    virtual QCString trInheritedFrom(const char * members, const char * what)
-    virtual QCString trAdditionalInheritedMembers()
-    virtual QCString trInterfaces()
-    virtual QCString trServiceGeneratedFromFiles(bool single)
-    virtual QCString trEnumGeneratedFromFiles(bool single)
-    virtual QCString trConstantGroupReference(const char * namespaceName)
-    virtual QCString trPanelSynchronisationTooltip(bool enable)
-    virtual QCString trExtendsClass()
-    virtual QCString trSingletonReference(const char * sName)
-    virtual QCString trInstanceMethods()
+  Implements 250 of the required methods (100 %).
 
 
 TranslatorCroatian   (TranslatorAdapter_1_8_2)  15 methods to implement (6 %)

src/language.cpp

@@ -189,7 +189,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_SV
   else if (L_EQUAL("swedish"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorSwedish);
+    theTranslator=new TranslatorSwedish;
   }
 #endif
 #ifdef LANG_CZ
@@ -207,7 +207,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_ID
   else if (L_EQUAL("indonesian"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorIndonesian);
+    theTranslator=new TranslatorIndonesian;
   }
 #endif
 #ifdef LANG_IT
@@ -225,7 +225,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_JP
   else if (L_EQUAL("japanese"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorJapanese);
+    theTranslator=new TranslatorJapanese;
   }
 #endif
 #ifdef LANG_JE
@@ -297,7 +297,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_SI
   else if (L_EQUAL("slovene"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorSlovene);
+    theTranslator=new TranslatorSlovene;
   }
 #endif
 #ifdef LANG_CN
@@ -309,7 +309,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_TW
   else if (L_EQUAL("chinese-traditional"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorChinesetraditional);
+    theTranslator=new TranslatorChinesetraditional;
   }
 #endif
 #ifdef LANG_NO
@@ -351,7 +351,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_SR
   else if (L_EQUAL("serbian"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorSerbian);
+    theTranslator=new TranslatorSerbian;
   }
 #endif
 #ifdef LANG_SC
@@ -381,7 +381,7 @@ bool setTranslator(const char *langName)
 #ifdef LANG_ZA
   else if (L_EQUAL("afrikaans"))
   {
-    theTranslator=new TranslatorDecoder(new TranslatorAfrikaans);
+    theTranslator=new TranslatorAfrikaans;
   }
 #endif
 #ifdef LANG_AR

src/translator_id.h

@@ -61,7 +61,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0
     /*! return the language charset. This will be used for the HTML output */
     virtual QCString idLanguageCharset()
     {
-      return "iso-8859-1";
+      return "utf-8";
     }
 
     // --- Language translation methods -------------------

src/translator_tw.h

@@ -41,7 +41,7 @@
 // Translator class (by the local maintainer) when the localized
 // translator is made up-to-date again.
 
-class TranslatorChinesetraditional : public TranslatorAdapter_1_8_0
+class TranslatorChinesetraditional : public Translator
 {
   public:
 
@@ -78,7 +78,7 @@ class TranslatorChinesetraditional : public TranslatorAdapter_1_8_0
     /*! return the language charset. This will be used for the HTML output */
     virtual QCString idLanguageCharset()
     {
-      return "big5";
+      return "utf-8";
     }
 
     // --- Language translation methods -------------------
@@ -1863,6 +1863,165 @@ class TranslatorChinesetraditional : public TranslatorAdapter_1_8_0
     virtual QCString trDirDepGraph(const char *name)
     { return QCString(name)+"的目錄關連圖"+":"; }
 
+//////////////////////////////////////////////////////////////////////////
+// new since 1.8.0
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Detail level selector shown for hierarchical indices */
+    virtual QCString trDetailLevel()
+    { return "詳細程度"; }
+
+    /*! Section header for list of template parameters */
+    virtual QCString trTemplateParameters()
+    { return "樣版參數"; }
+
+    /*! Used in dot graph when UML_LOOK is enabled and there are many fields */
+    virtual QCString trAndMore(const QCString &number)
+    { return "及 "+number+" 個更多..."; }
+
+    /*! Used file list for a Java enum */
+    virtual QCString trEnumGeneratedFromFiles(bool single)
+    { QCString result = "此列舉型態的文件是由下列檔案所產生";
+      if (!single) result += "";
+      result+=":";
+      return result;
+    }
+
+    /*! Header of a Java enum page (Java enums are represented as classes). */
+    virtual QCString trEnumReference(const char *name)
+    { return QCString(name)+" 列舉型態參考"; }
+
+    /*! Used for a section containing inherited members */
+    virtual QCString trInheritedFrom(const char *members,const char *what)
+    { return QCString(members)+" 繼承自 "+what; }
+
+    /*! Header of the sections with inherited members specific for the
+     *  base class(es)
+     */
+    virtual QCString trAdditionalInheritedMembers()
+    { return "額外的繼承成員"; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.8.2
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a tooltip for the toggle button that appears in the
+     *  navigation tree in the HTML output when GENERATE_TREEVIEW is
+     *  enabled. This tooltip explains the meaning of the button.
+     */
+    virtual QCString trPanelSynchronisationTooltip(bool enable)
+    {
+      QCString opt = enable ? "啟用" : "停用";
+      return "點擊 "+opt+" 面板進行同步";
+    }
+
+    /*! Used in a method of an Objective-C class that is declared in a
+     *  a category. Note that the @1 marker is required and is replaced
+     *  by a link.
+     */
+    virtual QCString trProvidedByCategory()
+    {
+      return "由 @1 分類所提供.";
+    }
+
+    /*! Used in a method of an Objective-C category that extends a class.
+     *  Note that the @1 marker is required and is replaced by a link to
+     *  the class method.
+     */
+    virtual QCString trExtendsClass()
+    {
+      return "延伸 @1 類別 .";
+    }
+
+    /*! Used as the header of a list of class methods in Objective-C.
+     *  These are similar to static public member functions in C++.
+     */
+    virtual QCString trClassMethods()
+    {
+      return "類別方法";
+    }
+
+    /*! Used as the header of a list of instance methods in Objective-C.
+     *  These are similar to public member functions in C++.
+     */
+    virtual QCString trInstanceMethods()
+    {
+      return "實體方法";
+    }
+
+    /*! Used as the header of the member functions of an Objective-C class.
+     */
+    virtual QCString trMethodDocumentation()
+    {
+      return "方法文件";
+    }
+
+    /*! Used as the title of the design overview picture created for the
+     *  VHDL output.
+     */
+    virtual QCString trDesignOverview()
+    {
+      return "設計概述";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.8.4
+//////////////////////////////////////////////////////////////////////////
+
+    /** old style UNO IDL services: implemented interfaces */
+    virtual QCString trInterfaces()
+    { return "導出介面"; }
+
+    /** old style UNO IDL services: inherited services */
+    virtual QCString trServices()
+    { return "引入的服務"; }
+
+    /** UNO IDL constant groups */
+    virtual QCString trConstantGroups()
+    { return "常數群組"; }
+
+    /** UNO IDL constant groups */
+    virtual QCString trConstantGroupReference(const char *namespaceName)
+    {
+      QCString result=namespaceName;
+      result+="常數群組參考";
+      return result;
+    }
+    /** UNO IDL service page title */
+    virtual QCString trServiceReference(const char *sName)
+    {
+      QCString result=(QCString)sName;
+      result+="服務參考";
+      return result;
+    }
+    /** UNO IDL singleton page title */
+    virtual QCString trSingletonReference(const char *sName)
+    {
+      QCString result=(QCString)sName;
+      result+="Singleton參考";
+      return result;
+    }
+    /** UNO IDL service page */
+    virtual QCString trServiceGeneratedFromFiles(bool single)
+    {
+      // single is true implies a single file
+      QCString result=(QCString)"本服務的文件由以下的檔案"
+                                "所產生";
+      if (single) result+=":"; else result+=":";
+      return result;
+    }
+    /** UNO IDL singleton page */
+    virtual QCString trSingletonGeneratedFromFiles(bool single)
+    {
+      // single is true implies a single file
+      QCString result=(QCString)"本singleton的文件由下面的檔案"
+                                "所產生";
+      if (single) result+=":"; else result+=":";
+      return result;
+    }
+
+//////////////////////////////////////////////////////////////////////////
+
 };
 
 #endif

src/translator_za.h

@@ -65,7 +65,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     /*! return the language charset. This will be used for the HTML output */
     virtual QCString idLanguageCharset()
     {
-      return "iso-8859-1";
+      return "utf-8";
     }
 
     // --- Language translation methods -------------------
@@ -147,7 +147,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
 
     /*! put after an undocumented member in the list of all members */
     virtual QCString trDefinedIn()
-    { return "gedefinieër in"; }
+    { return "gedefinieër in"; }
 
     // quick reference sections
 
@@ -176,7 +176,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
 
     /*! This is put above each page as a link to the list of documented files */
     virtual QCString trFileList()
-    { return "Leër Lys"; }
+    { return "Leër Lys"; }
 
     /*! This is put above each page as a link to all members of compounds. */
     virtual QCString trCompoundMembers()
@@ -200,7 +200,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
       }
       else
       {
-        return "Leër Lede"; 
+        return "Leër Lede";
       }
     }
 
@@ -227,7 +227,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     {
       QCString result="Hier is 'n lys van alle  ";
       if (!extractAll) result+="gedokumenteerde ";
-      result+="leërs met kort beskrywings:";
+      result+="leërs met kort beskrywings:";
       return result;
     }
 
@@ -300,11 +300,11 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
       }
       else
       {
-        result+="leër lede";
+        result+="leër lede";
       }
       result+=" met skakels na ";
       if (extractAll)
-        result+="die leërs waaraan hulle behoort:";
+        result+="die leërs waaraan hulle behoort:";
       else
         result+="die dokumentasie:";
       return result;
@@ -357,7 +357,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
      * list of all files.
      */
     virtual QCString trFileIndex()
-    { return "Leër Indeks"; }
+    { return "Leër Indeks"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all groups.
@@ -384,7 +384,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
      *  the documentation of all files.
      */
     virtual QCString trFileDocumentation()
-    { return "Leër Dokumentasie"; }
+    { return "Leër Dokumentasie"; }
 
     /*! This is used in LaTeX as the title of the chapter containing
      *  the documentation of all examples.
@@ -617,7 +617,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     virtual QCString trFileReference(const char *fileName)
     {
       QCString result=fileName;
-      result+=" Leër Verwysing"; 
+      result+=" Leër Verwysing";
       return result;
     }
 
@@ -768,7 +768,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
         case ClassDef::Exception:  result+="eksepsie"; break;
         default: break;
       }
-      result+=" is gegenereer vanaf die volgende leër";
+      result+=" is gegenereer vanaf die volgende leër";
       if (single) result+=":"; else result+="s:";
       return result;
     }
@@ -804,11 +804,11 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
 
     virtual QCString trDefinedAtLineInSourceFile()
     {
-      return "Gedefinieër by lyn @0 van leër @1.";
+      return "Gedefinieër by lyn @0 van leër @1.";
     }
     virtual QCString trDefinedInSourceFile()
     {
-      return "Definisie in leër @0.";
+      return "Definisie in leër @0.";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -842,12 +842,12 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     /*! Used in the file documentation to point to the corresponding sources. */
     virtual QCString trGotoSourceCode()
     {
-      return "Skakel na die bron kode van hierdie leër.";
+      return "Skakel na die bron kode van hierdie leër.";
     }
     /*! Used in the file sources to point to the corresponding documentation. */
     virtual QCString trGotoDocumentation()
     {
-      return "Skakel na die dokumentasie van hierdie leër.";
+      return "Skakel na die dokumentasie van hierdie leër.";
     }
     /*! Text for the \\pre command */
     virtual QCString trPrecondition()
@@ -976,8 +976,8 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
     }
     virtual QCString trInclByDepGraph()
     {
-      return "Hierdie diagram verduidelik watter leërs direk of"
-             "indirek hierdie leër insluit:";
+      return "Hierdie diagram verduidelik watter leërs direk of"
+             "indirek hierdie leër insluit:";
     }
     virtual QCString trSince()
     {
@@ -1030,7 +1030,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
         "    Used *m_usedClass;\n"
         "};\n"
         "\\endcode\n"
-        "As die \\c MAX_DOT_GRAPH_HEIGHT merker in die konfigurasie leër "
+        "As die \\c MAX_DOT_GRAPH_HEIGHT merker in die konfigurasie leër "
         "aan 240 gelyk gestel is, word die volgende diagram geproduseer:"
         "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
         "<p>\n"
@@ -1227,7 +1227,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
      */
     virtual QCString trFile(bool first_capital, bool singular)
     {
-      QCString result((first_capital ? "Le&euml;r" : "le&euml;r"));
+      QCString result((first_capital ? "Leër" : "leër"));
       if (!singular)  result+="s";
       return result;
     }
@@ -1487,7 +1487,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
      */
     virtual QCString trSourceFile(QCString& filename)
     {
-      return filename + " Bron kode Le&euml;r";
+      return filename + " Bron kode Leër";
     }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1498,7 +1498,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
      *  hierarchy.
      */
     virtual QCString trDirIndex()
-    { return "Directory Hi&euml;rargie"; }
+    { return "Directory Hiërargie"; }
 
     /*! This is used as the name of the chapter containing the documentation
      *  of the directories.
@@ -1516,7 +1516,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0
      *  and the fact that it is sorted alphabetically per level
      */
     virtual QCString trDirDescription()
-    { return "Hierdie directory hi&euml;rargie is min of meer alfabeties "
+    { return "Hierdie directory hiërargie is min of meer alfabeties "
              "gesorteer:";
     }