Merge pull request #6 from dignajar/master

Pull request
2017-05-14 01:12:08 +02:00 · 2017-05-14 01:12:08 +02:00 · d76ed0c661
parent c7e2a8ae22 ce8b771300
commit d76ed0c661
21 changed files with 102 additions and 64 deletions
--- a/bl-kernel/admin/views/themes.php
+++ b/bl-kernel/admin/views/themes.php
@ -41,7 +41,7 @@ foreach($themes as $theme)
 	<td class="uk-text-center">';

 	if( !$theme['compatible'] ) {
-		echo '<i class="uk-icon-exclamation-triangle incompatible-warning" title="This theme is incompatible with Bludit v'.BLUDIT_VERSION.'"></i>';
+		echo '<i class="uk-icon-exclamation-triangle incompatible-warning" title="'.$L->g('This theme may not be supported by this version of Bludit').'"></i>';
 	}
 	echo $theme['version'].'</td>';

--- a/bl-kernel/boot/init.php
+++ b/bl-kernel/boot/init.php
@ -1,7 +1,7 @@
 <?php defined('BLUDIT') or die('Bludit CMS.');

 // Bludit version
-define('BLUDIT_VERSION',	'1.6-beta');
+define('BLUDIT_VERSION',	'1.6');
 define('BLUDIT_CODENAME',	'');
 define('BLUDIT_RELEASE_DATE',	'');
 define('BLUDIT_BUILD',		'');
--- a/bl-kernel/helpers/text.class.php
+++ b/bl-kernel/helpers/text.class.php
@ -68,7 +68,34 @@ class Text {
 		'Ā'=>'A', 'Č'=>'C', 'Ē'=>'E', 'Ģ'=>'G', 'Ī'=>'i', 'Ķ'=>'k', 'Ļ'=>'L', 'Ņ'=>'N',
 		'Š'=>'S', 'Ū'=>'u', 'Ž'=>'Z',
 		'ā'=>'a', 'č'=>'c', 'ē'=>'e', 'ģ'=>'g', 'ī'=>'i', 'ķ'=>'k', 'ļ'=>'l', 'ņ'=>'n',
-		'š'=>'s', 'ū'=>'u', 'ž'=>'z'
+		'š'=>'s', 'ū'=>'u', 'ž'=>'z',
+		// Vietnamese
+		'Ả'=>'A', 'Ạ'=>'A',
+		'Ă'=>'A', 'Ằ'=>'A', 'Ắ'=>'A', 'Ẳ'=>'A', 'Ẵ'=>'A', 'Ặ'=>'A',
+		'Ầ'=>'A', 'Ấ'=>'A', 'Ẩ'=>'A', 'Ẫ' => 'A', 'Ậ'=>'A',
+		'Ẻ'=>'E', 'Ẽ'=>'E', 'Ẹ'=>'E',
+		'Ề'=>'E', 'Ế'=>'E', 'Ể'=>'E', 'Ễ'=>'E', 'Ệ'=>'E',
+		'Ỉ'=>'I', 'Ĩ'=>'I', 'Ị'=>'I',
+		'Ỏ'=>'O', 'Ọ'=>'O',
+		'Ơ'=>'O', 'Ờ'=>'O', 'Ớ'=>'O', 'Ở'=>'O', 'Ỡ'=>'O', 'Ợ'=>'O',
+		'Ồ'=>'O', 'Ố'=>'O', 'Ổ'=>'O', 'Ỗ'=>'O', 'Ộ'=>'O',
+		'Ư'=>'U', 'Ừ'=>'U', 'Ứ'=>'U', 'Ử'=>'U', 'Ữ'=>'U', 'Ự'=>'U',
+		'Ủ'=>'U', 'Ũ'=>'U',
+		'Ỳ'=>'Y', 'Ỷ'=>'Y', 'Ỹ'=>'Y', 'Ỵ' => 'Y',
+		'Đ'=>'D',
+		'ả'=>'a', 'ạ'=>'a',
+		'ă'=>'a', 'ằ'=>'a', 'ắ'=>'a', 'ẳ'=>'a', 'ặ'=>'a', 'ẵ'=>'a',
+		'ầ'=>'a', 'ấ'=>'a', 'ẩ'=>'a', 'ẫ' => 'a', 'ậ'=>'a',
+		'ẻ'=>'e', 'ẽ'=>'e', 'ẹ'=>'e',
+		'ề'=>'e', 'ế'=>'e', 'ể'=>'e', 'ễ'=>'e', 'ệ'=>'e',
+		'ỉ'=>'i', 'ĩ'=>'i', 'ị'=>'i',
+		'ỏ'=>'o', 'ọ'=>'o',
+		'ơ'=>'o', 'ờ'=>'o', 'ớ'=>'o', 'ở'=>'o', 'ỡ'=>'o', 'ợ'=>'o',
+		'ồ'=>'o', 'ố'=>'o', 'ổ'=>'o', 'ỗ'=>'o', 'ộ'=>'o',
+		'ư'=>'u', 'ừ'=>'u', 'ứ'=>'u', 'ử'=>'u', 'ữ'=>'u', 'ự'=>'u',
+		'ủ'=>'u', 'ũ'=>'u',
+		'ỳ'=>'y', 'ỷ'=>'y', 'ỹ'=>'y', 'ỵ' => 'y',
+		'đ'=>'d',
 	);

 	public static function addSlashes($string, $begin=true, $end=true)
