Merge pull request #282 from pepr/master

Chinese Traditional updated

3 files changed, 27 insertions, 26 deletions

diff --git a/doc/.gitignore b/doc/.gitignore
index a464770..d1d1371 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1 +1,2 @@
-mailto.txt
\ No newline at end of file
+*.bak
+mailto.txt
diff --git a/doc/translator.py b/doc/translator.py
index 19277be..69e7de8 100644
--- a/doc/translator.py
+++ b/doc/translator.py
@@ -1796,7 +1796,9 @@ class TrManager:
         # document template.

         tplDic = {}

 

-        s = 'Do not edit this file. It was generated by the %s script. * Instead edit %s and %s' % (self.script_name, self.languageTplFileName, self.maintainersFileName)

+        s = ('Do not edit this file. It was generated by the %s script.\n' +\

+             ' * Edit the %s and %s files instead.') % (

+             self.script_name, self.languageTplFileName, self.maintainersFileName)

         tplDic['editnote'] = s

 

         tplDic['doxVersion'] = self.doxVersion

@@ -1987,17 +1989,14 @@ if __name__ == '__main__':
 

     # The Python 2.6+ or 3.3+ is required.

     major, minor, patch = (int(e) for e in platform.python_version_tuple())

-    print(major, minor, patch)

     if (major == 2 and minor < 6) or (major == 3 and minor < 0):

         print('Python 2.6+ or Python 3.0+ are required for the script')

         sys.exit(1)

 

-    # The translator manager builds the transl objects, parses the related

+    # The translator manager builds the Transl objects, parses the related

     # sources, and keeps them in memory.

     trMan = TrManager()

 

-    # Generate the language.doc.

+    # Process the Transl objects and generate the output files.

     trMan.generateLanguageDoc()

-

-    # Generate the translator report.

     trMan.generateTranslatorReport()

diff --git a/src/translator_tw.h b/src/translator_tw.h
index 9da3365..7ff5b6c 100644
--- a/src/translator_tw.h
+++ b/src/translator_tw.h
@@ -749,7 +749,8 @@ class TranslatorChinesetraditional : public Translator
     /*! This is put at the bottom of a class documentation page and is
      *  followed by a list of files that were used to generate the page.
      */
-    virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,bool)
+    virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,
+        bool single)
     { // here s is one of " Class", " Struct" or " Union"
       // single is true implies a single file
       QCString result=(QCString)"此";
@@ -765,7 +766,7 @@ class TranslatorChinesetraditional : public Translator
         default: break;
       }
       result+=" 文件是由下列檔案中產生";
-      result+=":";
+      if (single) result+=":"; else result+=":";
       return result;
     }
 
@@ -993,7 +994,7 @@ class TranslatorChinesetraditional : public Translator
         ".<p>\n"
         "請看下面範例:\n"
         "\\code\n"
-        "/*! 因為截斷的不可見類別 */\n"
+        "/*! 因為截斷而造成的不可見類別 */\n"
         "class Invisible { };\n\n"
         "/*! 截斷的類別, 繼承關係被隱藏 */\n"
         "class Truncated : public Invisible { };\n\n"
@@ -1020,32 +1021,32 @@ class TranslatorChinesetraditional : public Translator
         "    Used *m_usedClass;\n"
         "};\n"
         "\\endcode\n"
-        "若在組態檔中的 \\c MAX_DOT_GRAPH_HEIGHT tag "
-        "設為 240，將會產生下列的圖示:"
-        "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "這個例子會產生下列的圖示:"
+        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n"
         "<p>\n"
         "上圖中的各區塊意義如下:\n"
+        "</p>\n"
         "<ul>\n"
         "<li>%A 填滿黑色的區塊代表產生這個圖示的類別或結構 "
         ".\n"
-        "<li>%A 黑邊的區塊代表文件化過的結構或類別.\n"
-        "<li>%A 灰邊的區塊代表未經文件化的結構或是類別.\n"
+        "<li>%A 黑邊的區塊代表文件化過的結構或類別.</li>\n"
+        "<li>%A 灰邊的區塊代表未經文件化的結構或是類別.</li>\n"
         "<li>%A 紅邊的區塊代表文件化的結構或是類別，"
         "這些結構或類別的繼承或包含關係不會全部顯示. %A 圖示 "
-        "若無法塞入指定的邊界中將會被截斷.\n"
+        "若無法塞入指定的邊界中將會被截斷.</li>\n"
         "</ul>\n"
+        "<p>\n"
         "箭頭具有下面的意義:\n"
+        "</p>\n"
         "<ul>\n"
         "<li>%A 深藍色箭頭用來代表兩個類別間的公開繼承 "
         "關係.\n"
-        "<li>%A 深綠色箭頭代表保護繼承.\n"
-        "<li>%A 深紅色箭頭代表私有繼承.\n"
+        "<li>%A 深綠色箭頭代表保護繼承。</li>\n"
+        "<li>%A 深紅色箭頭代表私有繼承。</li>\n"
         "<li>%A 紫色箭頭用來表示類別被另一個包含或是使用."
-        "箭頭上標示著可存取該類別或是結構的對應變數"
-        ".\n"
+        "箭頭上標示著可存取該類別或是結構的對應變數。</li>\n"
         "<li>%A 黃色箭頭代表樣版實體與樣版類別之間的關係。"
-        "箭頭上標記著樣版實體上的參數"
-        ".\n"
+        "箭頭上標記著樣版實體上的參數。</li>\n"
         "</ul>\n";
     }
     /*! text for the link to the legend page */
@@ -1947,21 +1948,21 @@ class TranslatorChinesetraditional : public Translator
       return result;
     }
     /** UNO IDL service page */
-    virtual QCString trServiceGeneratedFromFiles(bool)
+    virtual QCString trServiceGeneratedFromFiles(bool single)
     {
       // single is true implies a single file
       QCString result=(QCString)"本服務的文件由以下的檔案"
                                 "所產生";
-      result+=":";
+      if (single) result+=":"; else result+=":";
       return result;
     }
     /** UNO IDL singleton page */
-    virtual QCString trSingletonGeneratedFromFiles(bool)
+    virtual QCString trSingletonGeneratedFromFiles(bool single)
     {
       // single is true implies a single file
       QCString result=(QCString)"本singleton的文件由下面的檔案"
                                 "所產生";
-      result+=":";
+      if (single) result+=":"; else result+=":";
       return result;
     }