From 804fcc176eeef328b4bc228374f4b71a6af40303 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Mon, 3 Aug 2020 20:35:58 +0200 Subject: Some fixes and cleanup - fix issue with test 037 - moved trISOLang() to the language control section and removed the "no need for a TranslatorAdapter_1_8_19" banner. - removed unused adapter classes - add translation for Dutch --- src/translator.h | 2 +- src/translator_adapter.h | 24 ++---------------------- src/translator_am.h | 15 ++++----------- src/translator_ar.h | 11 +++-------- src/translator_br.h | 13 +++++-------- src/translator_ca.h | 13 +++++-------- src/translator_cn.h | 13 ++++--------- src/translator_cz.h | 14 +++++--------- src/translator_de.h | 7 +++++-- src/translator_dk.h | 13 +++++-------- src/translator_en.h | 7 +++++-- src/translator_eo.h | 13 +++++-------- src/translator_es.h | 14 +++++--------- src/translator_fa.h | 14 +++++--------- src/translator_fi.h | 13 ++++--------- src/translator_fr.h | 14 +++++--------- src/translator_gr.h | 19 ++++++++----------- src/translator_hr.h | 11 ++--------- src/translator_hu.h | 15 +++++---------- src/translator_id.h | 14 +++++--------- src/translator_it.h | 14 +++++--------- src/translator_je.h | 2 +- src/translator_jp.h | 23 +++++++++-------------- src/translator_ke.h | 2 +- src/translator_kr.h | 13 ++++--------- src/translator_lt.h | 14 +++++--------- src/translator_lv.h | 13 +++++-------- src/translator_mk.h | 12 ++++-------- src/translator_nl.h | 19 ++++++++----------- src/translator_no.h | 13 +++++-------- src/translator_pl.h | 14 +++++--------- src/translator_pt.h | 13 +++++-------- src/translator_ro.h | 13 ++++--------- src/translator_ru.h | 17 ++++------------- src/translator_sc.h | 13 ++++--------- src/translator_si.h | 14 +++----------- src/translator_sk.h | 13 ++++--------- src/translator_sr.h | 13 ++++--------- src/translator_sv.h | 21 +++++++++------------ src/translator_tr.h | 14 ++++---------- src/translator_tw.h | 13 ++++--------- src/translator_ua.h | 12 ++++-------- src/translator_vi.h | 13 ++++--------- src/translator_za.h | 13 ++++--------- testing/037/037__msc_8cpp.xml | 2 +- 45 files changed, 198 insertions(+), 384 deletions(-) diff --git a/src/translator.h b/src/translator.h index ef642de..bcc70ff 100644 --- a/src/translator.h +++ b/src/translator.h @@ -78,6 +78,7 @@ class Translator } return latex_command; } + virtual QCString trISOLang() = 0; // --- Language translation methods ------------------- @@ -655,7 +656,6 @@ class Translator // new since 1.8.19 ////////////////////////////////////////////////////////////////////////// - virtual QCString trISOLang() = 0; virtual QCString trDesignUnitDocumentation() = 0; }; diff --git a/src/translator_adapter.h b/src/translator_adapter.h index af18ab4..388304c 100644 --- a/src/translator_adapter.h +++ b/src/translator_adapter.h @@ -278,16 +278,6 @@ class TranslatorAdapter_1_7_5 : public TranslatorAdapter_1_8_0 virtual QCString trDirDepGraph(const char *name) { return english.trDirDepGraph(name); } -}; - -/** Adapter class for languages that only contain translations up to - * version 1.6.3. - */ -class TranslatorAdapter_1_6_3 : public TranslatorAdapter_1_7_5 -{ - public: - virtual QCString updateNeededMessage() - { return createUpdateNeededMessage(idLanguage(),"release 1.6.3"); } virtual QCString trFileIn(const char *name) { return english.trFileIn(name); } @@ -302,7 +292,7 @@ class TranslatorAdapter_1_6_3 : public TranslatorAdapter_1_7_5 /** Adapter class for languages that only contain translations up to * version 1.6.0. */ -class TranslatorAdapter_1_6_0 : public TranslatorAdapter_1_6_3 +class TranslatorAdapter_1_6_0 : public TranslatorAdapter_1_7_5 { public: virtual QCString updateNeededMessage() @@ -322,16 +312,6 @@ class TranslatorAdapter_1_6_0 : public TranslatorAdapter_1_6_3 virtual QCString trNoMatches() { return english.trNoMatches(); } -}; - -/** Adapter class for languages that only contain translations up to - * version 1.5.4 - */ -class TranslatorAdapter_1_5_4 : public TranslatorAdapter_1_6_0 -{ - public: - virtual QCString updateNeededMessage() - { return createUpdateNeededMessage(idLanguage(),"release 1.5.4"); } virtual QCString trMemberFunctionDocumentationFortran() { return english.trMemberFunctionDocumentationFortran(); } @@ -406,7 +386,7 @@ class TranslatorAdapter_1_5_4 : public TranslatorAdapter_1_6_0 /** Adapter class for languages that only contain translations up to * version 1.4.6 */ -class TranslatorAdapter_1_4_6 : public TranslatorAdapter_1_5_4 +class TranslatorAdapter_1_4_6 : public TranslatorAdapter_1_6_0 { public: virtual QCString updateNeededMessage() diff --git a/src/translator_am.h b/src/translator_am.h index 9af948a..812d8fb 100644 --- a/src/translator_am.h +++ b/src/translator_am.h @@ -32,9 +32,11 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 /* Used to get the command(s) for the language support. */ virtual QCString latexLanguageSupportCommand() { - return "\\usepackage[latin]{armtex}\n" - "\\usepackage[armscii8]{inputenc}\n"; + return "\\usepackage[latin]{armtex}\n" + "\\usepackage[armscii8]{inputenc}\n"; } + virtual QCString trISOLang() + { return "hy"; } // --- Language translation methods ------------------- @@ -1799,14 +1801,5 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 virtual QCString trDirDepGraph(const char *name) { return name + QCString("-ի ֆայլադարանների կախվածությունների գծագիր:"); } -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("hy"); - } - }; #endif diff --git a/src/translator_ar.h b/src/translator_ar.h index 80ba76f..0989249 100644 --- a/src/translator_ar.h +++ b/src/translator_ar.h @@ -68,6 +68,9 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 return ""; } + virtual QCString trISOLang() + { return "ar-EG"; } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -1565,14 +1568,6 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 "فقط في نوعية ال argument(s) التي تقبلها."; } -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("ar-EG"); - } }; #endif diff --git a/src/translator_br.h b/src/translator_br.h index 7135f7e..5be0282 100644 --- a/src/translator_br.h +++ b/src/translator_br.h @@ -85,6 +85,11 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_19 return "\\usepackage[brazil]{babel}"; } + virtual QCString trISOLang() + { + return "pt-BR"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -2326,14 +2331,6 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_19 return "Dados Membros"; } -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("pt-BR"); - } }; diff --git a/src/translator_ca.h b/src/translator_ca.h index d121428..a608ff0 100644 --- a/src/translator_ca.h +++ b/src/translator_ca.h @@ -75,6 +75,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 return "\\usepackage[catalan]{babel}\n"; } + virtual QCString trISOLang() + { + return "ca"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -1839,14 +1844,6 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 { return QCString("Graf de dependència de directoris per a ")+name+":"; } -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("ca"); - } }; #endif diff --git a/src/translator_cn.h b/src/translator_cn.h index d989d77..a3b5803 100644 --- a/src/translator_cn.h +++ b/src/translator_cn.h @@ -55,6 +55,10 @@ class TranslatorChinese : public TranslatorAdapter_1_8_15 { return "\\usepackage{CJKutf8}\n"; } + virtual QCString trISOLang() + { + return "zh"; + } virtual QCString latexFontenc() { return ""; @@ -1912,15 +1916,6 @@ class TranslatorChinese : public TranslatorAdapter_1_8_15 return "该单例的文档由下列文件生成:"; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("zh"); - } }; #endif diff --git a/src/translator_cz.h b/src/translator_cz.h index c364dbb..4fb3bc2 100644 --- a/src/translator_cz.h +++ b/src/translator_cz.h @@ -105,6 +105,11 @@ class TranslatorCzech : public TranslatorAdapter_1_8_15 "\\makeatother\n"; } + virtual QCString trISOLang() + { + return "cs"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -2033,15 +2038,6 @@ class TranslatorCzech : public TranslatorAdapter_1_8_15 return result; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("cs"); - } }; #endif // TRANSLATOR_CZ_H diff --git a/src/translator_de.h b/src/translator_de.h index 46eea58..63b0802 100644 --- a/src/translator_de.h +++ b/src/translator_de.h @@ -166,6 +166,11 @@ class TranslatorGerman : public TranslatorAdapter_1_8_15 return "\\usepackage[ngerman]{babel}\n"; } + virtual QCString trISOLang() + { + return "de"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -2250,8 +2255,6 @@ class TranslatorGerman : public TranslatorAdapter_1_8_15 // new since 1.8.19 ////////////////////////////////////////////////////////////////////////// - virtual QCString trISOLang() - { return("de"); } /** VHDL design unit documentation */ virtual QCString trDesignUnitDocumentation() { return "Entwurfseinheiten-Dokumentation"; } diff --git a/src/translator_dk.h b/src/translator_dk.h index 08f9630..2e9f7d0 100644 --- a/src/translator_dk.h +++ b/src/translator_dk.h @@ -119,6 +119,11 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0 "\\usepackage[danish]{babel}\n"; } + virtual QCString trISOLang() + { + return "da"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -1766,14 +1771,6 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0 } -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("da"); - } /*---------- For internal use: ----------------------------------------*/ protected: diff --git a/src/translator_en.h b/src/translator_en.h index 611c5fd..ba26bc7 100644 --- a/src/translator_en.h +++ b/src/translator_en.h @@ -74,6 +74,11 @@ class TranslatorEnglish : public Translator return ""; } + virtual QCString trISOLang() + { + return "en-US"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -2253,8 +2258,6 @@ class TranslatorEnglish : public Translator // new since 1.8.19 ////////////////////////////////////////////////////////////////////////// - virtual QCString trISOLang() - { return("en-US"); } /** VHDL design unit documentation */ virtual QCString trDesignUnitDocumentation() { return "Design Unit Documentation"; } diff --git a/src/translator_eo.h b/src/translator_eo.h index 87e7524..3ab9f8a 100644 --- a/src/translator_eo.h +++ b/src/translator_eo.h @@ -76,6 +76,11 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 return "\\usepackage[esperanto]{babel}\n"; } + virtual QCString trISOLang() + { + return "eo"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -1941,14 +1946,6 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 return "Fasona Superrigardo"; } -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("eo"); - } }; #endif diff --git a/src/translator_es.h b/src/translator_es.h index cfd5763..e4b35f3 100644 --- a/src/translator_es.h +++ b/src/translator_es.h @@ -68,6 +68,11 @@ class TranslatorSpanish : public TranslatorAdapter_1_8_15 return "\\usepackage[spanish]{babel}"; } + virtual QCString trISOLang() + { + return "es"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -2296,15 +2301,6 @@ class TranslatorSpanish : public TranslatorAdapter_1_8_15 return "Documentación miembro de datos"; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("es"); - } }; #endif diff --git a/src/translator_fa.h b/src/translator_fa.h index e31793e..56ba3da 100644 --- a/src/translator_fa.h +++ b/src/translator_fa.h @@ -91,6 +91,11 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 return ""; } + virtual QCString trISOLang() + { + return "fa"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -1779,15 +1784,6 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 return convertDigitsToFarsi(sdate); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("fa"); - } }; #endif diff --git a/src/translator_fi.h b/src/translator_fi.h index 7334957..bc6cbd9 100644 --- a/src/translator_fi.h +++ b/src/translator_fi.h @@ -130,6 +130,10 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 return "\\usepackage[finnish]{babel}\n"; } + virtual QCString trISOLang() + { + return "fi"; + } // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -1854,15 +1858,6 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 return "Tyyppien rajoitteet"; // "Type Constraints" } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("fi"); - } }; #endif diff --git a/src/translator_fr.h b/src/translator_fr.h index d7a431f..a4eafc2 100644 --- a/src/translator_fr.h +++ b/src/translator_fr.h @@ -135,6 +135,11 @@ class TranslatorFrench : public TranslatorAdapter_1_8_15 "\\NoAutoSpaceBeforeFDP\n"; } + virtual QCString trISOLang() + { + return "fr"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -2312,15 +2317,6 @@ class TranslatorFrench : public TranslatorAdapter_1_8_15 return "Documentation des champs de données"; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("fr"); - } }; #endif diff --git a/src/translator_gr.h b/src/translator_gr.h index d687929..c4af814 100644 --- a/src/translator_gr.h +++ b/src/translator_gr.h @@ -36,9 +36,9 @@ exception -> εξαίρεση namespace -> χώρος ονομάτων enumeration -> απαρίθμηση -*/ - - +*/ + + #ifndef TRANSLATOR_GR_H #define TRANSLATOR_GR_H @@ -63,6 +63,11 @@ class TranslatorGreek : public TranslatorAdapter_1_8_15 "\\usepackage[greek]{babel}\n"; } + virtual QCString trISOLang() + { + return "el"; + } + virtual QCString latexFontenc() { return ""; @@ -1992,14 +1997,6 @@ class TranslatorGreek : public TranslatorAdapter_1_8_15 return result; } -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("el"); - } }; diff --git a/src/translator_hr.h b/src/translator_hr.h index 87cea8d..3f9f492 100644 --- a/src/translator_hr.h +++ b/src/translator_hr.h @@ -92,6 +92,8 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2 { return "croatian"; } QCString latexLanguageSupportCommand() { return "\\usepackage[croatian]{babel}\n"; } + QCString trISOLang() + { return "hr"; } QCString trRelatedFunctions() { return "Povezane funkcije"; } QCString trRelatedSubscript() @@ -1567,15 +1569,6 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2 virtual QCString trAdditionalInheritedMembers() { return "Dodatni naslijeđeni članovi"; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("hr"); - } }; #endif diff --git a/src/translator_hu.h b/src/translator_hu.h index edf2c58..f7d9788 100644 --- a/src/translator_hu.h +++ b/src/translator_hu.h @@ -100,6 +100,11 @@ class TranslatorHungarian : public TranslatorAdapter_1_8_15 "\\usepackage[magyar]{babel}\n"; } + virtual QCString trISOLang() + { + return "hu"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -2012,16 +2017,6 @@ class TranslatorHungarian : public TranslatorAdapter_1_8_15 result+="lett létrehozva:"; return result; } - - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("hu"); - } }; #endif diff --git a/src/translator_id.h b/src/translator_id.h index 55a4366..05d36ee 100644 --- a/src/translator_id.h +++ b/src/translator_id.h @@ -58,6 +58,11 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 return "\\usepackage[bahasa]{babel}"; } + virtual QCString trISOLang() + { + return "id"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -1812,15 +1817,6 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 virtual QCString trDirDepGraph(const char *name) { return QCString("Bagan dependensi directori untuk ")+name+":"; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("id"); - } }; #endif diff --git a/src/translator_it.h b/src/translator_it.h index 33437d6..f7f3534 100644 --- a/src/translator_it.h +++ b/src/translator_it.h @@ -112,6 +112,11 @@ class TranslatorItalian : public TranslatorAdapter_1_8_15 return "\\usepackage[italian]{babel}\n"; } + virtual QCString trISOLang() + { + return "it"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -1968,15 +1973,6 @@ class TranslatorItalian : public TranslatorAdapter_1_8_15 return result; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("it"); - } }; #endif diff --git a/src/translator_je.h b/src/translator_je.h index 2afe772..66ee178 100644 --- a/src/translator_je.h +++ b/src/translator_je.h @@ -65,7 +65,7 @@ class TranslatorJapaneseEn : public TranslatorEnglish virtual QCString trISOLang() { - return("ja"); + return "ja"; } }; diff --git a/src/translator_jp.h b/src/translator_jp.h index 6032bd3..7985823 100644 --- a/src/translator_jp.h +++ b/src/translator_jp.h @@ -79,6 +79,10 @@ class TranslatorJapanese : public TranslatorAdapter_1_8_15 { return "\\usepackage{CJKutf8}\n"; } + virtual QCString trISOLang() + { + return "ja"; + } virtual QCString latexFontenc() { return ""; @@ -158,7 +162,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_8_15 /*! this is the remainder of the sentence after the class name */ virtual QCString trIncludingInheritedMembers() { return " の全メンバ一覧です。"; } - /* trThisIsTheListOfAllMembers から続くように定義すること */ + /* trThisIsTheListOfAllMembers から続くように定義すること */ /*! this is put at the author sections at the bottom of man pages. * parameter s is name of the project name. @@ -268,7 +272,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_8_15 } return "詳解が付けられているファイルの一覧です。"; } - + /*! This is an introduction to the annotated compound list. */ virtual QCString trCompoundListDescription() @@ -844,7 +848,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_8_15 { return "非推奨"; } - + /*! this text is put before a collaboration diagram */ virtual QCString trCollaborationDiagram(const char *clName) { @@ -1851,7 +1855,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_8_15 /*! Used file list for a Java enum */ virtual QCString trEnumGeneratedFromFiles(bool) - { + { return "次のファイルからこの列挙についての詳解を抽出しました:"; } @@ -1879,7 +1883,7 @@ class TranslatorJapanese : public TranslatorAdapter_1_8_15 */ virtual QCString trPanelSynchronisationTooltip(bool enable) { - + QCString opt = enable ? "有効" : "無効"; return "クリックで同期表示が"+opt+"になります"; } @@ -1977,15 +1981,6 @@ class TranslatorJapanese : public TranslatorAdapter_1_8_15 "の詳解を抽出しました:"; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("ja"); - } }; #endif diff --git a/src/translator_ke.h b/src/translator_ke.h index 077601e..2dda941 100644 --- a/src/translator_ke.h +++ b/src/translator_ke.h @@ -62,7 +62,7 @@ class TranslatorKoreanEn : public TranslatorEnglish virtual QCString trISOLang() { - return("ko"); + return "ko"; } }; diff --git a/src/translator_kr.h b/src/translator_kr.h index 2d593a7..dda8f6e 100644 --- a/src/translator_kr.h +++ b/src/translator_kr.h @@ -98,6 +98,10 @@ class TranslatorKorean : public TranslatorAdapter_1_8_15 } return latex_command; } + virtual QCString trISOLang() + { + return "ko"; + } // --- Language translation methods ------------------- @@ -2004,15 +2008,6 @@ class TranslatorKorean : public TranslatorAdapter_1_8_15 return result; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("ko"); - } }; #endif diff --git a/src/translator_lt.h b/src/translator_lt.h index 4d7739f..b491080 100644 --- a/src/translator_lt.h +++ b/src/translator_lt.h @@ -65,6 +65,11 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 "\\usepackage[lithuanian]{babel}\n"; } + virtual QCString trISOLang() + { + return "lt"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -1510,15 +1515,6 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 } -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("lt"); - } - }; #endif diff --git a/src/translator_lv.h b/src/translator_lv.h index bc02cfb..36cd78a 100644 --- a/src/translator_lv.h +++ b/src/translator_lv.h @@ -80,6 +80,11 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 "\\usepackage[latvian]{babel}\n"; } + virtual QCString trISOLang() + { + return "lv"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -1944,14 +1949,6 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 return "Dizaina pārskats"; } -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("lv"); - } }; #endif diff --git a/src/translator_mk.h b/src/translator_mk.h index 2fd8e0b..ea5c3c8 100644 --- a/src/translator_mk.h +++ b/src/translator_mk.h @@ -65,6 +65,10 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 { return "\\usepackage[macedonian]{babel}\n"; } + virtual QCString trISOLang() + { + return "mk"; + } // --- Language translation methods ------------------- @@ -1719,14 +1723,6 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 return "Ограничувања на Тип"; } -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("mk"); - } }; #endif diff --git a/src/translator_nl.h b/src/translator_nl.h index a80bd34..07e90ae 100644 --- a/src/translator_nl.h +++ b/src/translator_nl.h @@ -18,7 +18,7 @@ #ifndef TRANSLATOR_NL_H #define TRANSLATOR_NL_H -class TranslatorDutch : public TranslatorAdapter_1_8_19 +class TranslatorDutch : public Translator { public: QCString idLanguage() @@ -35,9 +35,9 @@ class TranslatorDutch : public TranslatorAdapter_1_8_19 * */ QCString latexLanguageSupportCommand() - { - return "\\usepackage[dutch]{babel}\n"; - } + { return "\\usepackage[dutch]{babel}\n"; } + QCString trISOLang() + { return "nl"; } QCString trRelatedFunctions() { return "Gerelateerde functies"; } QCString trRelatedSubscript() @@ -1776,15 +1776,12 @@ class TranslatorDutch : public TranslatorAdapter_1_8_19 { return "Data members"; } virtual QCString trDataMemberDocumentation() { return "Documentatie van data members"; } -// + ////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 +// new since 1.8.19 ////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("nl"); - } + virtual QCString trDesignUnitDocumentation() + { return "Ontwerp Eenheid Documentatie"; } }; #endif diff --git a/src/translator_no.h b/src/translator_no.h index 4154b78..1dc331a 100755 --- a/src/translator_no.h +++ b/src/translator_no.h @@ -75,6 +75,11 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 "\\usepackage[norsk]{babel}\n"; } + virtual QCString trISOLang() + { + return "nn"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -1564,14 +1569,6 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 "funksjonen ovenfor i argument(ene) den aksepterer."; } -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("nn"); - } }; #endif diff --git a/src/translator_pl.h b/src/translator_pl.h index 2171f50..096e9b0 100644 --- a/src/translator_pl.h +++ b/src/translator_pl.h @@ -54,6 +54,11 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 */ } + virtual QCString trISOLang() + { + return "pl"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -1866,15 +1871,6 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 virtual QCString trAdditionalInheritedMembers() { return "Dodatkowe Dziedziczone Składowe"; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("pl"); - } }; #endif diff --git a/src/translator_pt.h b/src/translator_pt.h index 3a9b2be..0185aea 100644 --- a/src/translator_pt.h +++ b/src/translator_pt.h @@ -94,6 +94,11 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_19 "\\usepackage[portuges]{babel}\n"; } + virtual QCString trISOLang() + { + return "pt"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -2263,14 +2268,6 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_19 return "Dados Membros"; } -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("pt"); - } }; diff --git a/src/translator_ro.h b/src/translator_ro.h index 99752fb..edb82bf 100644 --- a/src/translator_ro.h +++ b/src/translator_ro.h @@ -74,6 +74,10 @@ class TranslatorRomanian : public TranslatorAdapter_1_8_15 { return "\\usepackage[romanian]{babel}\n"; } + virtual QCString trISOLang() + { + return "ro"; + } // --- Language translation methods ------------------- @@ -2005,15 +2009,6 @@ class TranslatorRomanian : public TranslatorAdapter_1_8_15 return result; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("ro"); - } }; #endif diff --git a/src/translator_ru.h b/src/translator_ru.h index 3e6c8c8..aafae90 100644 --- a/src/translator_ru.h +++ b/src/translator_ru.h @@ -35,9 +35,10 @@ class TranslatorRussian : public TranslatorAdapter_1_8_15 /* Used to get the command(s) for the language support. */ virtual QCString latexLanguageSupportCommand() - { - return "\\usepackage[T2A]{fontenc}\n\\usepackage[russian]{babel}\n"; - } + { return "\\usepackage[T2A]{fontenc}\n\\usepackage[russian]{babel}\n"; } + + virtual QCString trISOLang() + { return "ru"; } // --- Language translation methods ------------------- @@ -1959,16 +1960,6 @@ class TranslatorRussian : public TranslatorAdapter_1_8_15 if (single) result+="а:"; else result+="ов:"; return result; } - - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("ru"); - } }; #endif diff --git a/src/translator_sc.h b/src/translator_sc.h index 187dcb9..5217948 100644 --- a/src/translator_sc.h +++ b/src/translator_sc.h @@ -78,6 +78,10 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 { return ""; } + virtual QCString trISOLang() + { + return "sr-Cyrl"; + } // --- Language translation methods ------------------- @@ -1765,15 +1769,6 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 return "Ограничења типова"; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("sr-Cyrl"); - } }; #endif diff --git a/src/translator_si.h b/src/translator_si.h index 7229487..5a03a71 100644 --- a/src/translator_si.h +++ b/src/translator_si.h @@ -35,9 +35,9 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6 * method is used to generate the command for using the babel package. */ QCString latexLanguageSupportCommand() - { - return "\\usepackage[slovene]{babel}\n"; - } + { return "\\usepackage[slovene]{babel}\n"; } + QCString trISOLang() + { return "sl"; } QCString trRelatedFunctions() { return "Povezane funkcije"; } QCString trRelatedSubscript() @@ -1208,14 +1208,6 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6 "samo v številu in/ali tipu formalnih argumentov."; } -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("sl"); - } }; #endif diff --git a/src/translator_sk.h b/src/translator_sk.h index 7534ec0..1e5d258 100644 --- a/src/translator_sk.h +++ b/src/translator_sk.h @@ -49,6 +49,10 @@ class TranslatorSlovak : public TranslatorAdapter_1_8_15 "\\xpatchparametertext\\@cline{-}{\\cA-}{}{}\n" "\\makeatother\n"; } + virtual QCString trISOLang() + { + return "sk"; + } // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -1963,15 +1967,6 @@ class TranslatorSlovak : public TranslatorAdapter_1_8_15 return result; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("sk"); - } }; #endif // TRANSLATOR_SK_H diff --git a/src/translator_sr.h b/src/translator_sr.h index f1c4aa7..bfd32f6 100644 --- a/src/translator_sr.h +++ b/src/translator_sr.h @@ -58,6 +58,10 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 QCString result="\\usepackage[serbian]{babel}\n"; return result; } + virtual QCString trISOLang() + { + return "sr-Latn"; + } // --- Language translation methods ------------------- @@ -1769,15 +1773,6 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 // return result; // } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("sr-Latn"); - } }; #endif diff --git a/src/translator_sv.h b/src/translator_sv.h index e409efa..434f670 100644 --- a/src/translator_sv.h +++ b/src/translator_sv.h @@ -169,6 +169,11 @@ class TranslatorSwedish : public TranslatorAdapter_1_8_19 return "\\usepackage[swedish]{babel}\n"; } + virtual QCString trISOLang() + { + return "sv"; + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -1975,7 +1980,7 @@ class TranslatorSwedish : public TranslatorAdapter_1_8_19 */ virtual QCString trPanelSynchronisationTooltip(bool enable) { - QCString opt = enable ? "aktivera" : "inaktivera"; + QCString opt = enable ? "aktivera" : "inaktivera"; return "klicka för att "+opt+" panelsynkronisering"; } @@ -2089,9 +2094,9 @@ class TranslatorSwedish : public TranslatorAdapter_1_8_19 /** VHDL design unit members */ virtual QCString trDesignUnitMembers() { return "Designenhetsmedlemmar"; } - /** VHDL design unit list description - * Orginal: Here is a list of all design unit members with links to - * the Entities they belong to: + /** VHDL design unit list description + * Orginal: Here is a list of all design unit members with links to + * the Entities they belong to: */ virtual QCString trDesignUnitListDescription() { @@ -2329,14 +2334,6 @@ class TranslatorSwedish : public TranslatorAdapter_1_8_19 return "Datamedlemsdokumentation"; } -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("sv"); - } }; #endif diff --git a/src/translator_tr.h b/src/translator_tr.h index f7147b8..4a68184 100644 --- a/src/translator_tr.h +++ b/src/translator_tr.h @@ -73,6 +73,10 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 { return "\\usepackage[turkish]{babel}\n"; } + virtual QCString trISOLang() + { + return "tr"; + } // --- Language translation methods ------------------- @@ -1816,16 +1820,6 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 return sdate; } - - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("tr"); - } }; #endif diff --git a/src/translator_tw.h b/src/translator_tw.h index d1c74f3..8d9658b 100644 --- a/src/translator_tw.h +++ b/src/translator_tw.h @@ -86,6 +86,10 @@ class TranslatorChinesetraditional : public TranslatorAdapter_1_8_15 { return "\\end{CJK}\n"; } + virtual QCString trISOLang() + { + return "zh-Hant"; + } // --- Language translation methods ------------------- @@ -1969,15 +1973,6 @@ class TranslatorChinesetraditional : public TranslatorAdapter_1_8_15 return result; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("zh-Hant"); - } }; #endif diff --git a/src/translator_ua.h b/src/translator_ua.h index c52e762..2c5047c 100644 --- a/src/translator_ua.h +++ b/src/translator_ua.h @@ -31,6 +31,10 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4 { return "\\usepackage[T2A]{fontenc}\n\\usepackage[ukrainian]{babel}\n"; } + virtual QCString trISOLang() + { + return "uk"; + } // --- Language translation methods ------------------- @@ -1909,14 +1913,6 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4 return "Огляд дизайну проекту"; } -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("uk"); - } }; #endif diff --git a/src/translator_vi.h b/src/translator_vi.h index 644eb6e..50c0a01 100644 --- a/src/translator_vi.h +++ b/src/translator_vi.h @@ -95,6 +95,10 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 } return latex_command; } + virtual QCString trISOLang() + { + return "vi"; + } // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ @@ -1750,15 +1754,6 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 return "Ràng buộc của kiểu (Type)"; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("vi"); - } }; #endif diff --git a/src/translator_za.h b/src/translator_za.h index 99cd191..fdf3e6a 100644 --- a/src/translator_za.h +++ b/src/translator_za.h @@ -59,6 +59,10 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 { return "\\usepackage[afrikaans]{babel}\n"; } + virtual QCString trISOLang() + { + return "af"; + } // --- Language translation methods ------------------- @@ -1716,15 +1720,6 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 return "Tipe Limiete"; } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.19, but completely filled so no need for a TranslatorAdapter_1_8_19 -////////////////////////////////////////////////////////////////////////// - - virtual QCString trISOLang() - { - return("af"); - } }; #endif diff --git a/testing/037/037__msc_8cpp.xml b/testing/037/037__msc_8cpp.xml index 3de730d..487880c 100644 --- a/testing/037/037__msc_8cpp.xml +++ b/testing/037/037__msc_8cpp.xml @@ -1,5 +1,5 @@ - + 037_msc.cpp Sender -- cgit v0.12