Changeset 1856 for trunk/gsdl/src/recpt/pageaction.cpp

Timestamp:

2001-01-23T10:58:19+13:00 (23 years ago)

Author:

sjboddie

Message:

Added Encoding and Language options to main.cfg configuration file so
it's now hopefully a little easier to add new languages and encodings
to the interface. Each interface language also now has a default encoding
so that changing languages from the preferences page causes the encoding
to change to a value reasonable for the selected language.

File:

• trunk/gsdl/src/recpt/pageaction.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/pageaction.cpp

@@ -187 +187 @@
   // _languageoption_      interface languages to select from (dependant on PreferenceLanguages)
 
-  // _encodingoption_      will be overridden to "" if chinese language interface isn't specified
+  // _encodingoption_      encodings to select from
 
   // if page is "about"
@@ -283 +283 @@
 
     // _languageoption_
-    // this is kind of a hack (another one!!). note that there're potential 
-    // problems here as no checking is done anywhere to make sure language
-    // is set to a valid value. this does allow us to set which languages 
-    // should go in the preference selection box (from collect.cfg) however
-    // and that's sufficient for current requirements
-    
-    // currently supported languages (_languageoption_ will default to all
-    // these languages unless PreferenceLanguages is set
-    text_tarray languages;
-    languages.push_back ("en");
-    languages.push_back ("fr");
-    languages.push_back ("de");
-    languages.push_back ("es");
-    languages.push_back ("mi");
-    languages.push_back ("zh");
-    languages.push_back ("ar");
-    languages.push_back ("pt");
-    languages.push_back ("nl");
-    text_tarray::const_iterator this_lang = languages.begin();
-    text_tarray::const_iterator end_lang = languages.end();
-
-    text_t languageoption = "_textlanguage_\n<select name=\"l\" onChange=\"updatel();\">\n";
+    // Create the "interface language" selection box for the preferences page.
+    // You can use something like "format PreferenceLanguages en|fr|zn" from within
+    // a collect.cfg file to use only a subset of the available languages for
+    // any given collection. This facility is kind of ugly though and should be
+    // replaced by something better when the configuration files are tidied up (as
+    // should all the other "format Preference..." options).
+    
+    text_t &arg_l = args["l"];
+    const recptconf &configinfo = recpt->get_configinfo();
+    // put languages in another map to sort them by longname
+    text_tmap languages;
+    languageinfo_tmap::const_iterator thislang = configinfo.languages.begin();
+    languageinfo_tmap::const_iterator endlang = configinfo.languages.end();
+    while (thislang != endlang) {
+      languages[(*thislang).second.longname] = (*thislang).first;
+      thislang++;
+    }
+    text_tmap::iterator tlang = languages.begin();
+    text_tmap::iterator elang = languages.end();
+
+    text_t languageoption;
     it = cinfo->format.find ("PreferenceLanguages");
     if ((it != cinfo->format.end()) && (!(*it).second.empty())) {
@@ -310 +309 @@
       splitchar ((*it).second.begin(), (*it).second.end(), '|', pref_langs);
       if (pref_langs.size() > 1) {
-    while (this_lang != end_lang) {
-      if (pref_langs.find(*this_lang) != pref_langs.end())
-        languageoption += "_" + *this_lang + "languageoption_\n";
-      this_lang ++;
+    while (tlang != elang) {
+      if (pref_langs.find((*tlang).second) != pref_langs.end()) {
+        languageoption += "<option value=\"" + (*tlang).second + "\"";
+        if ((*tlang).second == arg_l) languageoption += " selected";
+        languageoption += ">" + (*tlang).first + "\n";
+      }
+      tlang ++;
     }
-    languageoption += "</select>\n";
-    disp.setmacro ("languageoption", "preferences", languageoption);
-      }
-    
-      // _encodingoption_
-
-      if (pref_langs.find("zh") == pref_langs.end())
-    disp.setmacro ("encodingoption", "preferences", "");
+      }
 
     } else {
-      while (this_lang != end_lang) {
-    languageoption += "_" + *this_lang + "languageoption_\n";
-    this_lang ++;
-      }
+      while (tlang != elang) {
+    languageoption += "<option value=\"" + (*tlang).second + "\"";
+    if ((*tlang).second == arg_l) languageoption += " selected";
+    languageoption += ">" + (*tlang).first + "\n";
+    tlang ++;
+      }
+    }
+    if (!languageoption.empty()) {
+      languageoption = "<select name=\"l\" onChange=\"updatel();\">\n" + languageoption;
       languageoption += "</select>\n";
       disp.setmacro ("languageoption", "preferences", languageoption);
+    }
+
+    // _encodingoption_
+    // create the "encoding" selection box for the preferences page
+    text_t &arg_w = args["w"];
+    // put encodings in another map to sort them by longname
+    text_tmap encodings;
+    encodinginfo_tmap::const_iterator thisenc = configinfo.encodings.begin();
+    encodinginfo_tmap::const_iterator endenc = configinfo.encodings.end();
+    while (thisenc != endenc) {
+      encodings[(*thisenc).second.longname] = (*thisenc).first;
+      thisenc++;
+    }
+    text_tmap::iterator tenc = encodings.begin();
+    text_tmap::iterator eenc = encodings.end();
+
+    text_t encodingoption;
+    while (tenc != eenc) {
+      encodingoption += "<option value=\"" + (*tenc).second + "\"";
+      if ((*tenc).second == arg_w) encodingoption += " selected";
+      encodingoption += ">" + (*tenc).first + "\n";
+      tenc ++;
+    }
+
+    if (!encodingoption.empty()) {
+      encodingoption = "<select name=\"w\" onChange=\"updatew();\">\n" + encodingoption;
+      encodingoption += "</select>\n";
+      disp.setmacro ("encodingoption", "preferences", encodingoption);
     }