5 files changed, 14 insertions, 3 deletions
diff --git a/views/default/input/longtext.php b/views/default/input/longtext.php
index 2b1462635..61dc7ca19 100644
--- a/views/default/input/longtext.php
+++ b/views/default/input/longtext.php
@@ -19,6 +19,8 @@ if (isset($vars['class'])) {
 
 $defaults = array(
 	'value' => '',
+	'rows' => '10',
+	'cols' => '50',
 	'id' => 'elgg-input-' . rand(), //@todo make this more robust
 );
 
diff --git a/views/default/input/plaintext.php b/views/default/input/plaintext.php
index cd0aaafcf..e92c61ced 100644
--- a/views/default/input/plaintext.php
+++ b/views/default/input/plaintext.php
@@ -20,6 +20,8 @@ if (isset($vars['class'])) {
 
 $defaults = array(
 	'value' => '',
+	'rows' => '10',
+	'cols' => '50',
 	'disabled' => false,
 );
 
diff --git a/views/default/input/text.php b/views/default/input/text.php
index 707a50179..07ce5c710 100644
--- a/views/default/input/text.php
+++ b/views/default/input/text.php
@@ -23,5 +23,4 @@ $defaults = array(
 $vars = array_merge($defaults, $vars);
 
 ?>
-
 <input type="text" <?php echo elgg_format_attributes($vars); ?> />
 \ No newline at end of file
diff --git a/views/default/js/languages.php b/views/default/js/languages.php
index 009e8159c..c51d7bcb2 100644
--- a/views/default/js/languages.php
+++ b/views/default/js/languages.php
@@ -6,4 +6,10 @@ global $CONFIG;
 
 $language = $vars['language'];
 
-echo json_encode($CONFIG->translations[$language]);
-\ No newline at end of file
+$translations = $CONFIG->translations['en'];
+
+if ($language != 'en') {
+	$translations = array_merge($translations, $CONFIG->translations[$language]);
+}
+
+echo json_encode($translations);
+\ No newline at end of file
diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index e968e95ce..1eb2be088 100644
--- a/views/default/page/elements/head.php
+++ b/views/default/page/elements/head.php
@@ -66,7 +66,9 @@ $release = get_version(true);
 <?php } ?>
 
 <script type="text/javascript">
+// <![CDATA[
 	<?php echo elgg_view('js/initialize_elgg'); ?>
+// ]]>
 </script>
 
 <?php
@@ -76,4 +78,4 @@ $metatags = elgg_view('metatags', $vars);
 if ($metatags) {
 	elgg_deprecated_notice("The metatags view has been deprecated. Extend page/elements/head instead", 1.8);
 	echo $metatags;
-}
-\ No newline at end of file
+}