From 203a8a33cfd0d29edc8370444943b3d7366de105 Mon Sep 17 00:00:00 2001 From: patdenice Date: Sat, 5 Sep 2009 11:35:20 +0000 Subject: merge r3716-3717 from trunk to branch 2.0 Allow to add description.txt file in language directory for plugin description. Add multilingual descriptions for plugins. git-svn-id: http://piwigo.org/svn/branches/2.0@3824 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/include/plugins.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'admin') diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php index 8972c1df0..fd1700447 100644 --- a/admin/include/plugins.class.php +++ b/admin/include/plugins.class.php @@ -213,7 +213,11 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"'; { $plugin['uri'] = trim($val[1]); } - if ( preg_match("|Description: (.*)|", $plg_data, $val) ) + if ($desc = load_language('description.txt', $path.'/', array('return' => true))) + { + $plugin['description'] = trim($desc); + } + elseif ( preg_match("|Description: (.*)|", $plg_data, $val) ) { $plugin['description'] = trim($val[1]); } -- cgit v1.2.3