fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applying missed change into streamJSTranslationFile function to set en.js part of js-calendar.:q

Browse Source
This commit is contained in:
ralph
2012-12-03 12:48:05 -04:00
parent f039ca92fa
commit eb76b2f93d
1 changed files with 28 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
gulliver/system/class.bootstrap.php
View File

@@ -220,8 +220,8 @@ class Bootstrap
} }
$smarty = new Smarty (); $smarty = new Smarty ();
$smarty->compile_dir = g::sys_get_temp_dir (); $smarty->compile_dir = Bootstrap::sys_get_temp_dir ();
$smarty->cache_dir = g::sys_get_temp_dir (); $smarty->cache_dir = Bootstrap::sys_get_temp_dir ();
$smarty->config_dir = PATH_THIRDPARTY . 'smarty/configs'; $smarty->config_dir = PATH_THIRDPARTY . 'smarty/configs';
$smarty->template_dir = PATH_TEMPLATE; $smarty->template_dir = PATH_TEMPLATE;
@@ -888,47 +888,37 @@ class Bootstrap
* @return string * @return string
*/ */
public function streamJSTranslationFile($filename, $locale = 'en') { public function streamJSTranslationFile($filename, $locale = 'en') {
header ( 'Content-Type: text/javascript' ); $defaultTranslations = Array ();
$foreignTranslations = Array ();
if (! Bootstrap::LoadTranslationObject ( $locale )) { //if the default translations table doesn't exist we can't proceed
header ( 'Cache-Control: no-cache' ); if (! is_file( PATH_LANGUAGECONT . 'translation.en' )) {
header ( 'Pragma: no-cache' ); return ;
return; }
} //load the translations table
require_once (PATH_LANGUAGECONT . 'translation.en');
$defaultTranslations = $translation;
global $translation; //if some foreign language was requested and its translation file exists
if ($locale != 'en' && file_exists( PATH_LANGUAGECONT . 'translation.' . $locale )) {
require_once (PATH_LANGUAGECONT . 'translation.' . $locale); //load the foreign translations table
$foreignTranslations = $translation;
}
// if userAgent (BROWSER) is MSIE we need special headers to avoid MSIE if (defined( "SHOW_UNTRANSLATED_AS_TAG" ) && SHOW_UNTRANSLATED_AS_TAG != 0) {
// behaivor. $translation = $foreignTranslations;
$userAgent = strtolower ( $_SERVER ['HTTP_USER_AGENT'] ); } else {
if (file_exists ( $filename )) { $translation = array_merge( $defaultTranslations, $foreignTranslations );
$mtime = filemtime ( $filename ); }
} else {
$mtime = date ( 'U' );
}
$gmt_mtime = gmdate ( "D, d M Y H:i:s", $mtime ) . " GMT"; $calendarJs = '';
header ( 'Pragma: cache' ); $calendarJsFile = PATH_GULLIVER_HOME . "js/widgets/js-calendar/lang/" . $locale .".js";
header ( 'ETag: "' . md5 ( $mtime . $filename ) . '"' ); if (! file_exists($calendarJsFile)) {
header ( "Last-Modified: " . $gmt_mtime ); $calendarJsFile = PATH_GULLIVER_HOME . "js/widgets/js-calendar/lang/en.js";
header ( 'Cache-Control: public' ); }
header ( "Expires: " . gmdate ( "D, d M Y H:i:s", time () + 30 * 60 * 60 * 24 ) . " GMT" ); // 1 $calendarJs = file_get_contents($calendarJsFile) . "\n";
// month
if (isset ( $_SERVER ['HTTP_IF_MODIFIED_SINCE'] )) {
if ($_SERVER ['HTTP_IF_MODIFIED_SINCE'] == $gmt_mtime) {
header ( 'HTTP/1.1 304 Not Modified' );
exit ();
}
}
if (isset ( $_SERVER ['HTTP_IF_NONE_MATCH'] )) { return $calendarJs . 'var TRANSLATIONS = ' . Bootstrap::json_encode( $translation ) . ';' ;
if (str_replace ( '"', '', stripslashes ( $_SERVER ['HTTP_IF_NONE_MATCH'] ) ) == md5 ( $mtime . $filename )) {
header ( "HTTP/1.1 304 Not Modified" );
exit ();
}
}
return 'var TRANSLATIONS = ' . Bootstrap::json_encode ( $translation ) . ";\n";
} }
/** /**