From 76e7a9fef20b1a805ac54ffb38d6d5e460d4b185 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sat, 31 Jan 2015 14:22:54 -0800 Subject: [PATCH] Language-files renamed to match v2.x specifications. --- e107_admin/language.php | 2 ++ .../languages/{English_admin_gsitemap.php => English_admin.php} | 0 .../languages/{gsitemap_English.php => English_front.php} | 0 .../languages/{English_admin_import.php => English_admin.php} | 0 e107_plugins/linkwords/admin_config.php | 2 +- .../{English_admin_linkwords.php => English_admin.php} | 0 .../languages/{English_admin_newsfeed.php => English_admin.php} | 0 .../{English_admin_newsletter.php => English_admin.php} | 0 8 files changed, 3 insertions(+), 1 deletion(-) rename e107_plugins/gsitemap/languages/{English_admin_gsitemap.php => English_admin.php} (100%) rename e107_plugins/gsitemap/languages/{gsitemap_English.php => English_front.php} (100%) rename e107_plugins/import/languages/{English_admin_import.php => English_admin.php} (100%) rename e107_plugins/linkwords/languages/{English_admin_linkwords.php => English_admin.php} (100%) rename e107_plugins/newsfeed/languages/{English_admin_newsfeed.php => English_admin.php} (100%) rename e107_plugins/newsletter/languages/{English_admin_newsletter.php => English_admin.php} (100%) diff --git a/e107_admin/language.php b/e107_admin/language.php index 0353baada..4d9029911 100644 --- a/e107_admin/language.php +++ b/e107_admin/language.php @@ -1071,6 +1071,8 @@ function show_tools() show_packs(); + return; + if(!vartrue($_SERVER['E_DEV'])) { return; diff --git a/e107_plugins/gsitemap/languages/English_admin_gsitemap.php b/e107_plugins/gsitemap/languages/English_admin.php similarity index 100% rename from e107_plugins/gsitemap/languages/English_admin_gsitemap.php rename to e107_plugins/gsitemap/languages/English_admin.php diff --git a/e107_plugins/gsitemap/languages/gsitemap_English.php b/e107_plugins/gsitemap/languages/English_front.php similarity index 100% rename from e107_plugins/gsitemap/languages/gsitemap_English.php rename to e107_plugins/gsitemap/languages/English_front.php diff --git a/e107_plugins/import/languages/English_admin_import.php b/e107_plugins/import/languages/English_admin.php similarity index 100% rename from e107_plugins/import/languages/English_admin_import.php rename to e107_plugins/import/languages/English_admin.php diff --git a/e107_plugins/linkwords/admin_config.php b/e107_plugins/linkwords/admin_config.php index 5a05286df..65d822130 100644 --- a/e107_plugins/linkwords/admin_config.php +++ b/e107_plugins/linkwords/admin_config.php @@ -18,7 +18,7 @@ if (!getperms('P') || !e107::isInstalled('linkwords')) } require_once(e_ADMIN.'auth.php'); -e107::lan('linkwords', e_LANGUAGE."_admin_linkwords.php"); // e_PLUGIN.'linkwords/languages/'.e_LANGUAGE.'_admin_linkwords.php' +e107::lan('linkwords', true); // e_PLUGIN.'linkwords/languages/'.e_LANGUAGE.'_admin.php' define('LW_CACHE_TAG', 'nomd5_linkwords'); diff --git a/e107_plugins/linkwords/languages/English_admin_linkwords.php b/e107_plugins/linkwords/languages/English_admin.php similarity index 100% rename from e107_plugins/linkwords/languages/English_admin_linkwords.php rename to e107_plugins/linkwords/languages/English_admin.php diff --git a/e107_plugins/newsfeed/languages/English_admin_newsfeed.php b/e107_plugins/newsfeed/languages/English_admin.php similarity index 100% rename from e107_plugins/newsfeed/languages/English_admin_newsfeed.php rename to e107_plugins/newsfeed/languages/English_admin.php diff --git a/e107_plugins/newsletter/languages/English_admin_newsletter.php b/e107_plugins/newsletter/languages/English_admin.php similarity index 100% rename from e107_plugins/newsletter/languages/English_admin_newsletter.php rename to e107_plugins/newsletter/languages/English_admin.php