Changeset 10563

Timestamp:

2005-08-25T13:24:14+12:00 (19 years ago)

Author:

jrm21

Message:

if we don't support the default_encoding, then instead of always using ""
we'll use the encoding set in main.cfg if there is only 1 supported encoding

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -531 +531 @@
 
   // make sure the encoding is valid
-  if (converters.find(default_encoding) == converters.end()) return "";
+  if (converters.find(default_encoding) == converters.end()) {
+    // we don't support the encoding specified as default for this language
+    if (configinfo.encodings.size()==1) {
+      // only 1 encoding specified in main.cfg, so use it
+      return configinfo.encodings.begin()->second;
+    }
+    return "";
+  }
 
   return default_encoding;