From d632f2455bf5ae798f7986b6ce366923177653fc Mon Sep 17 00:00:00 2001 From: dignajar Date: Thu, 3 Sep 2015 21:55:05 -0300 Subject: [PATCH] Bug fixes --- kernel/boot/rules/80.plugins.php | 4 ++-- plugins/disqus/{language => languages}/en_US.json | 0 plugins/disqus/{language => languages}/es_AR.json | 0 plugins/disqus/{language => languages}/fr_FR.json | 0 plugins/maintancemode/{language => languages}/en_US.json | 0 plugins/maintancemode/{language => languages}/es_AR.json | 0 plugins/maintancemode/{language => languages}/fr_FR.json | 0 plugins/maintancemode/{language => languages}/zh_TW.json | 0 plugins/opengraph/{language => languages}/en_US.json | 0 plugins/opengraph/{language => languages}/es_AR.json | 0 plugins/opengraph/{language => languages}/fr_FR.json | 0 plugins/opengraph/{language => languages}/zh_TW.json | 0 plugins/pages/{language => languages}/en_US.json | 0 plugins/pages/{language => languages}/es_AR.json | 0 plugins/pages/{language => languages}/fr_FR.json | 0 plugins/pages/{language => languages}/zh_TW.json | 0 plugins/simplemde/{language => languages}/en_US.json | 0 plugins/simplemde/{language => languages}/fr_FR.json | 0 plugins/tags/{language => languages}/en_US.json | 0 plugins/tags/{language => languages}/fr_FR.json | 0 20 files changed, 2 insertions(+), 2 deletions(-) rename plugins/disqus/{language => languages}/en_US.json (100%) rename plugins/disqus/{language => languages}/es_AR.json (100%) rename plugins/disqus/{language => languages}/fr_FR.json (100%) rename plugins/maintancemode/{language => languages}/en_US.json (100%) rename plugins/maintancemode/{language => languages}/es_AR.json (100%) rename plugins/maintancemode/{language => languages}/fr_FR.json (100%) rename plugins/maintancemode/{language => languages}/zh_TW.json (100%) rename plugins/opengraph/{language => languages}/en_US.json (100%) rename plugins/opengraph/{language => languages}/es_AR.json (100%) rename plugins/opengraph/{language => languages}/fr_FR.json (100%) rename plugins/opengraph/{language => languages}/zh_TW.json (100%) rename plugins/pages/{language => languages}/en_US.json (100%) rename plugins/pages/{language => languages}/es_AR.json (100%) rename plugins/pages/{language => languages}/fr_FR.json (100%) rename plugins/pages/{language => languages}/zh_TW.json (100%) rename plugins/simplemde/{language => languages}/en_US.json (100%) rename plugins/simplemde/{language => languages}/fr_FR.json (100%) rename plugins/tags/{language => languages}/en_US.json (100%) rename plugins/tags/{language => languages}/fr_FR.json (100%) diff --git a/kernel/boot/rules/80.plugins.php b/kernel/boot/rules/80.plugins.php index bafa283c..81c05145 100644 --- a/kernel/boot/rules/80.plugins.php +++ b/kernel/boot/rules/80.plugins.php @@ -64,14 +64,14 @@ function build_plugins() $Plugin = new $pluginClass; // Set Plugin data - $languageFilename = PATH_PLUGINS.$Plugin->directoryName().DS.'language'.DS.$Site->locale().'.json'; + $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.'language'.DS.'en_US.json'; + $languageFilename = PATH_PLUGINS.$Plugin->directoryName().DS.'languages'.DS.'en_US.json'; $database = new dbJSON($languageFilename, false); } diff --git a/plugins/disqus/language/en_US.json b/plugins/disqus/languages/en_US.json similarity index 100% rename from plugins/disqus/language/en_US.json rename to plugins/disqus/languages/en_US.json diff --git a/plugins/disqus/language/es_AR.json b/plugins/disqus/languages/es_AR.json similarity index 100% rename from plugins/disqus/language/es_AR.json rename to plugins/disqus/languages/es_AR.json diff --git a/plugins/disqus/language/fr_FR.json b/plugins/disqus/languages/fr_FR.json similarity index 100% rename from plugins/disqus/language/fr_FR.json rename to plugins/disqus/languages/fr_FR.json diff --git a/plugins/maintancemode/language/en_US.json b/plugins/maintancemode/languages/en_US.json similarity index 100% rename from plugins/maintancemode/language/en_US.json rename to plugins/maintancemode/languages/en_US.json diff --git a/plugins/maintancemode/language/es_AR.json b/plugins/maintancemode/languages/es_AR.json similarity index 100% rename from plugins/maintancemode/language/es_AR.json rename to plugins/maintancemode/languages/es_AR.json diff --git a/plugins/maintancemode/language/fr_FR.json b/plugins/maintancemode/languages/fr_FR.json similarity index 100% rename from plugins/maintancemode/language/fr_FR.json rename to plugins/maintancemode/languages/fr_FR.json diff --git a/plugins/maintancemode/language/zh_TW.json b/plugins/maintancemode/languages/zh_TW.json similarity index 100% rename from plugins/maintancemode/language/zh_TW.json rename to plugins/maintancemode/languages/zh_TW.json diff --git a/plugins/opengraph/language/en_US.json b/plugins/opengraph/languages/en_US.json similarity index 100% rename from plugins/opengraph/language/en_US.json rename to plugins/opengraph/languages/en_US.json diff --git a/plugins/opengraph/language/es_AR.json b/plugins/opengraph/languages/es_AR.json similarity index 100% rename from plugins/opengraph/language/es_AR.json rename to plugins/opengraph/languages/es_AR.json diff --git a/plugins/opengraph/language/fr_FR.json b/plugins/opengraph/languages/fr_FR.json similarity index 100% rename from plugins/opengraph/language/fr_FR.json rename to plugins/opengraph/languages/fr_FR.json diff --git a/plugins/opengraph/language/zh_TW.json b/plugins/opengraph/languages/zh_TW.json similarity index 100% rename from plugins/opengraph/language/zh_TW.json rename to plugins/opengraph/languages/zh_TW.json diff --git a/plugins/pages/language/en_US.json b/plugins/pages/languages/en_US.json similarity index 100% rename from plugins/pages/language/en_US.json rename to plugins/pages/languages/en_US.json diff --git a/plugins/pages/language/es_AR.json b/plugins/pages/languages/es_AR.json similarity index 100% rename from plugins/pages/language/es_AR.json rename to plugins/pages/languages/es_AR.json diff --git a/plugins/pages/language/fr_FR.json b/plugins/pages/languages/fr_FR.json similarity index 100% rename from plugins/pages/language/fr_FR.json rename to plugins/pages/languages/fr_FR.json diff --git a/plugins/pages/language/zh_TW.json b/plugins/pages/languages/zh_TW.json similarity index 100% rename from plugins/pages/language/zh_TW.json rename to plugins/pages/languages/zh_TW.json diff --git a/plugins/simplemde/language/en_US.json b/plugins/simplemde/languages/en_US.json similarity index 100% rename from plugins/simplemde/language/en_US.json rename to plugins/simplemde/languages/en_US.json diff --git a/plugins/simplemde/language/fr_FR.json b/plugins/simplemde/languages/fr_FR.json similarity index 100% rename from plugins/simplemde/language/fr_FR.json rename to plugins/simplemde/languages/fr_FR.json diff --git a/plugins/tags/language/en_US.json b/plugins/tags/languages/en_US.json similarity index 100% rename from plugins/tags/language/en_US.json rename to plugins/tags/languages/en_US.json diff --git a/plugins/tags/language/fr_FR.json b/plugins/tags/languages/fr_FR.json similarity index 100% rename from plugins/tags/language/fr_FR.json rename to plugins/tags/languages/fr_FR.json