Clean-up yesterday's code-splurge and sort the translated language names.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4095 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index a7ef60a16e6d25be961440a963b41c950d92bff0..f5e0c6ee3e4e8ca82acbbabd32317685eb40a2d4 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-30  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * frnt_lang.[Ch] (getLanguageData): passed a bool character_dlg.
+       If the the caller is the character dialog, add "No change" and "Reset"
+       to the vector, else don't.
+       Internationalise the GUI strings here rather than in the different
+       calling dialogs.
+       Sort the translated strings, albeit simply.
+
 2002-04-29  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * character.[Ch]: rename namespace character as namespace frnt.

diff --git a/src/frontends/controllers/frnt_lang.C b/src/frontends/controllers/frnt_lang.C
index dfb9c90b8fb4fab54811ceb83f3f1e2f0b8c583d..078bd030a66b6e66f4a716d93be3d4f6db4fcb47 100644 (file)
--- a/src/frontends/controllers/frnt_lang.C
+++ b/src/frontends/controllers/frnt_lang.C
@@ -15,26 +15,46 @@
 #include "frnt_lang.h"
 #include "gettext.h"
 #include "language.h"
+#include <iostream>
 
 using std::vector;
 
+namespace {
+
+struct Sorter {
+       bool operator()(frnt::LanguagePair const & lhs,
+                       frnt::LanguagePair const & rhs) const
+        {
+                return lhs.first < rhs.first;
+        }
+};
+
+} // namespace anon
+
 namespace frnt {
 
-vector<LanguagePair> const getLanguageData()
+vector<LanguagePair> const getLanguageData(bool character_dlg)
 {
-       vector<LanguagePair> langs(languages.size() + 2);
+       vector<LanguagePair>::size_type const size = character_dlg ?
+               languages.size() + 2 : languages.size();
 
-       langs[0].first = N_("No change"); langs[0].second = "No change";
-       langs[1].first = N_("Reset");     langs[1].second = "Reset";
+       vector<LanguagePair> langs(size);
 
-       vector<string>::size_type i = 2;
+       if (character_dlg) {
+               langs[0].first = N_("No change"); langs[0].second = "No change";
+               langs[1].first = N_("Reset");     langs[1].second = "Reset";
+       }
+
+       vector<string>::size_type i = character_dlg ? 2 : 0;
        for (Languages::const_iterator cit = languages.begin();
             cit != languages.end(); ++cit) {
-               langs[i].first  = cit->second.display();
+               langs[i].first  = _(cit->second.display());
                langs[i].second = cit->second.lang();
                ++i;
        }
 
+       std::sort(langs.begin(), langs.end(), Sorter());
+
        return langs;
 }
 

diff --git a/src/frontends/controllers/frnt_lang.h b/src/frontends/controllers/frnt_lang.h
index 5a636d4c10f76124588db4de910d28862a3e7e54..c3d949afb24ddcc713e646166b71d4b93db97345 100644 (file)
--- a/src/frontends/controllers/frnt_lang.h
+++ b/src/frontends/controllers/frnt_lang.h
@@ -23,8 +23,10 @@
 namespace frnt {
        ///
        typedef std::pair<string, string> LanguagePair;
-       ///
-       std::vector<LanguagePair> const getLanguageData();
+       /** If the caller is the character dialog, add "No change" and "Reset"
+        *  to the vector.
+        */
+       std::vector<LanguagePair> const getLanguageData(bool character_dlg);
 
 } // namespace frnt
 

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index c041c89cbcf070efc53af3906f7cd9d5ec023b96..dab5f36d884b7865ceac6f70902578a094f484f3 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,11 @@
+2002-04-30  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * FormCharacter.C:
+       * FormDocument.C:
+       * FormPreferences.C: use the bool flag to getLanguageData as
+       appropriate. No longer translate the strings as this is done in
+       getLanguageData.
+
 2002-04-29  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * FormCharacter.h:

diff --git a/src/frontends/xforms/FormCharacter.C b/src/frontends/xforms/FormCharacter.C
index 5ac61c59a3d05823197e671d22e35aded7e36f22..0bf8a2964debd2f7d904b1b88236a6388859a1b9 100644 (file)
--- a/src/frontends/xforms/FormCharacter.C
+++ b/src/frontends/xforms/FormCharacter.C
@@ -48,13 +48,13 @@ void FormCharacter::build()
 {
        dialog_.reset(build_character());
 
-       vector<FamilyPair>   const family   = getFamilyData();
-       vector<SeriesPair>   const series   = getSeriesData();
-       vector<ShapePair>    const shape    = getShapeData();
-       vector<SizePair>     const size     = getSizeData();
-       vector<BarPair>      const bar      = getBarData();
-       vector<ColorPair>    const color    = getColorData();
-       vector<LanguagePair> const langs = getLanguageData();
+       vector<FamilyPair>   const family = getFamilyData();
+       vector<SeriesPair>   const series = getSeriesData();
+       vector<ShapePair>    const shape  = getShapeData();
+       vector<SizePair>     const size   = getSizeData();
+       vector<BarPair>      const bar    = getBarData();
+       vector<ColorPair>    const color  = getColorData();
+       vector<LanguagePair> const langs  = getLanguageData(true);
 
        // Store the identifiers for later
        family_ = getSecond(family);
@@ -103,7 +103,7 @@ void FormCharacter::build()
        vector<LanguagePair>::const_iterator it  = langs.begin();
        vector<LanguagePair>::const_iterator end = langs.end();
        for (; it != end; ++it) {
-               combo_language2_->addto(_(it->first));
+               combo_language2_->addto(it->first);
        }
        combo_language2_->select(1);
 

diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index dac27f81e8cbb9b231f8429d5168f9199edc05f6..a4cd1bd8089212f78446e6a654358879f20d058c 100644 (file)
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -242,7 +242,7 @@ void FormDocument::build()
                        "default|auto|latin1|latin2|latin3|latin4|latin5|latin9"
                        "|koi8-r|koi8-u|cp866|cp1251|iso88595");
 
-       vector<frnt::LanguagePair> const langs = frnt::getLanguageData();
+       vector<frnt::LanguagePair> const langs = frnt::getLanguageData(false);
        // Store the identifiers for later
        lang_ = getSecond(langs);
 
@@ -260,7 +260,7 @@ void FormDocument::build()
        vector<frnt::LanguagePair>::const_iterator lit  = langs.begin();
        vector<frnt::LanguagePair>::const_iterator lend = langs.end();
        for (; lit != lend; ++lit) {
-               combo_language->addto(_(lit->first));
+               combo_language->addto(lit->first);
        }
        combo_language->select(1);
 

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index d66a13815307a8f6a107ffaf93008500c2c25814..3e7000d6d5bba65700551c4a95a820f0d77a70fe 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -1633,7 +1633,7 @@ void FormPreferences::Language::build()
        fl_set_input_return(dialog_->input_command_end, FL_RETURN_CHANGED);
 
        // Store the lang identifiers for later
-       vector<frnt::LanguagePair> const langs = frnt::getLanguageData();
+       vector<frnt::LanguagePair> const langs = frnt::getLanguageData(false);
        lang_ = getSecond(langs);
 
        // The default_language is a combo-box and has to be inserted manually
@@ -1652,7 +1652,7 @@ void FormPreferences::Language::build()
        vector<frnt::LanguagePair>::const_iterator lit  = langs.begin();
        vector<frnt::LanguagePair>::const_iterator lend = langs.end();
        for (; lit != lend; ++lit) {
-               combo_default_lang->addto(_(lit->first));
+               combo_default_lang->addto(lit->first);
        }
        combo_default_lang->select(1);