@ -220,4 +247,4 @@ class Text {
 			$string);
 	}

-}
+}
--- a/bl-languages/en_US.json
+++ b/bl-languages/en_US.json
@ -3,7 +3,7 @@
 	{
 		"native": "English (United States)",
 		"english-name": "English",
-		"last-update": "2016-02-13",
+		"last-update": "2017-05-08",
 		"author": "Diego",
 		"email": "",
 		"website": ""
@ -228,7 +228,6 @@

 	"click-here-to-cancel": "Click here to cancel.",
 	"type-the-tag-and-press-enter": "Type the tag and press enter.",
-	"add": "Add",
 	"manage-your-bludit-from-the-admin-panel": "Manage your Bludit from the [admin area]({{ADMIN_AREA_LINK}})",
 	"there-are-no-images":"There are no images",

@ -252,11 +251,7 @@
 	"add-a-new-post": "Add a new post",

 	"save-as-draft": "Save as draft",
-	"categories": "Сategories",
-	"add-a-new-category": "Add a new category",
-	"new-category": "New category",
 	"slug": "slug",
-	"edit-category": "Edit category",
-	"last-page": "Last page",
-	"first-page": "First page"
+	"this-plugin-may-not-be-supported-by-this-version-of-bludit": "This plugin may not be supported by this version of Bludit",
+	"this-theme-may-not-be-supported-by-this-version-of-bludit": "This theme may not be supported by this version of Bludit"
 }
--- a/bl-languages/es_AR.json
+++ b/bl-languages/es_AR.json
@ -3,7 +3,7 @@
 	{
 		"native": "Español (Argentina)",
 		"english-name": "Spanish",
-		"last-update": "2016-02-13",
+		"last-update": "2017-05-08",
 		"author": "Diego",
 		"email": "",
 		"website": ""
@ -226,7 +226,6 @@

 	"click-here-to-cancel": "Clic aquí para cancelar.",
 	"type-the-tag-and-press-enter": "Escriba la etiqueta y presione enter.",
-	"add": "Agregar",
 	"manage-your-bludit-from-the-admin-panel": "Administre su Bludit desde el [panel de administración]({{ADMIN_AREA_LINK}})",
 	"there-are-no-images":"No hay imagenes",

@ -247,5 +246,10 @@
 	"сurrent-status" : "Estado",
 	"disable-the-user" : "Deshabilitar usuario",
 	"add-a-new-page": "Crear nueva pagina",
-	"add-a-new-post": "Crear nuevo post"
+	"add-a-new-post": "Crear nuevo post",
+
+	"save-as-draft": "Guardar como borrador",
+	"slug": "Slug",
+	"this-plugin-may-not-be-supported-by-this-version-of-bludit": "Esta extension puede que no sea compatible con esta versión de Bludit",
+	"this-theme-may-not-be-supported-by-this-version-of-bludit": "Este tema puede que no sea compatible con esta versión de Bludit"
 }
--- a/bl-languages/it_IT.json
+++ b/bl-languages/it_IT.json
@ -235,5 +235,27 @@
 	"delete-image": "Elimima immagine",
 	"image-description": "Descrizione dell'immagine",

