aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2009-09-05 11:35:20 +0000
committerpatdenice <patdenice@piwigo.org>2009-09-05 11:35:20 +0000
commit203a8a33cfd0d29edc8370444943b3d7366de105 (patch)
treefa209f6411175de8f3acf2364ea4d639f3925116
parentd39ce214bceac343844b067d0f00bb904d6af2b2 (diff)
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
Diffstat (limited to '')
-rw-r--r--admin/include/plugins.class.php6
-rw-r--r--plugins/LocalFilesEditor/language/en_UK/description.txt1
-rw-r--r--plugins/LocalFilesEditor/language/fr_FR/description.txt1
-rw-r--r--plugins/LocalFilesEditor/main.inc.php2
-rw-r--r--plugins/add_index/language/en_UK/description.txt1
-rw-r--r--plugins/add_index/language/fr_FR/description.txt1
-rw-r--r--plugins/add_index/main.inc.php2
-rw-r--r--plugins/admin_advices/language/en_UK/description.txt1
-rw-r--r--plugins/admin_advices/language/fr_FR/description.txt1
-rw-r--r--plugins/admin_multi_view/language/en_UK/description.txt1
-rw-r--r--plugins/admin_multi_view/language/en_UK/index.php30
-rw-r--r--plugins/admin_multi_view/language/fr_FR/description.txt1
-rw-r--r--plugins/admin_multi_view/language/fr_FR/index.php30
-rw-r--r--plugins/admin_multi_view/language/index.php30
-rw-r--r--plugins/admin_multi_view/main.inc.php2
-rw-r--r--plugins/c13y_upgrade/language/en_UK/description.txt1
-rw-r--r--plugins/c13y_upgrade/language/fr_FR/description.txt1
-rw-r--r--plugins/c13y_upgrade/main.inc.php2
-rw-r--r--plugins/language_switch/language/en_UK/description.txt1
-rw-r--r--plugins/language_switch/language/en_UK/index.php30
-rw-r--r--plugins/language_switch/language/fr_FR/description.txt1
-rw-r--r--plugins/language_switch/language/fr_FR/index.php30
-rw-r--r--plugins/language_switch/language/index.php30
23 files changed, 201 insertions, 5 deletions
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]);
}
diff --git a/plugins/LocalFilesEditor/language/en_UK/description.txt b/plugins/LocalFilesEditor/language/en_UK/description.txt
new file mode 100644
index 000000000..685dd164f
--- /dev/null
+++ b/plugins/LocalFilesEditor/language/en_UK/description.txt
@@ -0,0 +1 @@
+Edit local files from administration panel. \ No newline at end of file
diff --git a/plugins/LocalFilesEditor/language/fr_FR/description.txt b/plugins/LocalFilesEditor/language/fr_FR/description.txt
new file mode 100644
index 000000000..e025da365
--- /dev/null
+++ b/plugins/LocalFilesEditor/language/fr_FR/description.txt
@@ -0,0 +1 @@
+Editez vos fichiers locaux à partir du panneau d'administration. \ No newline at end of file
diff --git a/plugins/LocalFilesEditor/main.inc.php b/plugins/LocalFilesEditor/main.inc.php
index 4339995ce..f918ece18 100644
--- a/plugins/LocalFilesEditor/main.inc.php
+++ b/plugins/LocalFilesEditor/main.inc.php
@@ -24,7 +24,7 @@
/*
Plugin Name: LocalFiles Editor
Version: 2.0.3
-Description: Edit local files from administration panel / Editeur de fichiers locaux
+Description: Edit local files from administration panel
Plugin URI: http://piwigo.org/ext/extension_view.php?eid=144
Author: Piwigo team
Author URI: http://piwigo.org
diff --git a/plugins/add_index/language/en_UK/description.txt b/plugins/add_index/language/en_UK/description.txt
new file mode 100644
index 000000000..04f95bff7
--- /dev/null
+++ b/plugins/add_index/language/en_UK/description.txt
@@ -0,0 +1 @@
+Add index.php file on all sub-directories of local galleries pictures. \ No newline at end of file
diff --git a/plugins/add_index/language/fr_FR/description.txt b/plugins/add_index/language/fr_FR/description.txt
new file mode 100644
index 000000000..a552abbbb
--- /dev/null
+++ b/plugins/add_index/language/fr_FR/description.txt
@@ -0,0 +1 @@
+Ajoute le fichier index.php sur les sous-répertoires de galeries d'images locales. \ No newline at end of file
diff --git a/plugins/add_index/main.inc.php b/plugins/add_index/main.inc.php
index 19fabb6ff..67f338e36 100644
--- a/plugins/add_index/main.inc.php
+++ b/plugins/add_index/main.inc.php
@@ -24,7 +24,7 @@
/*
Plugin Name: Add Index
Version: 2.0.2
-Description: Add file index.php file on all sub-directories of local galleries pictures. / Ajoute le fichier index.php sur les sous-répertoires de galeries d'images locales.
+Description: Add index.php file on all sub-directories of local galleries pictures.
Plugin URI: http://piwigo.org/ext/extension_view.php?eid=284
Author: Piwigo team
Author URI: http://piwigo.org
diff --git a/plugins/admin_advices/language/en_UK/description.txt b/plugins/admin_advices/language/en_UK/description.txt
new file mode 100644
index 000000000..89d0e7ed1
--- /dev/null
+++ b/plugins/admin_advices/language/en_UK/description.txt
@@ -0,0 +1 @@
+Give you an advice on the administration page. \ No newline at end of file
diff --git a/plugins/admin_advices/language/fr_FR/description.txt b/plugins/admin_advices/language/fr_FR/description.txt
new file mode 100644
index 000000000..ddcf89bcb
--- /dev/null
+++ b/plugins/admin_advices/language/fr_FR/description.txt
@@ -0,0 +1 @@
+Affiche une astuce sur la page d'accueil de l'administration. \ No newline at end of file
diff --git a/plugins/admin_multi_view/language/en_UK/description.txt b/plugins/admin_multi_view/language/en_UK/description.txt
new file mode 100644
index 000000000..8aaad29e4
--- /dev/null
+++ b/plugins/admin_multi_view/language/en_UK/description.txt
@@ -0,0 +1 @@
+Allows administrators to view gallery as guests and/or change the language and/or theme on the fly. Practical to debug changes... \ No newline at end of file
diff --git a/plugins/admin_multi_view/language/en_UK/index.php b/plugins/admin_multi_view/language/en_UK/index.php
new file mode 100644
index 000000000..871b52b6a
--- /dev/null
+++ b/plugins/admin_multi_view/language/en_UK/index.php
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2009 Piwigo Team http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/plugins/admin_multi_view/language/fr_FR/description.txt b/plugins/admin_multi_view/language/fr_FR/description.txt
new file mode 100644
index 000000000..66e01a536
--- /dev/null
+++ b/plugins/admin_multi_view/language/fr_FR/description.txt
@@ -0,0 +1 @@
+Permet aux administrateurs de voir la galerie en tant qu'invité et/ou changer la langue et/ou changer de thème à la volée. Pratique pour le débuggage... \ No newline at end of file
diff --git a/plugins/admin_multi_view/language/fr_FR/index.php b/plugins/admin_multi_view/language/fr_FR/index.php
new file mode 100644
index 000000000..871b52b6a
--- /dev/null
+++ b/plugins/admin_multi_view/language/fr_FR/index.php
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2009 Piwigo Team http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/plugins/admin_multi_view/language/index.php b/plugins/admin_multi_view/language/index.php
new file mode 100644
index 000000000..871b52b6a
--- /dev/null
+++ b/plugins/admin_multi_view/language/index.php
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2009 Piwigo Team http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/plugins/admin_multi_view/main.inc.php b/plugins/admin_multi_view/main.inc.php
index 6a5658059..2602c2b87 100644
--- a/plugins/admin_multi_view/main.inc.php
+++ b/plugins/admin_multi_view/main.inc.php
@@ -24,7 +24,7 @@
/*
Plugin Name: Multi view
Version: 2.0.2
-Description: Allows administrators to view gallery as guests and/or change the language and/or theme on the fly. Practical to debug changes ...
+Description: Allows administrators to view gallery as guests and/or change the language and/or theme on the fly. Practical to debug changes...
Plugin URI: http://piwigo.org/ext/extension_view.php?eid=286
Author: Piwigo team
Author URI: http://piwigo.org
diff --git a/plugins/c13y_upgrade/language/en_UK/description.txt b/plugins/c13y_upgrade/language/en_UK/description.txt
new file mode 100644
index 000000000..b5f0edb7e
--- /dev/null
+++ b/plugins/c13y_upgrade/language/en_UK/description.txt
@@ -0,0 +1 @@
+Check integrity of upgrades. \ No newline at end of file
diff --git a/plugins/c13y_upgrade/language/fr_FR/description.txt b/plugins/c13y_upgrade/language/fr_FR/description.txt
new file mode 100644
index 000000000..23a016be3
--- /dev/null
+++ b/plugins/c13y_upgrade/language/fr_FR/description.txt
@@ -0,0 +1 @@
+Contrôle d'intégrité des mises à jour. \ No newline at end of file
diff --git a/plugins/c13y_upgrade/main.inc.php b/plugins/c13y_upgrade/main.inc.php
index 999eee1f1..ba85a7280 100644
--- a/plugins/c13y_upgrade/main.inc.php
+++ b/plugins/c13y_upgrade/main.inc.php
@@ -24,7 +24,7 @@
/*
Plugin Name: Check upgrades
Version: 2.0.2
-Description: Check integrity of upgrades / Contrôle d'intégrité des mises à jour
+Description: Check integrity of upgrades.
Plugin URI: http://piwigo.org/ext/extension_view.php?eid=287
Author: Piwigo team
Author URI: http://piwigo.org
diff --git a/plugins/language_switch/language/en_UK/description.txt b/plugins/language_switch/language/en_UK/description.txt
new file mode 100644
index 000000000..c54ce06c9
--- /dev/null
+++ b/plugins/language_switch/language/en_UK/description.txt
@@ -0,0 +1 @@
+Switch to another language from flags on your gallery home page. \ No newline at end of file
diff --git a/plugins/language_switch/language/en_UK/index.php b/plugins/language_switch/language/en_UK/index.php
new file mode 100644
index 000000000..871b52b6a
--- /dev/null
+++ b/plugins/language_switch/language/en_UK/index.php
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2009 Piwigo Team http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/plugins/language_switch/language/fr_FR/description.txt b/plugins/language_switch/language/fr_FR/description.txt
new file mode 100644
index 000000000..42d4c3a04
--- /dev/null
+++ b/plugins/language_switch/language/fr_FR/description.txt
@@ -0,0 +1 @@
+Changez la langue de la galerie facilement à partir des drapeaux de la page d'accueil. \ No newline at end of file
diff --git a/plugins/language_switch/language/fr_FR/index.php b/plugins/language_switch/language/fr_FR/index.php
new file mode 100644
index 000000000..871b52b6a
--- /dev/null
+++ b/plugins/language_switch/language/fr_FR/index.php
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2009 Piwigo Team http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/plugins/language_switch/language/index.php b/plugins/language_switch/language/index.php
new file mode 100644
index 000000000..871b52b6a
--- /dev/null
+++ b/plugins/language_switch/language/index.php
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2009 Piwigo Team http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>