Javascript l10n: Work without $config['additional_javascript_compile']

1 files changed, 7 insertions, 6 deletions

diff --git a/inc/functions.php b/inc/functions.php
index d904e1a2..1ffa32df 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1277,16 +1277,17 @@ function buildJavascript() {
 			'uri' => addslashes((!empty($uri) ? $config['uri_stylesheets'] : '') . $uri));
 	}
 	
-	// Check if we have translation for the javascripts; if yes, we add it to additional javascripts
-	list($pure_locale) = explode(".", $config['locale']);
-	if (file_exists ($jsloc = "inc/locale/".$pure_locale."/LC_MESSAGES/javascript.js")) {
-		array_unshift($config['additional_javascript'], $jsloc);
-	}
-
 	$script = Element('main.js', array(
 		'config' => $config,
 		'stylesheets' => $stylesheets
 	));
+	
+	// Check if we have translation for the javascripts; if yes, we add it to additional javascripts
+	list($pure_locale) = explode(".", $config['locale']);
+	if (file_exists ($jsloc = "inc/locale/$pure_locale/LC_MESSAGES/javascript.js")) {
+		$script = file_get_contents($jsloc) . "\n\n" . $script;
+	}
+	
 	if ($config['additional_javascript_compile']) {
 		foreach ($config['additional_javascript'] as $file) {
 			$script .= file_get_contents($file);