-	"social-networks-links": "Social Networks"
+	"social-networks-links": "Social Networks",
+	"email-access-code": "Codice di Accesso",
+	"current-format": "Formato attuale",
+
+	"welcome": "Benvenuto",
+
+	"to-enable-the-user-you-have-to-set-a-new-password": "Per attivare l'utente devi impostare una nuova password."
+	"do-you-want-to-disable-the-user": "Vuoi disabilitare l'utente ?",
+	"сurrent-status" : "Stato",
+	"disable-the-user" : "Disabilita l'utente",
+	"add-a-new-page": "Crea una nuova pagina",
+	"add-a-new-post": "Crea un nuovo post",
+
+	"save-as-draft": "Salva come bozza",
+	"categories": "Categorie",
+	"add-a-new-category": "Aggiungi una nuova categoria",
+	"new-category": "Nuova categoria",
+	"slug": "slug",
+	"edit-category": "Modifica categoria",
+	"last-page": "Ultima pagina",
+	"first-page": "Prima pagina"
+	
+	
 }
--- a/bl-languages/ru_RU.json
+++ b/bl-languages/ru_RU.json
@ -249,5 +249,13 @@
 	"add-a-new-page": "Добавить страницу",
 	"add-a-new-post": "Добавить запись",
 	
-	"save-as-draft": "Сохранить как черновик"
+	"save-as-draft": "Сохранить как черновик",
+	
+	"categories": "Категории",
+	"add-a-new-category": "Добавить новую категорию",
+	"new-category": "Новая категория",
+	"slug": "Slug",
+	"edit-category": "Редактировать категорию",
+	"last-page": "Последняя страница",
+	"first-page": "Первая страница"
 }
--- a/bl-plugins/about/metadata.json
+++ b/bl-plugins/about/metadata.json
@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "1.5.2",
+	"version": "1.6",
 	"releaseDate": "2016-05-28",
 	"license": "MIT",
-	"compatible": "1.5.2",
+	"compatible": "1.5.2,1.6",
 	"notes": ""
 }
--- a/bl-plugins/api/metadata.json
+++ b/bl-plugins/api/metadata.json
@ -1,10 +1,10 @@
 {
 	"author": "Bludit",
 	"email": "",
-	"website": "https://plugins.bludit.com",
-	"version": "1.5.2",
-	"releaseDate": "2016-05-28",
+	"website": "https://docs.bludit.com/en/api/introduction",
+	"version": "1.6",
+	"releaseDate": "2017-05-10",
 	"license": "MIT",
-	"compatible": "1.5.2",
+	"compatible": "1.5.2,1.6",
 	"notes": ""
 }
--- a/bl-plugins/api/plugin.php
+++ b/bl-plugins/api/plugin.php
@ -22,29 +22,11 @@ class pluginAPI extends Plugin {
 		$html = '';

 		$html .= '<div>';
-		$html .= '<p><b>Authorization Key:</b> '.$this->getDbField('token').'</p>';
+		$html .= '<p><b>Token:</b> '.$this->getDbField('token').'</p>';
 		$html .= '<div class="tip">This key is private, do not share it with anyone.</div>';
 		$html .= '</div>';

-		$html .= '<div>';
-		$html .= '<p><b>Show all posts:</b> <a href="'.DOMAIN_BASE.'api/show/all/posts/'.$this->getDbField('token').'">'.DOMAIN_BASE.'api/show/all/posts/'.$this->getDbField('token').'</a></p>';
-		$html .= '<div class="tip">Get all posts from this site.</div>';
-		$html .= '</div>';
-
-		$html .= '<div>';
-		$html .= '<p><b>Show all pages:</b> <a href="'.DOMAIN_BASE.'api/show/all/pages/'.$this->getDbField('token').'">'.DOMAIN_BASE.'api/show/all/pages/'.$this->getDbField('token').'</a></p>';
-		$html .= '<div class="tip">Get all pages from this site.</div>';
-		$html .= '</div>';
-
-		$html .= '<div>';
-		$html .= '<p><b>Show post:</b> <a href="'.DOMAIN_BASE.'api/show/post/{POST-NAME}">'.DOMAIN_BASE.'api/show/post/{POST-NAME}</a></p>';
-		$html .= '<div class="tip">Get a particular post, change the {POST-NAME} with the post friendly url.</div>';
-		$html .= '</div>';
-
-		$html .= '<div>';
-		$html .= '<p><b>Show page:</b> <a href="'.DOMAIN_BASE.'api/show/page/{PAGE-NAME}">'.DOMAIN_BASE.'api/show/page/{PAGE-NAME}</a></p>';
-		$html .= '<div class="tip">Get a particular page, change the {PAGE-NAME} with the page friendly url.</div>';
-		$html .= '</div>';
+		$html .= '<div>Check the documentation about the API <a href="https://docs.bludit.com/en/api/introduction">Bludit Docs API</a></div>';

 		return $html;
 	}
