Changeset 25288 for trunk/include/functions.inc.php

Timestamp:

Nov 1, 2013, 4:34:30 PM (10 years ago)

Author:

mistic100

Message:

feature 2651: fallback language, failed when the "child" file does not exists

File:

• trunk/include/functions.inc.php (modified) (3 diffs)

trunk/include/functions.inc.php

@@ -1354 +1354 @@
 
 /**
+ * returns the parent language of the current language or any language
+ * @since 2.6
+ * @param string $lang_id
+ * @return string
+ */
+function get_parent_language($lang_id=null)
+{
+  if (empty($lang_id))
+  {
+    global $lang_info;
+    return !empty($lang_info['parent']) ? $lang_info['parent'] : null;
+  }
+  else
+  {
+    $f = PHPWG_ROOT_PATH.'language/'.$lang_id.'/common.lang.php';
+    if (file_exists($f))
+    {
+      include($f);
+      return !empty($lang_info['parent']) ? $lang_info['parent'] : null;
+    }
+  }
+  return null;
+}
+
+/**
  * includes a language file or returns the content of a language file
  * availability of the file
@@ -1403 +1428 @@
     $languages[] = $user['language'];
   }
+  if ( ($parent = get_parent_language()) != null)
+  {
+    $languages[] = $parent;
+  }
   if ( ! @$options['no_fallback'] )
   {
@@ -1454 +1483 @@
       $parent_language = !empty($load_lang_info['parent']) ? $load_lang_info['parent'] : (
                             !empty($lang_info['parent']) ? $lang_info['parent'] : null );
-      if (!empty($parent_language))
+      if (!empty($parent_language) and $parent_language != $selected_language)
       {
         @include(str_replace($selected_language, $parent_language, $source_file));