From bbfa1fb48e92751124fd571b5d810ffee54a3f23 Mon Sep 17 00:00:00 2001 From: dignajar Date: Sun, 22 Nov 2015 15:11:47 -0300 Subject: [PATCH] Bug fixed - Plugin meta data --- kernel/boot/rules/80.plugins.php | 24 +++++++++++++----------- languages/es_AR.json | 2 +- plugins/about/languages/es_AR.json | 7 +++++++ plugins/opengraph/languages/es_AR.json | 2 +- plugins/simplemde/languages/es_AR.json | 2 +- plugins/tags/languages/es_AR.json | 7 +++++++ 6 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 plugins/about/languages/es_AR.json create mode 100644 plugins/tags/languages/es_AR.json diff --git a/kernel/boot/rules/80.plugins.php b/kernel/boot/rules/80.plugins.php index 47c6f349..f178af3a 100644 --- a/kernel/boot/rules/80.plugins.php +++ b/kernel/boot/rules/80.plugins.php @@ -63,29 +63,31 @@ function build_plugins() { $Plugin = new $pluginClass; - // Set Plugin data + // Default language and meta data for the plugin + $tmpMetaData = array(); + $languageFilename = PATH_PLUGINS.$Plugin->directoryName().DS.'languages'.DS.'en_US.json'; + $database = new dbJSON($languageFilename, false); + $tmpMetaData = $database->db['plugin-data']; + + // Check if the plugin is translated. $languageFilename = PATH_PLUGINS.$Plugin->directoryName().DS.'languages'.DS.$Site->locale().'.json'; if( Sanitize::pathFile($languageFilename) ) { $database = new dbJSON($languageFilename, false); - } - else - { - $languageFilename = PATH_PLUGINS.$Plugin->directoryName().DS.'languages'.DS.'en_US.json'; - $database = new dbJSON($languageFilename, false); + $tmpMetaData = array_merge($tmpMetaData, $database->db['plugin-data']); } - $databaseArray = $database->db; - $Plugin->setData( $databaseArray['plugin-data'] ); + // Set plugin meta data + $Plugin->setData($tmpMetaData); // Add words to language dictionary. - unset($databaseArray['plugin-data']); - $Language->add($databaseArray); + unset($database->db['plugin-data']); + $Language->add($database->db); // Push Plugin to array all plugins installed and not installed. $plugins['all'][$pluginClass] = $Plugin; - // If the plugin installed + // If the plugin is installed, order by hooks. if($Plugin->installed()) { foreach($pluginsEvents as $event=>$value) diff --git a/languages/es_AR.json b/languages/es_AR.json index 504d0ccd..57f75f2b 100644 --- a/languages/es_AR.json +++ b/languages/es_AR.json @@ -13,7 +13,7 @@ "password": "Contraseña", "confirm-password": "Confirmar contraseña", "editor": "Editor", - "dashboard": "Panel", + "dashboard": "Panel de administración", "role": "Rol", "post": "Entrada", "posts": "Entradas", diff --git a/plugins/about/languages/es_AR.json b/plugins/about/languages/es_AR.json new file mode 100644 index 00000000..c0e23351 --- /dev/null +++ b/plugins/about/languages/es_AR.json @@ -0,0 +1,7 @@ +{ + "plugin-data": + { + "name": "Acerca de", + "description": "Pequeña descripcion sobre tu mismo o sobre tu sitio." + } +} \ No newline at end of file diff --git a/plugins/opengraph/languages/es_AR.json b/plugins/opengraph/languages/es_AR.json index 69fdb447..d004257c 100644 --- a/plugins/opengraph/languages/es_AR.json +++ b/plugins/opengraph/languages/es_AR.json @@ -2,6 +2,6 @@ "plugin-data": { "name": "Open Graph", - "description": "El protocolo Open Graph sirve para publicar contenido en las redes sociales." + "description": "Utiliza este plugin para mejorar las publicaciones en las redes sociales." } } \ No newline at end of file diff --git a/plugins/simplemde/languages/es_AR.json b/plugins/simplemde/languages/es_AR.json index 9d96f06a..acdcc99e 100644 --- a/plugins/simplemde/languages/es_AR.json +++ b/plugins/simplemde/languages/es_AR.json @@ -2,7 +2,7 @@ "plugin-data": { "name": "SimpleMDE", - "description": "Simple y facil editor Markdown desarrollado por @WesCossick. Adaptado por Diego Najar para Bludit." + "description": "Simple y sensillo editor Markdown desarrollado por @WesCossick. Adaptado por Diego Najar para Bludit." }, "toolbar": "Barra de herramientas", "tab-size": "Tamaño de la tabulación" diff --git a/plugins/tags/languages/es_AR.json b/plugins/tags/languages/es_AR.json new file mode 100644 index 00000000..b72d0e55 --- /dev/null +++ b/plugins/tags/languages/es_AR.json @@ -0,0 +1,7 @@ +{ + "plugin-data": + { + "name": "Listado de tags", + "description": "Muestra los tags de forma ordenada y muestra la cantidad de posts asociados a un tag." + } +} \ No newline at end of file