--- a/bl-plugins/disqus/metadata.json
+++ b/bl-plugins/disqus/metadata.json
@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "1.5.2",
+	"version": "1.6",
 	"releaseDate": "2016-05-28",
 	"license": "MIT",
-	"compatible": "1.5.2",
+	"compatible": "1.5.2,1.6",
 	"notes": ""
 }
--- a/bl-plugins/googletools/metadata.json
+++ b/bl-plugins/googletools/metadata.json
@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "1.5.2",
+	"version": "1.6",
 	"releaseDate": "2016-05-28",
 	"license": "MIT",
-	"compatible": "1.5.2",
+	"compatible": "1.5.2,1.6",
 	"notes": ""
 }
--- a/bl-plugins/latest_posts/metadata.json
+++ b/bl-plugins/latest_posts/metadata.json
@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "1.5.2",
+	"version": "1.6",
 	"releaseDate": "2016-05-28",
 	"license": "MIT",
-	"compatible": "1.5.2",
+	"compatible": "1.5.2,1.6",
 	"notes": ""
 }
--- a/bl-plugins/maintenancemode/metadata.json
+++ b/bl-plugins/maintenancemode/metadata.json
@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "1.5.2",
+	"version": "1.6",
 	"releaseDate": "2016-05-28",
 	"license": "MIT",
-	"compatible": "1.5.2",
+	"compatible": "1.5.2,1.6",
 	"notes": ""
 }
--- a/bl-plugins/opengraph/metadata.json
+++ b/bl-plugins/opengraph/metadata.json
@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "1.5.2",
+	"version": "1.6",
 	"releaseDate": "2016-05-28",
 	"license": "MIT",
-	"compatible": "1.5.2",
+	"compatible": "1.5.2,1.6",
 	"notes": ""
 }
--- a/bl-plugins/pages/metadata.json
+++ b/bl-plugins/pages/metadata.json
@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "1.5.2",
+	"version": "1.6",
 	"releaseDate": "2016-05-28",
 	"license": "MIT",
-	"compatible": "1.5.2",
+	"compatible": "1.5.2,1.6",
 	"notes": ""
 }
--- a/bl-plugins/rss/metadata.json
+++ b/bl-plugins/rss/metadata.json
@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "1.5.2",
+	"version": "1.6",
 	"releaseDate": "2016-05-28",
 	"license": "MIT",
-	"compatible": "1.5.2",
+	"compatible": "1.5.2,1.6",
 	"notes": ""
 }
--- a/bl-plugins/simplemde/metadata.json
+++ b/bl-plugins/simplemde/metadata.json
@ -5,6 +5,6 @@
 	"version": "1.11.2",
 	"releaseDate": "2016-06-14",
 	"license": "MIT",
-	"compatible": "1.5.2",
+	"compatible": "1.5.2,1.6",
 	"notes": ""
 }
--- a/bl-plugins/sitemap/metadata.json
+++ b/bl-plugins/sitemap/metadata.json
@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "1.5.2",
+	"version": "1.6",
 	"releaseDate": "2016-05-28",
 	"license": "MIT",
-	"compatible": "1.5.2",
+	"compatible": "1.5.2,1.6",
 	"notes": ""
 }
--- a/bl-plugins/tags/metadata.json
+++ b/bl-plugins/tags/metadata.json
@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "1.5.2",
+	"version": "1.6",
 	"releaseDate": "2016-05-28",
 	"license": "MIT",
-	"compatible": "1.5.2",
+	"compatible": "1.5.2,1.6",
 	"notes": ""
 }
--- a/bl-themes/log/metadata.json
+++ b/bl-themes/log/metadata.json
@ -2,9 +2,9 @@
 	"author": "n33co",
 	"email": "",
 	"website": "http://html5up.net",
-	"version": "1.4",
+	"version": "1.6",
 	"releaseDate": "2016-05-20",
 	"license": "CCA 3.0",
-	"compatible": "1.5.2",
+	"compatible": "1.5.2,1.6",
 	"notes": ""
 }