Changeset 3197 for trunk


Ignore:
Timestamp:
Mar 14, 2009, 12:43:50 AM (15 years ago)
Author:
plg
Message:

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.

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/include/functions.php

    r3145 r3197  
    17421742function pwg_URL()
    17431743{
    1744   global $lang_info;
    17451744  $urls = array(
    1746     'WIKI'       => 'http://'.PHPWG_DOMAIN.'/doc/',
    1747     'HOME'       => 'http://'.PHPWG_DOMAIN.'/',
    1748     'DEMO'       => 'http://demo.'.PHPWG_DOMAIN.'/',
    1749     'FORUM'      => 'http://forum.'.PHPWG_DOMAIN.'/',
    1750     'BUGS'       => 'http://bugs.'.PHPWG_DOMAIN.'/',
     1745    'HOME'       => 'http://'.PHPWG_DOMAIN,
     1746    'WIKI'       => 'http://'.PHPWG_DOMAIN.'/doc',
     1747    'DEMO'       => 'http://'.PHPWG_DOMAIN.'/demo',
     1748    'FORUM'      => 'http://'.PHPWG_DOMAIN.'/forum',
     1749    'BUGS'       => 'http://'.PHPWG_DOMAIN.'/bugs',
    17511750    'EXTENSIONS' => 'http://'.PHPWG_DOMAIN.'/ext',
    17521751    );
    1753   if ( isset($lang_info['code']) and
    1754        in_array($lang_info['code'], array('fr','en')) )
    1755   { /* current wiki languages are French or English */
    1756     $urls['WIKI'] .= 'doku.php?id='.$lang_info['code'].':'.$lang_info['code'];
    1757     $urls['HOME'] .= '?lang='.$lang_info['code'];
    1758   }
    17591752  return $urls;
    17601753}

  • trunk/admin/intro.php

    r3133 r3197  
    183183$template->assign(
    184184  array(
     185    'PHPWG_URL' => PHPWG_URL,
    185186    'PWG_VERSION' => PHPWG_VERSION,
    186187    'OS' => PHP_OS,

  • trunk/admin/template/goto/footer.tpl

    r2614 r3197  
    1616
    1717  {'powered_by'|@translate}
    18   <a href="http://piwigo.org" class="Piwigo">
     18  <a href="{$PHPWG_URL}" class="Piwigo">
    1919  <span class="Piwigo">Piwigo</span></a>
    2020  {$VERSION}

  • trunk/admin/template/goto/intro.tpl

    r3185 r3197  
    55  <dd>
    66    <ul>
    7       <li><a href="http://piwigo.org"  onclick="window.open(this.href, '');
     7      <li><a href="{$PHPWG_URL}"  onclick="window.open(this.href, '');
    88          return false;">Piwigo</a> {$PWG_VERSION}</li>
    99      <li><a href="{$U_CHECK_UPGRADE}">{'Check for upgrade'|@translate}</a></li>

  • trunk/include/common.inc.php

    r3136 r3197  
    126126include(PHPWG_ROOT_PATH.'include/user.inc.php');
    127127
     128if ('fr_FR' == $user['language']) {
     129  define('PHPWG_DOMAIN', 'fr.piwigo.org');
     130}
     131else {
     132  define('PHPWG_DOMAIN', 'piwigo.org');
     133}
     134define('PHPWG_URL', 'http://'.PHPWG_DOMAIN);
     135define('PEM_URL', 'http://'.PHPWG_DOMAIN.'/ext');
     136
    128137
    129138// language files

  • trunk/include/constants.php

    r3133 r3197  
    2424// Default settings
    2525define('PHPWG_VERSION', 'Colibri');
    26 define('PHPWG_DOMAIN', 'piwigo.org');
    27 define('PHPWG_URL', 'http://'.PHPWG_DOMAIN);
    28 define('PEM_URL', 'http://'.PHPWG_DOMAIN.'/ext');
    2926define('PHPWG_DEFAULT_LANGUAGE', 'en_UK');
    3027define('PHPWG_DEFAULT_TEMPLATE', 'yoga/Sylvia');

  • trunk/install.php

    r3185 r3197  
    212212}
    213213
     214if ('fr_FR' == $language) {
     215  define('PHPWG_DOMAIN', 'fr.piwigo.org');
     216}
     217else {
     218  define('PHPWG_DOMAIN', 'piwigo.org');
     219}
     220define('PHPWG_URL', 'http://'.PHPWG_DOMAIN);
     221
    214222load_language( 'common.lang', '', array('language'=>$language, 'target_charset'=>'utf-8') );
    215223load_language( 'admin.lang', '', array('language'=>$language, 'target_charset'=>'utf-8') );
    … …  
    394402    'F_ADMIN'=>$admin_name,
    395403    'F_ADMIN_EMAIL'=>$admin_mail,
    396     'L_INSTALL_HELP'=>sprintf(l10n('install_help'), 'http://forum.'.PHPWG_DOMAIN.'/'),
     404    'L_INSTALL_HELP'=>sprintf(l10n('install_help'), PHPWG_URL.'/forum'),
    397405    ));
    398406

  • trunk/language/fr_FR/about.html

    r2342 r3197  
    66
    77  <li>Si vous avez des suggestions ou des commentaires, visitez le <a
    8   href="http://piwigo.org">site officiel</a>.</li>
     8  href="http://fr.piwigo.org">site officiel</a> et <a href="http://fr.piwigo.org/forum">son forum</a>.</li>

  • trunk/language/fr_FR/help.html

    r2495 r3197  
    242242utilisateur héritera de ces propriétés d'affichage.</li>
    243243
    244   <li>Pour tout question, n'hésitez pas à visiter le forum ou à y poser une
    245 question si votre recherche est infructueuse. Le
    246 <a href="http://forum.phpwebgallery.net">forum</a> est disponible sur le site
    247  de Piwigo. Consulter également la
    248 <a href="http://phpwebgallery.net/doc">documentation officielle de
    249 Piwigo</a> pour obtenir plus de détails.</li>
     244  <li>Pour tout question, la communauté francophone Piwigo est à l'écoute sur le <a href="http://fr.piwigo.org/forum">forum</a>.</li>
    250245
    251246</ul>

  • trunk/language/pl_PL/help.html

    r3084 r3197  
    287287  Domyślne</span>. Jeżeli tak zrobisz każdy nowy użytkownik będzie miał taki sam domyślny wygląd stron galerii.</li>
    288288
    289   <li>Jeżeli masz pytania, społeczność Piwigo zaprasza Cię na forum <a
    290   href="http://forum.phpwebgallery.net"></a>.</li>
     289  <li>Jeżeli masz pytania, społeczność Piwigo zaprasza Cię na <a href="http://piwigo.org/forum">forum</a>.</li>
    291290
    292291</ul>

  • trunk/template/yoga/footer.tpl

    r2550 r3197  
    1212
    1313  {'powered_by'|@translate}
    14   <a href="http://piwigo.org" class="Piwigo">
     14  <a href="{$PHPWG_URL}" class="Piwigo">
    1515  <span class="Piwigo">Piwigo</span></a>
    1616  {$VERSION}

  • trunk/tools/create_listing_file.php

    r3049 r3197  
    3232// URL of main gallery
    3333// Example : http://www.my.domain/my/directory
    34 $conf['gallery'] = 'http://demo.piwigo.net/';
     34$conf['gallery'] = 'http://piwigo.org/demo';
    3535
    3636// prefix for thumbnails in "thumbnail" sub directories
    … …  
    16891689      <fieldset class="footer">
    16901690        <div class="pwg_block">
    1691           Powered by <a href="http://piwigo.org" class="pwg"><span class="p">Pi</span><span class="w">wi</span><span class="g">go</span></a>
     1691          Powered by <a href="http://piwigo.org" class="pwg">Piwigo</a>
    16921692        </div>
    16931693        <?php echo $g_footer; ?>
Note: See TracChangeset for help on using the changeset viewer.