Adding lang patch see #3886 I'm not printing yet the lang vars in the footer not ready yet

skala
Julio Montoya 14 years ago
parent 7643f4e9d3
commit 032514525f
  1. 15
      main/inc/footer.inc.php
  2. 29
      main/inc/lib/internationalization.lib.php

@ -28,14 +28,26 @@ if (api_get_setting('show_navigation_menu') != 'false') {
<div class="push"></div>
</div> <!-- end of #wrapper section -->
<?php
/*
global $used_lang_vars;
if (!empty($used_lang_vars)) {
echo '<div style="float:left"><ul>';
foreach ($used_lang_vars as $var => $value) {
echo '<li><b>'.$var.'</b>: '.$value.'</li>';
}
echo '</ul></div>';
} else {
echo '<p>No translated strings on this page?!</p>';
}*/
?>
<div id="footer"> <!-- start of #footer section -->
<div id="bottom_corner"></div>
<?php
global $_configuration;
echo '<div class="copyright">';
if (api_get_setting('show_administrator_data') == 'true') {
// Platform manager
echo '<div align="right">', get_lang('Manager'), ' : ', Display::encrypted_mailto_link(api_get_setting('emailAdministrator'), api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))).'</div>';
@ -122,6 +134,7 @@ if (api_get_setting('show_teacher_data') == 'true') {
}
echo '</div>';
echo '</div> <!-- end of #footer -->';
/*
// Test server mode indicator and information for testing purposes.

@ -123,7 +123,12 @@ function get_lang($variable, $reserved = null, $language = null) {
$language_interface_initial_value,
// For serving the function is_translated()
$_api_is_translated, $_api_is_translated_call;
global $used_lang_vars;
if (!isset ($used_lang_vars))
$used_lang_vars = array();
// Caching results from some API functions, for speed.
static $initialized, $encoding, $is_utf8_encoding, $langpath, $test_server_mode, $show_special_markup;
if (!isset($initialized)) {
@ -139,6 +144,8 @@ function get_lang($variable, $reserved = null, $language = null) {
if (empty($language)) {
$language = $language_interface;
}
$lang_postfix = $is_interface_language ? '' : '('.$language.')';
$is_interface_language = $language == $language_interface_initial_value;
// This is a cache for already translated language variables. By using it, we avoid repetitive translations, gaining speed.
@ -147,7 +154,10 @@ function get_lang($variable, $reserved = null, $language = null) {
// Looking up into the cache for existing translation.
if (isset($cache[$language][$variable]) && !$_api_is_translated_call) {
// There is a previously saved translation, returning it.
return $cache[$language][$variable];
//return $cache[$language][$variable];
$ret = $cache[$language][$variable];
$used_lang_vars[$variable.$lang_postfix] = $ret;
return $ret;
}
$_api_is_translated = false;
@ -209,12 +219,18 @@ function get_lang($variable, $reserved = null, $language = null) {
$_api_is_translated = false;
$langvar = $show_special_markup ? SPECIAL_OPENING_TAG.$variable.SPECIAL_CLOSING_TAG : $variable;
}
return $cache[$language][$variable] = $is_utf8_encoding ? $langvar : api_utf8_decode($langvar, $encoding);
//return $cache[$language][$variable] = $is_utf8_encoding ? $langvar : api_utf8_decode($langvar, $encoding);
$ret = $cache[$language][$variable] = $is_utf8_encoding ? $langvar : api_utf8_decode($langvar, $encoding);
$used_lang_vars[$variable.$lang_postfix] = $ret;
return $ret;
}
// Translation mode for test/development servers.
if (!is_string($variable)) {
return $cache[$language][$variable] = SPECIAL_OPENING_TAG.'get_lang(?)'.SPECIAL_CLOSING_TAG;
//return $cache[$language][$variable] = SPECIAL_OPENING_TAG.'get_lang(?)'.SPECIAL_CLOSING_TAG;
$ret = $cache[$language][$variable] = SPECIAL_OPENING_TAG.'get_lang(?)'.SPECIAL_CLOSING_TAG;
$used_lang_vars[$variable.$lang_postfix] = $ret;
return $ret;
}
if (isset($$variable)) {
$langvar = $$variable;
@ -229,7 +245,10 @@ function get_lang($variable, $reserved = null, $language = null) {
$_api_is_translated = false;
$langvar = $show_special_markup ? SPECIAL_OPENING_TAG.$variable.SPECIAL_CLOSING_TAG : $variable;
}
return $cache[$language][$variable] = $is_utf8_encoding ? $langvar : api_utf8_decode($langvar, $encoding);
//return $cache[$language][$variable] = $is_utf8_encoding ? $langvar : api_utf8_decode($langvar, $encoding);
$ret = $cache[$language][$variable] = $is_utf8_encoding ? $langvar : api_utf8_decode($langvar, $encoding);
$used_lang_vars[$variable.$lang_postfix] = $ret;
return $ret;
}
/**

Loading…
Cancel
Save