Merge pull request #549 from AngelFQC/BT9092

Load sublanguage in plugin templates - refs BT#9092
1.10.x
Yannick Warnier 11 years ago
commit b7e62c802d
  1. 2
      main/inc/lib/api.lib.php
  2. 15
      main/inc/lib/plugin.class.php

@ -4078,7 +4078,7 @@ function api_get_language_id($language)
}
$language = Database::escape_string($language);
$sql = "SELECT id FROM $tbl_language
WHERE available='1' AND dokeos_folder = '$language' LIMIT 1";
WHERE dokeos_folder = '$language' LIMIT 1";
$result = Database::query($sql);
$row = Database::fetch_array($result);
return $row['id'];

@ -304,6 +304,10 @@ class Plugin
$root = api_get_path(SYS_PLUGIN_PATH);
$plugin_name = $this->get_name();
$interfaceLanguageId = api_get_language_id($language_interface);
$interfaceLanguageInfo = api_get_language_info($interfaceLanguageId);
$languageParentId = intval($interfaceLanguageInfo['parent_id']);
//1. Loading english if exists
$english_path = $root.$plugin_name."/lang/english.php";
if (is_readable($english_path)) {
@ -315,6 +319,17 @@ class Plugin
//2. Loading the system language
if (is_readable($path)) {
include $path;
if (!empty($strings)) {
foreach ($strings as $key => $string) {
$this->strings[$key] = $string;
}
}
} elseif ($languageParentId > 0) {
$languageParentInfo = api_get_language_info($languageParentId);
$languageParentFolder = $languageParentInfo['dokeos_folder'];
include "{$root}{$plugin_name}/lang/{$languageParentFolder}.php";
if (!empty($strings)) {
foreach ($strings as $key => $string) {
$this->strings[$key] = $string;

Loading…
Cancel
Save