Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

15 files changed, 30 insertions, 0 deletions

diff --git a/mod/languages/views/default/js/languages/ca.php b/mod/languages/views/default/js/languages/ca.php
new file mode 100644
index 000000000..73d4ac1bc
--- /dev/null
+++ b/mod/languages/views/default/js/languages/ca.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view('js/languages', array('language' => 'ca'));
diff --git a/mod/languages/views/default/js/languages/da.php b/mod/languages/views/default/js/languages/da.php
new file mode 100644
index 000000000..1c82510a9
--- /dev/null
+++ b/mod/languages/views/default/js/languages/da.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view('js/languages', array('language' => 'da'));
diff --git a/mod/languages/views/default/js/languages/de.php b/mod/languages/views/default/js/languages/de.php
new file mode 100644
index 000000000..216b49ff1
--- /dev/null
+++ b/mod/languages/views/default/js/languages/de.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view('js/languages', array('language' => 'de'));
\ No newline at end of file
diff --git a/mod/languages/views/default/js/languages/en.php b/mod/languages/views/default/js/languages/en.php
new file mode 100644
index 000000000..2c78e400e
--- /dev/null
+++ b/mod/languages/views/default/js/languages/en.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view('js/languages', array('language' => 'en'));
diff --git a/mod/languages/views/default/js/languages/es.php b/mod/languages/views/default/js/languages/es.php
new file mode 100644
index 000000000..26cbd9103
--- /dev/null
+++ b/mod/languages/views/default/js/languages/es.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view('js/languages', array('language' => 'es'));
diff --git a/mod/languages/views/default/js/languages/eu.php b/mod/languages/views/default/js/languages/eu.php
new file mode 100644
index 000000000..bf80b3eda
--- /dev/null
+++ b/mod/languages/views/default/js/languages/eu.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view('js/languages', array('language' => 'eu'));
diff --git a/mod/languages/views/default/js/languages/fr.php b/mod/languages/views/default/js/languages/fr.php
new file mode 100644
index 000000000..a3f36b2cd
--- /dev/null
+++ b/mod/languages/views/default/js/languages/fr.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view('js/languages', array('language' => 'fr'));
diff --git a/mod/languages/views/default/js/languages/gl.php b/mod/languages/views/default/js/languages/gl.php
new file mode 100644
index 000000000..7efd26d4f
--- /dev/null
+++ b/mod/languages/views/default/js/languages/gl.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view('js/languages', array('language' => 'gl'));
diff --git a/mod/languages/views/default/js/languages/it.php b/mod/languages/views/default/js/languages/it.php
new file mode 100644
index 000000000..bd543a381
--- /dev/null
+++ b/mod/languages/views/default/js/languages/it.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view('js/languages', array('language' => 'it'));
diff --git a/mod/languages/views/default/js/languages/ja.php b/mod/languages/views/default/js/languages/ja.php
new file mode 100644
index 000000000..76ef44599
--- /dev/null
+++ b/mod/languages/views/default/js/languages/ja.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view('js/languages', array('language' => 'ja'));
diff --git a/mod/languages/views/default/js/languages/nl.php b/mod/languages/views/default/js/languages/nl.php
new file mode 100644
index 000000000..d5d6c77bd
--- /dev/null
+++ b/mod/languages/views/default/js/languages/nl.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view('js/languages', array('language' => 'nl'));
diff --git a/mod/languages/views/default/js/languages/pt.php b/mod/languages/views/default/js/languages/pt.php
new file mode 100644
index 000000000..4b6ac08c4
--- /dev/null
+++ b/mod/languages/views/default/js/languages/pt.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view('js/languages', array('language' => 'pt'));
diff --git a/mod/languages/views/default/js/languages/sr.php b/mod/languages/views/default/js/languages/sr.php
new file mode 100644
index 000000000..e04642848
--- /dev/null
+++ b/mod/languages/views/default/js/languages/sr.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view('js/languages', array('language' => 'sr'));
diff --git a/mod/languages/views/default/js/languages/th.php b/mod/languages/views/default/js/languages/th.php
new file mode 100644
index 000000000..058b46f5e
--- /dev/null
+++ b/mod/languages/views/default/js/languages/th.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view('js/languages', array('language' => 'th'));
diff --git a/mod/languages/views/default/js/languages/zh.php b/mod/languages/views/default/js/languages/zh.php
new file mode 100644
index 000000000..662fb8cf1
--- /dev/null
+++ b/mod/languages/views/default/js/languages/zh.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view('js/languages', array('language' => 'zh'));