Merge branch 'develop' into pr/advanced-mailer

common/defaults/blacklist.php

@@ -10,6 +10,7 @@ return array(
 	'errorlogger' => true,
 	'fix_mysql_utf8' => true,
 	'member_communication' => true,
+	'seo' => true,
 	'smartphone' => true,
 	'zipperupper' => true,
 );

common/defaults/config.php

@@ -99,6 +99,15 @@ return array(
 		'display_to' => 'admin',
 		'allow' => array(),
 	),
+	'seo' => array(
+		'main_title' => '',
+		'subpage_title' => '',
+		'document_title' => '',
+		'og_enabled' => false,
+		'og_extract_description' => false,
+		'og_extract_images' => false,
+		'og_use_timestamps' => false,
+	),
 	'mediafilter' => array(
 		'iframe' => array(),
 		'object' => array(),

common/defaults/locales.php

@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Conversion map from languages to locales
+ * 
+ * Copyright (c) Rhymix Developers and Contributors
+ */
+return array(
+	'ko' => 'ko_KR',
+	'en' => 'en_US',
+	'ja' => 'ja_JP',
+	'zh-CN' => 'zh_CN',
+	'zh-TW' => 'zh_TW',
+	'de' => 'de_DE',
+	'es' => 'es_ES',
+	'fr' => 'fr_FR',
+	'mn' => 'mn_MN',
+	'ru' => 'ru_RU',
+	'tr' => 'tr_TR',
+	'vi' => 'vi_VN',
+);