2 files changed, 33 insertions, 25 deletions

diff --git a/i18n.c b/i18n.c
index d391dfea..10cfa3bc 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.205 2005/09/04 14:28:07 kls Exp $
+ * $Id: i18n.c 1.206 2005/09/09 14:35:53 kls Exp $
  *
  * Translations provided by:
  *
@@ -5538,32 +5538,31 @@ const char *I18nNormalizeLanguageCode(const char *Code)
 
 bool I18nIsPreferredLanguage(int *PreferredLanguages, const char *LanguageCode, int &OldPreference, int *Position)
 {
-  if (Position)
-     *Position = 0;
-Retry:
-  int LanguageIndex = I18nLanguageIndex(LanguageCode);
-  for (int i = 0; i < I18nNumLanguages; i++) {
-      if (PreferredLanguages[i] < 0)
-         break; // the language is not a preferred one
-      if (PreferredLanguages[i] == LanguageIndex) {
-         if (OldPreference < 0 || i < OldPreference) {
-            OldPreference = i;
-            if (Position && !*Position && strchr(LanguageCode, '+'))
-               (*Position)++;
-            return true;
+  int pos = 1;
+  while (LanguageCode) {
+        int LanguageIndex = I18nLanguageIndex(LanguageCode);
+        for (int i = 0; i < I18nNumLanguages; i++) {
+            if (PreferredLanguages[i] < 0)
+               break; // the language is not a preferred one
+            if (PreferredLanguages[i] == LanguageIndex) {
+               if (OldPreference < 0 || i < OldPreference) {
+                  OldPreference = i;
+                  if (Position)
+                     *Position = pos;
+                  break;
+                  }
+               }
             }
-         break;
-         }
-      }
-  if ((LanguageCode = strchr(LanguageCode, '+')) != NULL) {
-     LanguageCode++;
-     if (Position)
-        (*Position)++;
-     goto Retry;
-     }
+        if ((LanguageCode = strchr(LanguageCode, '+')) != NULL) {
+           LanguageCode++;
+           pos++;
+           }
+        else if (pos == 1 && Position)
+           *Position = 0;
+        }
   if (OldPreference < 0) {
      OldPreference = I18nNumLanguages; // higher than the maximum possible value
      return true; // if we don't find a preferred one, we take the first one
      }
-  return false;
+  return OldPreference >= 0;
 }
diff --git a/i18n.h b/i18n.h
index a4293262..a1795146 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.15 2005/09/04 14:37:01 kls Exp $
+ * $Id: i18n.h 1.16 2005/09/09 14:50:35 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -29,6 +29,15 @@ const char *I18nNormalizeLanguageCode(const char *Code);
    ///< If no normalized language code can be found, the given Code is returned.
    ///< Make sure at most 3 characters are copied when using it!
 bool I18nIsPreferredLanguage(int *PreferredLanguages, const char *LanguageCode, int &OldPreference, int *Position = NULL);
+   ///< Checks the given LanguageCode (which may be something like "eng" or "eng+deu")
+   ///< against the PreferredLanguages and returns true if one is found that has an index
+   ///< smaller than OldPreference (which should be initialized to -1 before the first
+   ///< call to this function in a sequence of checks). If LanguageCode is not any of
+   ///< the PreferredLanguages, and OldPreference is less than zero, OldPreference will
+   ///< be set to a value higher than the highest language index.  If Position is given,
+   ///< it will return 0 if this was a single language code (like "eng"), 1 if it was
+   ///< the first of two language codes (like "eng" out of "eng+deu") and 2 if it was
+   ///< the second one (like "deu" out of ""eng+deu").
 
 #ifdef PLUGIN_NAME_I18N
 #define tr(s)  I18nTranslate(s, PLUGIN_NAME_I18N)