tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Automatically including sapphire/javascript/i18n.js in Requirements::process_i18n_javascript() to avoid errors when Requirements are manually overwritten

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63640 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-10-04 17:44:54 +00:00
parent a79ab917c7
commit 1b6821e430
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/Requirements.php
View File

@ -355,11 +355,14 @@ class Requirements {
* Assumes that a subfolder /javascript exists relative to the included
* javascript file, with a file named after the locale -
* so usually <mymodule>/javascript/lang/en_US.js.
*
* Caution: Assumes the manual inclusion of sapphire/javascript/i18n.js
* before
*/
protected static function process_i18n_javascript() {
// ensure to include the i18n base library
if(!isset(self::$javascript[SAPPHIRE_DIR . '/javascript/i18n.js'])) {
self::$javascript[SAPPHIRE_DIR . '/javascript/i18n.js'] = true;
}
// include the specific locale and the master locale for each module
foreach(array_diff_key(self::$javascript,self::$blocked) as $file => $dummy) {
if(preg_match('/^http[s]?/', $file)) continue;