diff options
| author | plegall <plg@piwigo.org> | 2009-03-13 23:43:50 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2009-03-13 23:43:50 +0000 |
| commit | 87a7b60bed82775a58c2706e9441cbe428cbc393 (patch) | |
| tree | 5874f9b424cfab205ae810baa7a4fe85735bdfc3 /install | |
| parent | f94ff8b8e180526899e17db9f4732ff82a4a876b (diff) | |
merge r3196 from branch 2.0 to trunk
bug 926 fixed: change links to piwigo.org so that they go to existing URLs.
new: if the current language is french, the links go to fr.piwigo.org instead.
git-svn-id: http://piwigo.org/svn/trunk@3197 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | install.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/install.php b/install.php index 94c4d40c6..0836d6cf1 100644 --- a/install.php +++ b/install.php @@ -211,6 +211,14 @@ else } } +if ('fr_FR' == $language) { + define('PHPWG_DOMAIN', 'fr.piwigo.org'); +} +else { + define('PHPWG_DOMAIN', 'piwigo.org'); +} +define('PHPWG_URL', 'http://'.PHPWG_DOMAIN); + load_language( 'common.lang', '', array('language'=>$language, 'target_charset'=>'utf-8') ); load_language( 'admin.lang', '', array('language'=>$language, 'target_charset'=>'utf-8') ); load_language( 'install.lang', '', array('language'=>$language, 'target_charset'=>'utf-8') ); @@ -393,7 +401,7 @@ $template->assign( 'F_DB_PREFIX' => $table_prefix, 'F_ADMIN'=>$admin_name, 'F_ADMIN_EMAIL'=>$admin_mail, - 'L_INSTALL_HELP'=>sprintf(l10n('install_help'), 'http://forum.'.PHPWG_DOMAIN.'/'), + 'L_INSTALL_HELP'=>sprintf(l10n('install_help'), PHPWG_URL.'/forum'), )); //------------------------------------------------------ errors & infos display |