Changeset 1071 in ExiteCMS


Ignore:
Timestamp:
11/06/07 17:12:56 (4 years ago)
Author:
root
Message:

Replaced all includes of locales file by a call to locale_load()
Replaced all locale file references in templates by the locale name
Updated the theme functions to call locale_load() for template locales

Location:
trunk
Files:
62 edited

Legend:

Unmodified
Added
Removed

  • trunk/administration/administrators.php

    r834 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/admins.php"; 
     19locale_load("admin.admins"); 
    2020 
    2121// temp storage for template variables 
    … …  
    129129 
    130130// define the admin body panel 
    131 $template_panels[] = array('type' => 'body', 'name' => 'admin.administrators', 'template' => 'admin.administrators.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/admins.php"); 
     131$template_panels[] = array('type' => 'body', 'name' => 'admin.administrators', 'template' => 'admin.administrators.tpl', 'locale' => "admin.admins"); 
    132132$template_variables['admin.administrators'] = $variables; 
    133133 

  • trunk/administration/article_cats.php

    r834 r1071  
    1717 
    1818// load the locale for this module 
    19 require_once PATH_LOCALE.LOCALESET."admin/news-articles.php"; 
     19locale_load("admin.news-articles"); 
    2020 
    2121// temp storage for template variables 
    … …  
    3838    // define the message panel variables 
    3939    $variables['bold'] = true; 
    40     $template_panels[] = array('type' => 'body', 'name' => 'admin.article_cats.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/news-articles.php"); 
     40    $template_panels[] = array('type' => 'body', 'name' => 'admin.article_cats.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => "admin.news-articles"); 
    4141    $template_variables['admin.article_cats.status'] = $variables; 
    4242    $variables = array(); 
    … …  
    118118 
    119119// define the admin body panel 
    120 $template_panels[] = array('type' => 'body', 'name' => 'admin.article_cats', 'title' => $title, 'template' => 'admin.article_cats.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/news-articles.php"); 
     120$template_panels[] = array('type' => 'body', 'name' => 'admin.article_cats', 'title' => $title, 'template' => 'admin.article_cats.tpl', 'locale' => "admin.news-articles"); 
    121121$template_variables['admin.article_cats'] = $variables; 
    122122 

  • trunk/administration/articles.php

    r834 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/news-articles.php"; 
     19locale_load("admin.news-articles"); 
    2020 
    2121// temp storage for template variables 
    … …  
    4141    // define the message panel variables 
    4242    $variables['bold'] = true; 
    43     $template_panels[] = array('type' => 'body', 'name' => 'admin.article.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/news-articles.php"); 
     43    $template_panels[] = array('type' => 'body', 'name' => 'admin.article.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => "admin.news-articles"); 
    4444    $template_variables['admin.article.status'] = $variables; 
    4545    $variables = array(); 
    … …  
    5252    $variables['message'] = $locale['518']."<br />".$locale['519']."<br /><a href='article_cats.php".$aidlink."'>".$locale['520']."</a>".$locale['521']; 
    5353    $variables['bold'] = true; 
    54     $template_panels[] = array('type' => 'body', 'name' => 'admin.article.no_cats', 'title' => $locale['517'], 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/news-articles.php"); 
     54    $template_panels[] = array('type' => 'body', 'name' => 'admin.article.no_cats', 'title' => $locale['517'], 'template' => '_message_table_panel.tpl', 'locale' => "admin.news-articles"); 
    5555    $template_variables['admin.article.no_cats'] = $variables; 
    5656    $variables = array(); 
    … …  
    101101            $ratings = isset($_POST['article_ratings']); 
    102102            $variables['message'] = $bodypreview; 
    103             $template_panels[] = array('type' => 'body', 'name' => 'admin.article.preview1', 'title' => $subject, 'template' => '_message_table_panel.simple.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/news-articles.php"); 
     103            $template_panels[] = array('type' => 'body', 'name' => 'admin.article.preview1', 'title' => $subject, 'template' => '_message_table_panel.simple.tpl', 'locale' => "admin.news-articles"); 
    104104            $template_variables['admin.article.preview1'] = $variables; 
    105105            $variables['message'] = $body2preview; 
    106             $template_panels[] = array('type' => 'body', 'name' => 'admin.article.preview2', 'title' => $subject, 'template' => '_message_table_panel.simple.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/news-articles.php"); 
     106            $template_panels[] = array('type' => 'body', 'name' => 'admin.article.preview2', 'title' => $subject, 'template' => '_message_table_panel.simple.tpl', 'locale' => "admin.news-articles"); 
    107107            $template_variables['admin.article.preview2'] = $variables; 
    108108            $variables = array(); 
    … …  
    163163 
    164164        // define the admin body panel 
    165         $template_panels[] = array('type' => 'body', 'name' => 'admin.articles', 'template' => 'admin.articles.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/news-articles.php"); 
     165        $template_panels[] = array('type' => 'body', 'name' => 'admin.articles', 'template' => 'admin.articles.tpl', 'locale' => "admin.news-articles"); 
    166166        $template_variables['admin.articles'] = $variables; 
    167167    } 

  • trunk/administration/blacklist.php

    r834 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/blacklist.php"; 
     19locale_load("admin.blacklist"); 
    2020 
    2121// temp storage for template variables 
    … …  
    3939    $variables['bold'] = true; 
    4040    // define the admin body panel 
    41     $template_panels[] = array('type' => 'body', 'name' => 'blacklist.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/blacklist.php"); 
     41    $template_panels[] = array('type' => 'body', 'name' => 'blacklist.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => "admin.blacklist"); 
    4242    $template_variables['blacklist.status'] = $variables; 
    4343} 
    … …  
    8888 
    8989// define the admin body panel 
    90 $template_panels[] = array('type' => 'body', 'name' => 'admin.blacklist', 'template' => 'admin.blacklist.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/blacklist.php"); 
     90$template_panels[] = array('type' => 'body', 'name' => 'admin.blacklist', 'template' => 'admin.blacklist.tpl', 'locale' => "admin.blacklist"); 
    9191$template_variables['admin.blacklist'] = $variables; 
    9292 

  • trunk/administration/comments.php

    r834 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/comments.php"; 
     19locale_load("admin.comments"); 
    2020 
    2121// temp storage for template variables 
    … …  
    6767 
    6868// define the admin body panel 
    69 $template_panels[] = array('type' => 'body', 'name' => 'admin.comments', 'template' => 'admin.comments.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/comments.php"); 
     69$template_panels[] = array('type' => 'body', 'name' => 'admin.comments', 'template' => 'admin.comments.tpl', 'locale' => "admin.comments"); 
    7070$template_variables['admin.comments'] = $variables; 
    7171 

  • trunk/administration/custom_pages.php

    r834 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/custom_pages.php"; 
     19locale_load("admin.custom_pages"); 
    2020 
    2121// temp storage for template variables 
    … …  
    4747    // define the message panel variables 
    4848    $variables['bold'] = true; 
    49     $template_panels[] = array('type' => 'body', 'name' => 'admin.custom_pages.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/custom_pages.php"); 
     49    $template_panels[] = array('type' => 'body', 'name' => 'admin.custom_pages.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => "admin.custom_pages"); 
    5050    $template_variables['admin.custom_pages.status'] = $variables; 
    5151    $variables = array(); 
    … …  
    9191 
    9292        $variables['message'] = $page_content; 
    93         $template_panels[] = array('type' => 'body', 'name' => 'admin.custom_pages.preview', 'title' => $page_title, 'template' => '_message_table_panel.simple.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/custom_pages.php"); 
     93        $template_panels[] = array('type' => 'body', 'name' => 'admin.custom_pages.preview', 'title' => $page_title, 'template' => '_message_table_panel.simple.tpl', 'locale' => "admin.custom_pages"); 
    9494        $template_variables['admin.custom_pages.preview'] = $variables; 
    9595        //$page_content = stripinput((QUOTES_GPC ? addslashes($page_content) : $page_content)); 
    … …  
    147147 
    148148    // define the admin body panel 
    149     $template_panels[] = array('type' => 'body', 'name' => 'admin.custom_pages', 'template' => 'admin.custom_pages.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/custom_pages.php"); 
     149    $template_panels[] = array('type' => 'body', 'name' => 'admin.custom_pages', 'template' => 'admin.custom_pages.tpl', 'locale' => "admin.custom_pages"); 
    150150    $template_variables['admin.custom_pages'] = $variables; 
    151151} 

  • trunk/administration/db_backup.php

    r1070 r1071  
    125125 
    126126// load the locale for this module 
    127 include PATH_LOCALE.LOCALESET."admin/db-backup.php"; 
     127locale_load("admin.db-backup"); 
    128128 
    129129// make sure the parameter is valid 
    … …  
    299299 
    300300// define the admin body panel 
    301 $template_panels[] = array('type' => 'body', 'name' => 'admin.db_backup', 'template' => 'admin.db_backup.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/db-backup.php"); 
     301$template_panels[] = array('type' => 'body', 'name' => 'admin.db_backup', 'template' => 'admin.db_backup.tpl', 'locale' => "admin.db-backup"); 
    302302$template_variables['admin.db_backup'] = $variables; 
    303303 

  • trunk/administration/download_cats.php

    r992 r1071  
    1717 
    1818// load the locale for this module 
    19 require_once PATH_LOCALE.LOCALESET."admin/downloads.php"; 
     19locale_load("admin.downloads"); 
    2020 
    2121//check if the user has a right to be here. If not, bail out 
    … …  
    182182 
    183183// panel definitions 
    184 $template_panels[] = array('type' => 'body', 'name' => 'admin.download_cats', 'title' => $title, 'template' => 'admin.download_cats.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/downloads.php"); 
     184$template_panels[] = array('type' => 'body', 'name' => 'admin.download_cats', 'title' => $title, 'template' => 'admin.download_cats.tpl', 'locale' => "admin.downloads"); 
    185185$template_variables['admin.download_cats'] = $variables; 
    186186 

  • trunk/administration/downloads.php

    r1030 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/downloads.php"; 
     19locale_load("admin.downloads"); 
    2020 
    2121// TODO - WANWIZARD - 20070718 - NEED TO MOVE THIS TO SETTINGS 
    … …  
    231231 
    232232// panel definitions 
    233 $template_panels[] = array('type' => 'body', 'name' => 'admin.downloads', 'title' => $title, 'template' => 'admin.downloads.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/downloads.php"); 
     233$template_panels[] = array('type' => 'body', 'name' => 'admin.downloads', 'title' => $title, 'template' => 'admin.downloads.tpl', 'locale' => "admin.downloads"); 
    234234$template_variables['admin.downloads'] = $variables; 
    235235 

  • trunk/administration/faq.php

    r834 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/faq.php"; 
     19locale_load("admin.faq"); 
    2020 
    2121// temp storage for template variables 
    … …  
    4444    // define the message panel variables 
    4545    $variables['bold'] = true; 
    46     $template_panels[] = array('type' => 'body', 'name' => 'admin.faq.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/faq.php"); 
     46    $template_panels[] = array('type' => 'body', 'name' => 'admin.faq.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => "admin.faq"); 
    4747    $template_variables['admin.faq.status'] = $variables; 
    4848    $variables = array(); 
    … …  
    175175 
    176176// define the admin body panel 
    177 $template_panels[] = array('type' => 'body', 'name' => 'admin.faq', 'template' => 'admin.faq.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/faq.php"); 
     177$template_panels[] = array('type' => 'body', 'name' => 'admin.faq', 'template' => 'admin.faq.tpl', 'locale' => "admin.faq"); 
    178178$template_variables['admin.faq'] = $variables; 
    179179 

  • trunk/administration/forum_polls.php

    r834 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/forum_polls.php"; 
     19locale_load("admin.forum_polls"); 
    2020 
    2121// temp storage for template variables 
    … …  
    258258 
    259259// define the admin body panel 
    260 $template_panels[] = array('type' => 'body', 'name' => 'admin.forum_polls', 'template' => 'admin.forum_polls.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/forum_polls.php"); 
     260$template_panels[] = array('type' => 'body', 'name' => 'admin.forum_polls', 'template' => 'admin.forum_polls.tpl', 'locale' => "admin.forum_polls"); 
    261261$template_variables['admin.forum_polls'] = $variables; 
    262262 

  • trunk/administration/forums.php

    r864 r1071  
    1717 
    1818// load the locales for this module 
    19 include PATH_LOCALE.LOCALESET."admin/forums.php"; 
    20 include PATH_LOCALE.LOCALESET."admin/forum_polls.php"; 
     19locale_load("admin.forums"); 
     20locale_load("admin.forum_polls"); 
    2121 
    2222// temp storage for template variables 
    … …  
    116116    // define the message panel variables 
    117117    $variables['bold'] = true; 
    118     $template_panels[] = array('type' => 'body', 'name' => 'admin.forums.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/forums.php"); 
     118    $template_panels[] = array('type' => 'body', 'name' => 'admin.forums.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => "admin.forums"); 
    119119    $template_variables['admin.forums.status'] = $variables; 
    120120    $variables = array(); 
    … …  
    551551 
    552552// define the admin body panel 
    553 $template_panels[] = array('type' => 'body', 'name' => 'admin.forums', 'template' => 'admin.forums.tpl', 'locale' => array(PATH_LOCALE.LOCALESET."admin/forums.php",PATH_LOCALE.LOCALESET."admin/forum_polls.php")); 
     553$template_panels[] = array('type' => 'body', 'name' => 'admin.forums', 'template' => 'admin.forums.tpl', 'locale' => array("admin.forums","admin.forum_polls")); 
    554554$template_variables['admin.forums'] = $variables; 
    555555 

  • trunk/administration/forums_prune.php

    r863 r1071  
    5050$variables['bold'] = true; 
    5151$variables['message'] =$locale['801'].$delposts."<br />".$locale['802'].$delthreads."<br />".$locale['803'].$delattach."<br />"; 
    52 $template_panels[] = array('type' => 'body', 'name' => 'admin.forums_prune', 'title' => $locale['800'], 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/settings.php"); 
     52$template_panels[] = array('type' => 'body', 'name' => 'admin.forums_prune', 'title' => $locale['800'], 'template' => '_message_table_panel.tpl', 'locale' => "admin.settings"); 
    5353$template_variables['admin.forums_prune'] = $variables; 
    5454?> 

  • trunk/administration/images.php

    r834 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/image_uploads.php"; 
     19locale_load("admin.image_uploads"); 
    2020 
    2121// temp storage for template variables 
    … …  
    5555    // define the message panel variables 
    5656    $variables['bold'] = true; 
    57     $template_panels[] = array('type' => 'body', 'name' => 'admin.forums.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/forums.php"); 
     57    $template_panels[] = array('type' => 'body', 'name' => 'admin.forums.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => "admin.forums"); 
    5858    $template_variables['admin.forums.status'] = $variables; 
    5959    $variables = array(); 
    … …  
    105105 
    106106// define the admin body panel 
    107 $template_panels[] = array('type' => 'body', 'name' => 'admin.images', 'template' => 'admin.images.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/image_uploads.php"); 
     107$template_panels[] = array('type' => 'body', 'name' => 'admin.images', 'template' => 'admin.images.tpl', 'locale' => "admin.image_uploads"); 
    108108$template_variables['admin.images'] = $variables; 
    109109 

  • trunk/administration/index.php

    r1068 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/main.php"; 
     19locale_load("admin.main"); 
    2020 
    2121// temp storage for template variables 
    … …  
    9696 
    9797// define the body panel variables 
    98 $template_panels[] = array('type' => 'body', 'name' => 'admin.index', 'template' => 'admin.index.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/main.php"); 
     98$template_panels[] = array('type' => 'body', 'name' => 'admin.index', 'template' => 'admin.index.tpl', 'locale' => "admin.main"); 
    9999$template_variables['admin.index'] = $variables; 
    100100 

  • trunk/administration/members.php

    r1060 r1071  
    2222 
    2323//load the locale for this module 
    24 include PATH_LOCALE.LOCALESET."admin/members.php"; 
    25 include PATH_LOCALE.LOCALESET."user_fields.php"; 
     24locale_load("admin.members"); 
     25locale_load("main.user_fields"); 
    2626 
    2727// load the GeoIP include module 
    … …  
    207207$variables['step'] = $step; 
    208208$variables['user_id'] = $user_id; 
    209 $template_panels[] = array('type' => 'body', 'name' => 'admin.members', 'template' => 'admin.members.tpl', 'locale' => array(PATH_LOCALE.LOCALESET."admin/members.php", PATH_LOCALE.LOCALESET."user_fields.php")); 
     209$template_panels[] = array('type' => 'body', 'name' => 'admin.members', 'template' => 'admin.members.tpl', 'locale' => array("admin.members", "main.user_fields")); 
    210210$template_variables['admin.members'] = $variables; 
    211211 

  • trunk/administration/modules.php

    r922 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/modules.php"; 
     19locale_load("admin.modules"); 
    2020 
    2121// temp storage for template variables 
    … …  
    414414  
    415415// define the admin body panel 
    416 $template_panels[] = array('type' => 'body', 'name' => 'admin.modules', 'template' => 'admin.modules.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/modules.php"); 
     416$template_panels[] = array('type' => 'body', 'name' => 'admin.modules', 'template' => 'admin.modules.tpl', 'locale' => "admin.modules"); 
    417417$template_variables['admin.modules'] = $variables; 
    418418 

  • trunk/administration/news.php

    r967 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/news-articles.php"; 
     19locale_load("admin.news-articles"); 
    2020 
    2121// temp storage for template variables 
    … …  
    320320 
    321321// store the info to generate the panel 
    322 $template_panels[] = array('type' => 'body', 'name' => 'admin.news', 'title' => $title, 'template' => 'admin.news.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/news-articles.php"); 
     322$template_panels[] = array('type' => 'body', 'name' => 'admin.news', 'title' => $title, 'template' => 'admin.news.tpl', 'locale' => "admin.news-articles"); 
    323323$template_variables['admin.news'] = $variables; 
    324324 

  • trunk/administration/news_cats.php

    r834 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/news-articles.php"; 
     19locale_load("admin.news-articles"); 
    2020 
    2121// temp storage for template variables 
    … …  
    3939    // define the message panel variables 
    4040    $variables['bold'] = true; 
    41     $template_panels[] = array('type' => 'body', 'name' => 'admin.news_cats.delete', 'title' => $locale['430'], 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/news-articles.php"); 
     41    $template_panels[] = array('type' => 'body', 'name' => 'admin.news_cats.delete', 'title' => $locale['430'], 'template' => '_message_table_panel.tpl', 'locale' => "admin.news-articles"); 
    4242    $template_variables['admin.news_cats.delete'] = $variables; 
    4343    $variables = array(); 
    … …  
    8484 
    8585// define the admin body panel 
    86 $template_panels[] = array('type' => 'body', 'name' => 'admin.news_cats', 'title' => $title, 'template' => 'admin.news_cats.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/news-articles.php"); 
     86$template_panels[] = array('type' => 'body', 'name' => 'admin.news_cats', 'title' => $title, 'template' => 'admin.news_cats.tpl', 'locale' => "admin.news-articles"); 
    8787$template_variables['admin.news_cats'] = $variables; 
    8888 

  • trunk/administration/panel_editor.php

    r864 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/panels.php"; 
     19locale_load("admin.panels"); 
    2020 
    2121// temp storage for template variables 
    … …  
    227227 
    228228// define the admin body panel 
    229 $template_panels[] = array('type' => 'body', 'name' => 'admin.panel_editor', 'title' => $title, 'template' => 'admin.panel_editor.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/panels.php"); 
     229$template_panels[] = array('type' => 'body', 'name' => 'admin.panel_editor', 'title' => $title, 'template' => 'admin.panel_editor.tpl', 'locale' => "admin.panels"); 
    230230$template_variables['admin.panel_editor'] = $variables; 
    231231 

  • trunk/administration/panels.php

    r834 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/panels.php"; 
     19locale_load("admin.panels"); 
    2020 
    2121// temp storage for template variables 
    … …  
    159159 
    160160// define the admin body panel 
    161 $template_panels[] = array('type' => 'body', 'name' => 'admin.panels', 'template' => 'admin.panels.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/panels.php"); 
     161$template_panels[] = array('type' => 'body', 'name' => 'admin.panels', 'template' => 'admin.panels.tpl', 'locale' => "admin.panels"); 
    162162$template_variables['admin.panels'] = $variables; 
    163163 

  • trunk/administration/redirects.php

    r834 r1071  
    1414 
    1515// load the locale for this module 
    16 include PATH_LOCALE.LOCALESET."admin/redirects.php"; 
     16locale_load("admin.redirects"); 
    1717 
    1818// temp storage for template variables 
    … …  
    168168 
    169169// define the admin body panel 
    170 $template_panels[] = array('type' => 'body', 'name' => 'admin.redirects', 'title' => $title, 'template' => 'admin.redirects.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/redirects.php"); 
     170$template_panels[] = array('type' => 'body', 'name' => 'admin.redirects', 'title' => $title, 'template' => 'admin.redirects.tpl', 'locale' => "admin.redirects"); 
    171171$template_variables['admin.redirects'] = $variables; 
    172172 

  • trunk/administration/settings_forum.php

    r909 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/settings.php"; 
     19locale_load("admin.settings"); 
    2020 
    2121// temp storage for template variables 
    … …  
    4848 
    4949// define the admin body panel 
    50 $template_panels[] = array('type' => 'body', 'name' => 'admin.settings_forum', 'template' => 'admin.settings_forum.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/settings.php"); 
     50$template_panels[] = array('type' => 'body', 'name' => 'admin.settings_forum', 'template' => 'admin.settings_forum.tpl', 'locale' => "admin.settings"); 
    5151$template_variables['admin.settings_forum'] = $variables; 
    5252 

  • trunk/administration/settings_image.php

    r909 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/settings.php"; 
     19locale_load("admin.settings"); 
    2020 
    2121// temp storage for template variables 
    … …  
    4949 
    5050// define the admin body panel 
    51 $template_panels[] = array('type' => 'body', 'name' => 'admin.settings_image', 'template' => 'admin.settings_image.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/settings.php"); 
     51$template_panels[] = array('type' => 'body', 'name' => 'admin.settings_image', 'template' => 'admin.settings_image.tpl', 'locale' => "admin.settings"); 
    5252$template_variables['admin.settings_image'] = $variables; 
    5353 

  • trunk/administration/settings_languages.php

    r909 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/settings.php"; 
     19locale_load("admin.settings"); 
    2020 
    2121// temp storage for template variables 
    … …  
    2929 
    3030if (isset($_POST['savesettings'])) { 
    31     $localeset = stripinput($_POST['localeset']); 
     31    $settings['locale'] = stripinput($_POST['localeset']); 
    3232    $old_localeset = stripinput($_POST['old_localeset']); 
    33     $result = dbquery("UPDATE ".$db_prefix."CMSconfig SET cfg_value = '".$localeset."' WHERE cfg_name = 'locale'"); 
    34     if ($localeset != $old_localeset) { 
    35         include PATH_LOCALE.$localeset."/admin/main.php"; 
     33    $result = dbquery("UPDATE ".$db_prefix."CMSconfig SET cfg_value = '".$settings['locale']."' WHERE cfg_name = 'locale'"); 
     34    if ($settings['locale'] != $old_localeset) { 
     35        locale_load("admin.main"); 
    3636        $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['201']."' WHERE admin_link='administrators.php'"); 
    3737        $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['202']."' WHERE admin_link='article_cats.php'"); 
    … …  
    5050        $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['235']."' WHERE admin_link='news_cats.php'"); 
    5151        $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['217']."' WHERE admin_link='panels.php'"); 
    52         $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['218']."' WHERE admin_link='photoalbums.php'"); 
    5352        $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['219']."' WHERE admin_link='phpinfo.php'"); 
    5453        $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['220']."' WHERE admin_link='polls.php'"); 
    55         $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['221']."' WHERE admin_link='shoutbox.php'"); 
    5654        $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['222']."' WHERE admin_link='site_links.php'"); 
    57         $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['223']."' WHERE admin_link='submissions.php'"); 
     55        $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['223']."' WHERE admin_link='tools.php'"); 
    5856        $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['224']."' WHERE admin_link='upgrade.php'"); 
    5957        $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['225']."' WHERE admin_link='user_groups.php'"); 
    60         $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['226']."' WHERE admin_link='weblink_cats.php'"); 
    61         $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['227']."' WHERE admin_link='weblinks.php'"); 
    6258        $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['228']."' WHERE admin_link='settings_main.php'"); 
    6359        $result = dbquery("UPDATE ".$db_prefix."admin SET admin_title='".$locale['229']."' WHERE admin_link='settings_time.php'"); 
    … …  
    8682 
    8783// define the admin body panel 
    88 $template_panels[] = array('type' => 'body', 'name' => 'admin.settings_languages', 'template' => 'admin.settings_languages.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/settings.php"); 
     84$template_panels[] = array('type' => 'body', 'name' => 'admin.settings_languages', 'template' => 'admin.settings_languages.tpl', 'locale' => "admin.settings"); 
    8985$template_variables['admin.settings_languages'] = $variables; 
    9086 

  • trunk/administration/settings_main.php

    r974 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/settings.php"; 
     19locale_load("admin.settings"); 
    2020 
    2121// temp storage for template variables 
    … …  
    5959 
    6060// define the admin body panel 
    61 $template_panels[] = array('type' => 'body', 'name' => 'admin.settings_main', 'template' => 'admin.settings_main.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/settings.php"); 
     61$template_panels[] = array('type' => 'body', 'name' => 'admin.settings_main', 'template' => 'admin.settings_main.tpl', 'locale' => "admin.settings"); 
    6262$template_variables['admin.settings_main'] = $variables; 
    6363 

  • trunk/administration/settings_messages.php

    r909 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/settings.php"; 
     19locale_load("admin.settings"); 
    2020 
    2121// temp storage for template variables 
    … …  
    6363 
    6464// define the admin body panel 
    65 $template_panels[] = array('type' => 'body', 'name' => 'admin.settings_messages', 'template' => 'admin.settings_messages.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/settings.php"); 
     65$template_panels[] = array('type' => 'body', 'name' => 'admin.settings_messages', 'template' => 'admin.settings_messages.tpl', 'locale' => "admin.settings"); 
    6666$template_variables['admin.settings_messages'] = $variables; 
    6767 

  • trunk/administration/settings_misc.php

    r909 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/settings.php"; 
     19locale_load("admin.settings"); 
    2020 
    2121// temp storage for template variables 
    … …  
    5555 
    5656// define the admin body panel 
    57 $template_panels[] = array('type' => 'body', 'name' => 'admin.settings_misc', 'template' => 'admin.settings_misc.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/settings.php"); 
     57$template_panels[] = array('type' => 'body', 'name' => 'admin.settings_misc', 'template' => 'admin.settings_misc.tpl', 'locale' => "admin.settings"); 
    5858$template_variables['admin.settings_misc'] = $variables; 
    5959 

  • trunk/administration/settings_registration.php

    r909 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/settings.php"; 
     19locale_load("admin.settings"); 
    2020 
    2121// temp storage for template variables 
    … …  
    4444 
    4545// define the admin body panel 
    46 $template_panels[] = array('type' => 'body', 'name' => 'admin.settings_registration', 'template' => 'admin.settings_registration.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/settings.php"); 
     46$template_panels[] = array('type' => 'body', 'name' => 'admin.settings_registration', 'template' => 'admin.settings_registration.tpl', 'locale' => "admin.settings"); 
    4747$template_variables['admin.settings_registration'] = $variables; 
    4848 

  • trunk/administration/settings_time.php

    r909 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/settings.php"; 
     19locale_load("admin.settings"); 
    2020 
    2121// temp storage for template variables 
    … …  
    7171 
    7272// define the admin body panel 
    73 $template_panels[] = array('type' => 'body', 'name' => 'admin.settings_time', 'template' => 'admin.settings_time.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/settings.php"); 
     73$template_panels[] = array('type' => 'body', 'name' => 'admin.settings_time', 'template' => 'admin.settings_time.tpl', 'locale' => "admin.settings"); 
    7474$template_variables['admin.settings_time'] = $variables; 
    7575 

  • trunk/administration/site_links.php

    r853 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/sitelinks.php"; 
     19locale_load("admin.sitelinks"); 
    2020 
    2121// temp storage for template variables 
    … …  
    325325 
    326326// define the admin body panel 
    327 $template_panels[] = array('type' => 'body', 'name' => 'admin.site_links', 'title' => $title, 'template' => 'admin.site_links.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/sitelinks.php"); 
     327$template_panels[] = array('type' => 'body', 'name' => 'admin.site_links', 'title' => $title, 'template' => 'admin.site_links.tpl', 'locale' => "admin.sitelinks"); 
    328328$template_variables['admin.site_links'] = $variables; 
    329329 

  • trunk/administration/tools.php

    r1068 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."admin/main.php"; 
     19locale_load("admin.main"); 
    2020 
    2121// check for the proper admin access rights 
    … …  
    4747 
    4848// define the body panel variables 
    49 $template_panels[] = array('type' => 'body', 'name' => 'admin.tools', 'template' => 'admin.tools.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/main.php"); 
     49$template_panels[] = array('type' => 'body', 'name' => 'admin.tools', 'template' => 'admin.tools.tpl', 'locale' => "admin.main"); 
    5050$template_variables['admin.tools'] = $variables; 
    5151 

  • trunk/administration/upgrade.php

    r1060 r1071  
    5454 
    5555    // load the locale for this module 
    56     include PATH_LOCALE.LOCALESET."admin/upgrade.php"; 
     56    locale_load("admin.upgrade"); 
    5757 
    5858    // temp storage for template variables 
    … …  
    152152    $variables['new_upgrades'] = false; 
    153153 
    154     $template_panels[] = array('type' => 'body', 'name' => 'admin.upgrade', 'template' => 'admin.upgrade.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/upgrade.php"); 
     154    $template_panels[] = array('type' => 'body', 'name' => 'admin.upgrade', 'template' => 'admin.upgrade.tpl', 'locale' => "admin.upgrade"); 
    155155    $template_variables['admin.upgrade'] = $variables; 
    156156 

  • trunk/administration/upgrade/rev01067.php

    r1068 r1071  
    3333// Need a locale from the setup locale file 
    3434$oldlocale = $locale; $locale = array(); 
    35 include PATH_LOCALE.LOCALESET."/setup.php"; 
     35locale_load("main.setup"); 
    3636 
    3737// Add the admin record for the webmaster toolbox to the admin table 

  • trunk/administration/user_groups.php

    r858 r1071  
    2020 
    2121//load the locale for this module 
    22 include PATH_LOCALE.LOCALESET."admin/user_groups.php"; 
     22locale_load("admin.user_groups"); 
    2323 
    2424//check if the user has a right to be here. If not, bail out 
    … …  
    7474    // define the message panel variables 
    7575    $variables['bold'] = true; 
    76     $template_panels[] = array('type' => 'body', 'name' => 'admin.article_cats.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/news-articles.php"); 
    77     $template_variables['admin.article_cats.status'] = $variables; 
     76    $template_panels[] = array('type' => 'body', 'name' => 'admin.user_groups.status', 'title' => $title, 'template' => '_message_table_panel.tpl', 'locale' => "admin.user_groups"); 
     77    $template_variables['admin.user_groups.status'] = $variables; 
    7878    $variables = array(); 
    7979} 
    … …  
    317317 
    318318// define the admin body panel 
    319 $template_panels[] = array('type' => 'body', 'name' => 'admin.user_groups', 'title' => $title, 'template' => 'admin.user_groups.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/user_groups.php"); 
     319$template_panels[] = array('type' => 'body', 'name' => 'admin.user_groups', 'title' => $title, 'template' => 'admin.user_groups.tpl', 'locale' => "admin.user_groups"); 
    320320$template_variables['admin.user_groups'] = $variables; 
    321321 

  • trunk/article_cats.php

    r834 r1071  
    1818define('AC_OVERVIEW_LIMIT', 5); 
    1919 
    20 include PATH_LOCALE.LOCALESET."article_cats.php"; 
     20// load the locale for this module 
     21locale_load("main.article_cats"); 
    2122 
    2223// make sure the cat_id is valid 
    … …  
    8081 
    8182// define the body panel variables 
    82 $template_panels[] = array('type' => 'body', 'name' => 'article_cats', 'template' => 'main.article_cats.tpl', 'locale' => PATH_LOCALE.LOCALESET."article_cats.php"); 
     83$template_panels[] = array('type' => 'body', 'name' => 'article_cats', 'template' => 'main.article_cats.tpl', 'locale' => "main.article_cats"); 
    8384$template_variables['article_cats'] = $variables; 
    8485 

  • trunk/contact.php

    r834 r1071  
    3131 
    3232// load the locale for this module 
    33 include PATH_LOCALE.LOCALESET."contact.php"; 
     33locale_load("main.contact"); 
    3434 
    3535if (isset($_POST['sendmessage'])) { 
    … …  
    6464    // define the body panel variables 
    6565    $variables['target'] = $target; 
    66     $template_panels[] = array('type' => 'body', 'name' => 'main.contact', 'template' => 'main.contact.tpl', 'locale' => PATH_LOCALE.LOCALESET.'contact.php'); 
     66    $template_panels[] = array('type' => 'body', 'name' => 'main.contact', 'template' => 'main.contact.tpl', 'locale' => "main.contact"); 
    6767    $template_variables['main.contact'] = $variables; 
    6868} 

  • trunk/downloads.php

    r991 r1071  
    2121 
    2222// load this module's locales 
    23 include PATH_LOCALE.LOCALESET."downloads.php"; 
     23locale_load("main.downloads"); 
    2424 
    2525function countdownloads($cat_id) { 
    … …  
    121121 
    122122// define the body panel variables 
    123 $template_panels[] = array('type' => 'body', 'name' => 'downloads', 'template' => 'main.downloads.tpl', 'locale' => PATH_LOCALE.LOCALESET."downloads.php"); 
     123$template_panels[] = array('type' => 'body', 'name' => 'downloads', 'template' => 'main.downloads.tpl', 'locale' => "main.downloads"); 
    124124$template_variables['downloads'] = $variables; 
    125125 

  • trunk/edit_profile.php

    r1060 r1071  
    2626 
    2727// load the locates for this module 
    28 include PATH_LOCALE.LOCALESET."members-profile.php"; 
    29 include PATH_LOCALE.LOCALESET."user_fields.php"; 
     28locale_load("main.members-profile"); 
     29locale_load("main.user_fields"); 
    3030 
    3131// admin function check 
    … …  
    223223 
    224224if (isset($check_message)) { 
    225     $template_panels[] = array('type' => 'body', 'name' => 'edit_profile_message', 'title' => $locale['424'], 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."members-profile.php"); 
     225    $template_panels[] = array('type' => 'body', 'name' => 'edit_profile_message', 'title' => $locale['424'], 'template' => '_message_table_panel.tpl', 'locale' => "main.members-profile"); 
    226226    $template_variables['edit_profile_message'] = array('message' => $check_message, 'bold' => true); 
    227227} 
    … …  
    259259 
    260260// define the search body panel variables 
    261 $template_panels[] = array('type' => 'body', 'name' => 'edit_profile', 'template' => 'main.edit_profile.tpl', 'locale' => array(PATH_LOCALE.LOCALESET."members-profile.php", PATH_LOCALE.LOCALESET."user_fields.php")); 
     261$template_panels[] = array('type' => 'body', 'name' => 'edit_profile', 'template' => 'main.edit_profile.tpl', 'locale' => array("main.members-profile", "main.user_fields")); 
    262262$template_variables['edit_profile'] = $variables; 
    263263 

  • trunk/faq.php

    r834 r1071  
    2424 
    2525// load this module's locales 
    26 include PATH_LOCALE.LOCALESET."faq.php"; 
     26locale_load("main.faq"); 
    2727 
    2828// temp storage for template variables 
    … …  
    6262$variables['cat_id'] = $cat_id; 
    6363// define the body panel variables 
    64 $template_panels[] = array('type' => 'body', 'name' => 'faq', 'title' => $title, 'template' => 'main.faq.tpl', 'locale' => PATH_LOCALE.LOCALESET."faq.php"); 
     64$template_panels[] = array('type' => 'body', 'name' => 'faq', 'title' => $title, 'template' => 'main.faq.tpl', 'locale' => "main.faq"); 
    6565$template_variables['faq'] = $variables; 
    6666 

  • trunk/feeds.php

    r886 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."feeds.php"; 
     19locale_load("main.feeds"); 
    2020 
    2121// define how many items we want per RSS feed 

  • trunk/forum/index.php

    r1012 r1071  
    2323 
    2424// load the locale for this forum module 
    25 include PATH_LOCALE.LOCALESET."forum/main.php"; 
     25locale_load("forum.main"); 
    2626 
    2727// load the advertisement include module and get an ad for this forum page 
    … …  
    8888 
    8989// define the search body panel variables 
    90 $template_panels[] = array('type' => 'body', 'name' => 'forum.index', 'template' => 'forum.index.tpl', 'locale' => PATH_LOCALE.LOCALESET."forum/main.php"); 
     90$template_panels[] = array('type' => 'body', 'name' => 'forum.index', 'template' => 'forum.index.tpl', 'locale' => "forum.main"); 
    9191$template_variables['forum.index'] = $variables; 
    9292 

  • trunk/forum/options.php

    r834 r1071  
    2020 
    2121// load the locale for this forum module 
    22 include PATH_LOCALE.LOCALESET."forum/options.php"; 
     22locale_load("forum.options"); 
    2323 
    2424// validate parameters 
    … …  
    6969    } 
    7070    // define the body panel variables 
    71     $template_panels[] = array('type' => 'body', 'name' => 'forum.options.renew', 'title' => $locale['458'], 'template' => 'forum.options.tpl', 'locale' => PATH_LOCALE.LOCALESET."forum/options.php"); 
     71    $template_panels[] = array('type' => 'body', 'name' => 'forum.options.renew', 'title' => $locale['458'], 'template' => 'forum.options.tpl', 'locale' => "forum.options"); 
    7272    $template_variables['forum.options.renew'] = $variables; 
    7373} 
    … …  
    109109    } 
    110110    // define the body panel variables 
    111     $template_panels[] = array('type' => 'body', 'name' => 'forum.options.delete', 'title' => $locale['400'], 'template' => 'forum.options.tpl', 'locale' => PATH_LOCALE.LOCALESET."forum/options.php"); 
     111    $template_panels[] = array('type' => 'body', 'name' => 'forum.options.delete', 'title' => $locale['400'], 'template' => 'forum.options.tpl', 'locale' => "forum.options"); 
    112112    $template_variables['forum.options.delete'] = $variables; 
    113113} 
    … …  
    117117    $result = dbquery("UPDATE ".$db_prefix."threads SET thread_locked='1' WHERE thread_id='$thread_id'"); 
    118118    // define the body panel variables 
    119     $template_panels[] = array('type' => 'body', 'name' => 'forum.options.lock', 'title' => $locale['410'], 'template' => 'forum.options.tpl', 'locale' => PATH_LOCALE.LOCALESET."forum/options.php"); 
     119    $template_panels[] = array('type' => 'body', 'name' => 'forum.options.lock', 'title' => $locale['410'], 'template' => 'forum.options.tpl', 'locale' => "forum.options"); 
    120120    $template_variables['forum.options.lock'] = $variables; 
    121121} 
    … …  
    125125    $result = dbquery("UPDATE ".$db_prefix."threads SET thread_locked='0' WHERE thread_id='$thread_id'"); 
    126126    // define the body panel variables 
    127     $template_panels[] = array('type' => 'body', 'name' => 'forum.options.unlock', 'title' => $locale['420'], 'template' => 'forum.options.tpl', 'locale' => PATH_LOCALE.LOCALESET."forum/options.php"); 
     127    $template_panels[] = array('type' => 'body', 'name' => 'forum.options.unlock', 'title' => $locale['420'], 'template' => 'forum.options.tpl', 'locale' => "forum.options"); 
    128128    $template_variables['forum.options.unlock'] = $variables; 
    129129} 
    … …  
    133133    $result = dbquery("UPDATE ".$db_prefix."threads SET thread_sticky='1' WHERE thread_id='$thread_id'"); 
    134134    // define the body panel variables 
    135     $template_panels[] = array('type' => 'body', 'name' => 'forum.options.sticky', 'title' => $locale['430'], 'template' => 'forum.options.tpl', 'locale' => PATH_LOCALE.LOCALESET."forum/options.php"); 
     135    $template_panels[] = array('type' => 'body', 'name' => 'forum.options.sticky', 'title' => $locale['430'], 'template' => 'forum.options.tpl', 'locale' => "forum.options"); 
    136136    $template_variables['forum.options.sticky'] = $variables; 
    137137} 
    … …  
    141141    $result = dbquery("UPDATE ".$db_prefix."threads SET thread_sticky='0' WHERE thread_id='$thread_id'"); 
    142142    // define the body panel variables 
    143     $template_panels[] = array('type' => 'body', 'name' => 'forum.options.sticky', 'title' => $locale['440'], 'template' => 'forum.options.tpl', 'locale' => PATH_LOCALE.LOCALESET."forum/options.php"); 
     143    $template_panels[] = array('type' => 'body', 'name' => 'forum.options.sticky', 'title' => $locale['440'], 'template' => 'forum.options.tpl', 'locale' => "forum.options"); 
    144144    $template_variables['forum.options.sticky'] = $variables; 
    145145} 
    … …  
    233233 
    234234    // define the body panel variables 
    235     $template_panels[] = array('type' => 'body', 'name' => 'forum.options.move', 'title' => $locale['450'], 'template' => 'forum.options.tpl', 'locale' => PATH_LOCALE.LOCALESET."forum/options.php"); 
     235    $template_panels[] = array('type' => 'body', 'name' => 'forum.options.move', 'title' => $locale['450'], 'template' => 'forum.options.tpl', 'locale' => "forum.options"); 
    236236    $template_variables['forum.options.move'] = $variables; 
    237237} 
    … …  
    261261    } 
    262262    // define the body panel variables 
    263     $template_panels[] = array('type' => 'body', 'name' => 'forum.options.merge', 'title' => $locale['455'], 'template' => 'forum.options.tpl', 'locale' => PATH_LOCALE.LOCALESET."forum/options.php"); 
     263    $template_panels[] = array('type' => 'body', 'name' => 'forum.options.merge', 'title' => $locale['455'], 'template' => 'forum.options.tpl', 'locale' => "forum.options"); 
    264264    $template_variables['forum.options.merge'] = $variables; 
    265265} 

  • trunk/forum/post.php

    r1055 r1071  
    4545 
    4646// load the locales for this forum module 
    47 include PATH_LOCALE.LOCALESET."forum/main.php"; 
    48 include PATH_LOCALE.LOCALESET."forum/post.php"; 
     47locale_load("forum.main"); 
     48locale_load("forum.post"); 
    4949 
    5050// shared forum functions includes 
    … …  
    893893 
    894894        // define the panel 
    895         $template_panels[] = array('type' => 'body', 'name' => 'forum.movepost.2', 'template' => 'forum.post.move.tpl', 'locale' => array(PATH_LOCALE.LOCALESET."forum/main.php", PATH_LOCALE.LOCALESET."forum/post.php")); 
     895        $template_panels[] = array('type' => 'body', 'name' => 'forum.movepost.2', 'template' => 'forum.post.move.tpl', 'locale' => array("forum.main", "forum.post")); 
    896896        $template_variables['forum.movepost.2'] = $variables; 
    897897 
    … …  
    930930 
    931931        // define the panel 
    932         $template_panels[] = array('type' => 'body', 'name' => 'forum.movepost.1', 'template' => 'forum.post.move.tpl', 'locale' => array(PATH_LOCALE.LOCALESET."forum/main.php", PATH_LOCALE.LOCALESET."forum/post.php")); 
     932        $template_panels[] = array('type' => 'body', 'name' => 'forum.movepost.1', 'template' => 'forum.post.move.tpl', 'locale' => array("forum.main", "forum.post")); 
    933933        $template_variables['forum.movepost.1'] = $variables; 
    934934    }    
    … …  
    10811081            $variables['attachtypes'] = str_replace(',', ' ', $settings['attachtypes']); 
    10821082            // define the panel 
    1083             $template_panels[] = array('type' => 'body', 'name' => 'forum.post', 'title' => $title, 'template' => 'forum.post.tpl', 'locale' => array(PATH_LOCALE.LOCALESET."forum/main.php", PATH_LOCALE.LOCALESET."forum/post.php", PATH_LOCALE.LOCALESET."admin/forum_polls.php")); 
     1083            $template_panels[] = array('type' => 'body', 'name' => 'forum.post', 'title' => $title, 'template' => 'forum.post.tpl', 'locale' => array("forum.main", "forum.post", "admin.forum_polls")); 
    10841084            $template_variables['forum.post'] = $variables; 
    10851085            break; 

  • trunk/forum/viewforum.php

    r1012 r1071  
    2626 
    2727// load the locales for this forum module 
    28 require_once PATH_LOCALE.LOCALESET."forum/main.php"; 
    29 require_once PATH_LOCALE.LOCALESET."admin/forum_polls.php"; 
     28locale_load("forum.main"); 
     29locale_load("admin.forum_polls"); 
    3030 
    3131// needed for localisation functions 
    … …  
    181181 
    182182// define the search body panel variables 
    183 $template_panels[] = array('type' => 'body', 'name' => 'forum.viewforum', 'template' => 'forum.viewforum.tpl', 'locale' => array(PATH_LOCALE.LOCALESET."forum/main.php",PATH_LOCALE.LOCALESET."admin/forum_polls.php")); 
     183$template_panels[] = array('type' => 'body', 'name' => 'forum.viewforum', 'template' => 'forum.viewforum.tpl', 'locale' => array("forum.main","admin.forum_polls")); 
    184184$template_variables['forum.viewforum'] = $variables; 
    185185 

  • trunk/forum/viewthread.php

    r948 r1071  
    2020 
    2121// load the locales for this forum module 
    22 require_once PATH_LOCALE.LOCALESET."forum/main.php"; 
    23 require_once PATH_LOCALE.LOCALESET."admin/forum_polls.php"; 
     22locale_load("forum.main"); 
     23locale_load("admin.forum_polls"); 
    2424 
    2525// needed for localisation functions 
    … …  
    389389 
    390390// define the search body panel variables 
    391 $template_panels[] = array('type' => 'body', 'name' => 'forum.viewthread', 'template' => 'forum.viewthread.tpl', 'locale' => array(PATH_LOCALE.LOCALESET."forum/main.php",PATH_LOCALE.LOCALESET."admin/forum_polls.php")); 
     391$template_panels[] = array('type' => 'body', 'name' => 'forum.viewthread', 'template' => 'forum.viewthread.tpl', 'locale' => array("forum.main","admin.forum_polls")); 
    392392$template_variables['forum.viewthread'] = $variables; 
    393393 

  • trunk/includes/comments_include.php

    r863 r1071  
    1616 
    1717// load the locale for this include 
    18 include PATH_LOCALE.LOCALESET."comments.php"; 
     18locale_load("main.comments"); 
    1919 
    2020// function to display the comments panel 
    … …  
    7979 
    8080    // define the body panel variables 
    81     $template_panels[] = array('type' => 'body', 'name' => 'comments_include', 'template' => 'include.comments.tpl', 'locale' => PATH_LOCALE.LOCALESET."comments.php"); 
     81    $template_panels[] = array('type' => 'body', 'name' => 'comments_include', 'template' => 'include.comments.tpl', 'locale' => "main.comments"); 
    8282    $template_variables['comments_include'] = $variables; 
    8383} 

  • trunk/includes/forum_functions_include.php

    r957 r1071  
    257257    // define the search body panel variables 
    258258    $template_panels[] = array('type' => 'body', 'name' => 'forum.resultdialog', 'title' => $title, 'template' => 'forum.resultdialog.tpl',  
    259                                     'locale' => array(PATH_LOCALE.LOCALESET."forum/main.php",PATH_LOCALE.LOCALESET."forum/post.php", PATH_LOCALE.LOCALESET."admin/forum_polls.php")); 
     259                                    'locale' => array("forum.main", "forum.post", "admin.forum_polls")); 
    260260    $template_variables['forum.resultdialog'] = $variables; 
    261261} 

  • trunk/includes/locale_functions.php

    r1070 r1071  
    5454} 
    5555 
    56 // locale defines (no longer needed once we moved to the new locale system!) 
    57  
     56// locale defines 
    5857define("PATH_LOCALE", PATH_ROOT."locale/"); 
    59  
    60 // locale detection - step 3 - use the website's default 
    61 if (!defined('LOCALESET')) { 
    62     define("LOCALESET", $settings['locale']."/"); 
    63 } 
     58if (!defined('LOCALESET')) define("LOCALESET", $settings['locale']."/"); 
    6459 
    6560// Initialise the $locale array 
    … …  
    7570 
    7671    global $settings, $locale; 
    77      
     72 
    7873    // assemble the locale filename 
    79     $locales_file = PATH_ROOT."files/".$locale['locale'].".".$locale_name.".php"; 
     74    $locales_file = PATH_ROOT."files/locales/".$locale['locale'].".".$locale_name.".php"; 
    8075 
    8176    // check if we need to recompile from the database 
    … …  
    109104                    fwrite($handle, "?>"."\n"); 
    110105                    fclose($handle); 
     106                } else { 
     107                    trigger_error("ExiteCMS locales error: no write access to ".$locales_file."!", E_USER_ERROR); 
    111108                } 
    112109            } 
    … …  
    127124                break; 
    128125 
     126            case "forum":   // forum modules 
     127                $locales_file = PATH_LOCALE.$settings['locale']."/forum/".$nameparts[1].".php"; 
     128                break; 
     129 
    129130            case "main":    // main modules 
    130131                $locales_file = PATH_LOCALE.$settings['locale']."/".$nameparts[1].".php"; 
    … …  
    141142            default: 
    142143                // unknown module type 
     144                trigger_error("ExiteCMS locales error: unknown or invalid module type specified in ".$locale_name."!", E_USER_ERROR); 
    143145        }        
    144146    } 
    145147     
    146     // if a locales file could be assembled, and it exists, load it 
    147     if (!empty($locales_file) && file_exists($locales_file)) { 
    148         include $locales_file; 
     148    // if a locales file could be assembled... 
     149    if (!empty($locales_file)) { 
     150        if (file_exists($locales_file)) { 
     151            // and it exists, load it 
     152            require_once $locales_file; 
     153        } else { 
     154            // otherwise, if the locale is not English, try to load the English version 
     155            if ($settings['locale'] != "English") { 
     156                $current_locale = $settings['locale']; 
     157                $settings['locale'] = "English"; 
     158                locale_load($locale_name); 
     159                $settings['locale'] = $current_locale; 
     160            } else { 
     161                trigger_error("ExiteCMS locales error: unable to locate a locale for ".$locale_name."!", E_USER_ERROR); 
     162            } 
     163        } 
    149164    } 
    150165 

  • trunk/includes/ratings_include.php

    r863 r1071  
    1616 
    1717// load the locale for this include 
    18 include PATH_LOCALE.LOCALESET."ratings.php"; 
     18locale_load("main.ratings"); 
    1919 
    2020// function to display the ratings panel 
    … …  
    7373    $variables['ratings'] = $ratings; 
    7474    // define the body panel variables 
    75     $template_panels[] = array('type' => 'body', 'name' => 'ratings_include', 'template' => 'include.ratings.tpl', 'locale' => PATH_LOCALE.LOCALESET."ratings.php"); 
     75    $template_panels[] = array('type' => 'body', 'name' => 'ratings_include', 'template' => 'include.ratings.tpl', 'locale' => "main.ratings"); 
    7676    $template_variables['ratings_include'] = $variables; 
    7777} 

  • trunk/includes/theme_functions.php

    r1068 r1071  
    162162+-----------------------------------------------------*/ 
    163163function load_templates($_type='', $_name='') { 
    164     global $settings, $userdata, $db_prefix, $aidlink, 
     164    global $settings, $locale, $userdata, $db_prefix, $aidlink, 
    165165            $template, $template_panels, $template_variables,  
    166166            $_loadstats, $_headparms, $_bodyparms, $_last_updated; 
    167167 
     168    // store the current locales. We need to restore them later 
     169    $current_locale = $locale; 
     170     
    168171    // reset all assigned template variables 
    169172    $template->clear_all_assign(); 
    … …  
    173176     
    174177    // Load the global language file 
    175     include PATH_LOCALE.LOCALESET."global.php"; 
     178    locale_load("main.global"); 
    176179 
    177180    // assign CMS website settings to the template 
    … …  
    223226 
    224227            // if one or more locales are assigned to this panel, load them first 
    225             if (isset($panel['locale']) && (is_array($panel['locale']) || $panel['locale'] != "")) { 
     228            if (isset($panel['locale']) { 
    226229                if (is_array($panel['locale'])) { 
    227230                    foreach($panel['locale'] as $panel_locale) { 
    228                         include $panel_locale; 
     231                        locale_load($panel_locale); 
    229232                    } 
    230233                } else { 
    231                     include $panel['locale']; 
     234                    locale_load($panel['locale']); 
    232235                } 
    233236            } 
    … …  
    286289        } 
    287290    } 
     291 
     292    // restore the current locales. 
     293    $locale = $current_locale; 
    288294} 
    289295 

  • trunk/locale/English/admin/main.php

    r1068 r1071  
    1919$locale['216'] = "News"; 
    2020$locale['217'] = "Panels"; 
    21 $locale['218'] = "Photo Albums"; 
     21$locale['218'] = "x"; 
    2222$locale['219'] = "PHP Info"; 
    2323$locale['220'] = "Polls"; 
    24 $locale['221'] = "Shoutbox"; 
     24$locale['221'] = "x"; 
    2525$locale['222'] = "Menu System"; 
    26 $locale['223'] = "Submissions"; 
     26$locale['223'] = "Webmaster Toolbox"; 
    2727$locale['224'] = "Upgrade"; 
    2828$locale['225'] = "User Groups"; 
    29 $locale['226'] = "Web Link Categories"; 
    30 $locale['227'] = "Web Links"; 
     29$locale['226'] = "x"; 
     30$locale['227'] = "x"; 
    3131$locale['228'] = "Main Settings"; 
    3232$locale['229'] = "Time and Date Settings"; 

  • trunk/lostpassword.php

    r963 r1071  
    2020 
    2121// load the locale for this module 
    22 include PATH_LOCALE.LOCALESET."lostpassword.php"; 
     22locale_load("main.lostpassword"); 
    2323 
    2424// get the sendmail include 
    … …  
    4747            $variables['message'] = $locale['402']; 
    4848            $variables['bold'] = true; 
    49             $template_panels[] = array('type' => 'body', 'name' => 'lostpassword', 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."lostpassword.php"); 
     49            $template_panels[] = array('type' => 'body', 'name' => 'lostpassword', 'template' => '_message_table_panel.tpl', 'locale' => "main.lostpassword"); 
    5050            $template_variables['lostpassword'] = $variables; 
    5151        } else { 
    … …  
    6969            $variables['linktext'] = $locale['403']; 
    7070            $variables['bold'] = true; 
    71             $template_panels[] = array('type' => 'body', 'name' => 'lostpassword', 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."lostpassword.php"); 
     71            $template_panels[] = array('type' => 'body', 'name' => 'lostpassword', 'template' => '_message_table_panel.tpl', 'locale' => "main.lostpassword"); 
    7272            $template_variables['lostpassword'] = $variables; 
    7373        } else { 
    … …  
    7777            $variables['linktext'] = $locale['406']; 
    7878            $variables['bold'] = true; 
    79             $template_panels[] = array('type' => 'body', 'name' => 'lostpassword', 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."lostpassword.php"); 
     79            $template_panels[] = array('type' => 'body', 'name' => 'lostpassword', 'template' => '_message_table_panel.tpl', 'locale' => "main.lostpassword"); 
    8080            $template_variables['lostpassword'] = $variables; 
    8181        } 
    … …  
    8686        $variables['linktext'] = $locale['403']; 
    8787        $variables['bold'] = true; 
    88         $template_panels[] = array('type' => 'body', 'name' => 'lostpassword', 'template' => '_message_table_panel.tpl', 'locale' => PATH_LOCALE.LOCALESET."lostpassword.php"); 
     88        $template_panels[] = array('type' => 'body', 'name' => 'lostpassword', 'template' => '_message_table_panel.tpl', 'locale' => "main.lostpassword"); 
    8989        $template_variables['lostpassword'] = $variables; 
    9090    } 
    9191} else { 
    9292    // define the body panel variables 
    93     $template_panels[] = array('type' => 'body', 'name' => 'lostpassword', 'template' => 'main.lostpassword.tpl', 'locale' => PATH_LOCALE.LOCALESET."lostpassword.php"); 
     93    $template_panels[] = array('type' => 'body', 'name' => 'lostpassword', 'template' => 'main.lostpassword.tpl', 'locale' => "main.lostpassword"); 
    9494    $template_variables['lostpassword'] = $variables; 
    9595} 

  • trunk/members.php

    r1068 r1071  
    2020 
    2121//load the locale for this module 
    22 require_once PATH_LOCALE.LOCALESET."members-profile.php"; 
     22locale_load("main.members-profile"); 
    2323 
    2424// load the GeoIP include module 
    … …  
    9898} 
    9999 
    100 $template_panels[] = array('type' => 'body', 'name' => 'members', 'template' => 'main.members.tpl', 'locale' => PATH_LOCALE.LOCALESET."members-profile.php"); 
     100$template_panels[] = array('type' => 'body', 'name' => 'members', 'template' => 'main.members.tpl', 'locale' => "main.members-profile"); 
    101101$template_variables['members'] = $variables; 
    102102 

  • trunk/news_cats.php

    r843 r1071  
    1919 
    2020// load this module's locales 
    21 include PATH_LOCALE.LOCALESET."news_cats.php"; 
     21locale_load("main.news_cats"); 
    2222 
    2323// make sure the cat_id is valid 
    … …  
    7979 
    8080// define the body panel variables 
    81 $template_panels[] = array('type' => 'body', 'name' => 'news_cats', 'template' => 'main.news_cats.tpl', 'locale' => PATH_LOCALE.LOCALESET."news_cats.php"); 
     81$template_panels[] = array('type' => 'body', 'name' => 'news_cats', 'template' => 'main.news_cats.tpl', 'locale' => "main.news_cats"); 
    8282$template_variables['news_cats'] = $variables; 
    8383 

  • trunk/pm.php

    r1060 r1071  
    1717 
    1818// load the locale for this module 
    19 require_once PATH_LOCALE.LOCALESET."pm.php"; 
     19locale_load("main.pm"); 
    2020 
    2121// include the forum functions 
    … …  
    10131013    } 
    10141014    // define the panel and assign the template variables 
    1015     $template_panels[] = array('type' => 'body', 'name' => 'pm.post', 'title' => $title, 'template' => 'main.pm.post.tpl', 'locale' => PATH_LOCALE.LOCALESET."pm.php"); 
     1015    $template_panels[] = array('type' => 'body', 'name' => 'pm.post', 'title' => $title, 'template' => 'main.pm.post.tpl', 'locale' => "main.pm"); 
    10161016    $template_variables['pm.post'] = $variables; 
    10171017 
    … …  
    10301030        $variables['totals'] = $totals; 
    10311031        // define the panel and assign the template variables 
    1032         $template_panels[] = array('type' => 'body', 'name' => 'pm.options', 'title' => $locale['400'].' - '.$locale['425'], 'template' => 'main.pm.options.tpl', 'locale' => PATH_LOCALE.LOCALESET."pm.php"); 
     1032        $template_panels[] = array('type' => 'body', 'name' => 'pm.options', 'title' => $locale['400'].' - '.$locale['425'], 'template' => 'main.pm.options.tpl', 'locale' => "main.pm"); 
    10331033        $template_variables['pm.options'] = $variables; 
    10341034     
    … …  
    10921092        $variables['pagenav_url'] = FUSION_SELF."?folder=".$folder."&amp;"; 
    10931093        // define the panel and assign the template variables 
    1094         $template_panels[] = array('type' => 'body', 'name' => 'pm', 'title' => $locale['400'].' - '.$title, 'template' => 'main.pm.tpl', 'locale' => PATH_LOCALE.LOCALESET."pm.php"); 
     1094        $template_panels[] = array('type' => 'body', 'name' => 'pm', 'title' => $locale['400'].' - '.$title, 'template' => 'main.pm.tpl', 'locale' => "main.pm"); 
    10951095        $template_variables['pm'] = $variables; 
    10961096    } 

  • trunk/print.php

    r954 r1071  
    2020 
    2121// load the locale for this module 
    22 include PATH_LOCALE.LOCALESET."print.php"; 
     22locale_load("main.print"); 
    2323 
    2424if (!isset($item_id) || !isNum($item_id)) fallback("index.php"); 
    … …  
    5656 
    5757// define the first body panel variables 
    58 $template_panels[] = array('type' => 'body', 'name' => 'print', 'template' => 'main.print.tpl', 'locale' => PATH_LOCALE.LOCALESET."print.php"); 
     58$template_panels[] = array('type' => 'body', 'name' => 'print', 'template' => 'main.print.tpl', 'locale' => "main.print"); 
    5959$template_variables['print'] = $variables; 
    6060 

  • trunk/profile.php

    r1060 r1071  
    2323 
    2424// load the locales for this module 
    25 include PATH_LOCALE.LOCALESET."members-profile.php"; 
    26 include PATH_LOCALE.LOCALESET."user_fields.php"; 
     25locale_load("main.members-profile"); 
     26locale_load("main.user_fields"); 
    2727 
    2828// temp storage for template variables 
    … …  
    113113    // define the body panel variables 
    114114    $variables['data'] = $data; 
    115     $template_panels[] = array('type' => 'body', 'name' => 'profile', 'template' => 'main.profile.members.tpl', 'locale' => array(PATH_LOCALE.LOCALESET."members-profile.php", PATH_LOCALE.LOCALESET."user_fields.php")); 
     115    $template_panels[] = array('type' => 'body', 'name' => 'profile', 'template' => 'main.profile.members.tpl', 'locale' => array("main.members-profile", "main.user_fields")); 
    116116    $template_variables['profile'] = $variables; 
    117117} 
    … …  
    145145    // define the body panel variables 
    146146    $variables['members'] = $members; 
    147     $template_panels[] = array('type' => 'body', 'name' => 'profile', 'template' => 'main.profile.groups.tpl', 'locale' => array(PATH_LOCALE.LOCALESET."members-profile.php", PATH_LOCALE.LOCALESET."user_fields.php")); 
     147    $template_panels[] = array('type' => 'body', 'name' => 'profile', 'template' => 'main.profile.groups.tpl', 'locale' => array("main.members-profile", "main.user_fields")); 
    148148    $template_variables['profile'] = $variables; 
    149149} 

  • trunk/register.php

    r1052 r1071  
    2626 
    2727// load the locales for this module 
    28 include PATH_LOCALE.LOCALESET."register.php"; 
    29 include PATH_LOCALE.LOCALESET."user_fields.php"; 
     28locale_load("main.register"); 
     29locale_load("main.user_fields"); 
    3030 
    3131// check whether we allow registrations 
    … …  
    4848            } 
    4949            // define the body panel variables 
    50             $template_panels[] = array('type' => 'body', 'name' => 'register.activate', 'template' => 'main.register.activate.tpl', 'locale' => array(PATH_LOCALE.LOCALESET."register.php", PATH_LOCALE.LOCALESET."user_fields.php")); 
     50            $template_panels[] = array('type' => 'body', 'name' => 'register.activate', 'template' => 'main.register.activate.tpl', 'locale' => array("main.register", "main.user_fields")); 
    5151            $template_variables['register.activate'] = $variables; 
    5252        } else { 
    … …  
    216216        $variables['theme_files'] = $theme_files; 
    217217        // define the body panel variables 
    218         $template_panels[] = array('type' => 'body', 'name' => 'register', 'template' => 'main.register.tpl', 'locale' => array(PATH_LOCALE.LOCALESET."register.php", PATH_LOCALE.LOCALESET."user_fields.php")); 
     218        $template_panels[] = array('type' => 'body', 'name' => 'register', 'template' => 'main.register.tpl', 'locale' => array("main.register", "main.user_fields")); 
    219219        $template_variables['register'] = $variables; 
    220220    } 

  • trunk/search.php

    r954 r1071  
    3232 
    3333// load the locale for this module 
    34 include PATH_LOCALE.LOCALESET."search.php"; 
     34locale_load("main.search"); 
    3535 
    3636// validate the possible parameters 
    … …  
    155155 
    156156// define the search body panel variables 
    157 $template_panels[] = array('type' => 'body', 'name' => 'search', 'template' => 'main.search.tpl', 'locale' => PATH_LOCALE.LOCALESET."search.php"); 
     157$template_panels[] = array('type' => 'body', 'name' => 'search', 'template' => 'main.search.tpl', 'locale' => "main.search"); 
    158158$template_variables['search'] = $variables; 
    159159 

  • trunk/setup.php

    r1068 r1071  
    8585define("PATH_ADMIN", PATH_ROOT."administration/"); 
    8686define("PATH_THEMES", PATH_ROOT."themes/"); 
    87 define("PATH_THEME", PATH_ROOT."themes/PLiTheme/"); 
    88 define("PATH_LOCALE", PATH_ROOT."locale/"); 
     87define("PATH_THEME", PATH_ROOT."themes/ExiteCMS/"); 
    8988define("PATH_PHOTOS", PATH_ROOT."images/photoalbum/"); 
    9089define("PATH_IMAGES", PATH_ROOT."images/"); 
    … …  
    9796define("PATH_INCLUDES", PATH_ROOT."includes/"); 
    9897define("PATH_MODULES", PATH_ROOT."modules/"); 
    99 define("PATH_ATTACHMENTS", PATH_ROOT."files/"); 
     98define("PATH_ATTACHMENTS", PATH_ROOT."files/attachments"); 
    10099 
    101100define("FUSION_SELF", isset($_SERVER['REDIRECT_URL']) && $_SERVER['REDIRECT_URL'] != "" ? basename($_SERVER['REDIRECT_URL']) : basename($_SERVER['PHP_SELF'])); 
    … …  
    111110$step = (isset($_GET['step']) ? $_GET['step'] : "0"); 
    112111$variables['step'] = $step; 
    113 $localeset = (isset($_GET['localeset']) ? $_GET['localeset'] : "English"); 
    114 $variables['localeset'] = $localeset; 
    115 define("LOCALESET", $localeset.'/'); 
     112$settings = array("locale" => (isset($_GET['localeset']) ? $_GET['localeset'] : "English")); 
     113$variables['localeset'] = $settings['locale']; 
    116114 
    117115// check if the cache directories are writeable 
    … …  
    156154 
    157155require_once PATH_ROOT."includes/theme_functions.php"; 
     156require_once PATH_ROOT."includes/locale_functions.php"; 
    158157 
    159158// load the locale for this module 
    160 include PATH_LOCALE.$localeset."/setup.php"; 
     159locale_load("main.setup"); 
    161160 
    162161// process the different setup steps 
    … …  
    392391 
    393392// define the setup body panel variables 
    394 $template_panels[] = array('type' => 'body', 'name' => 'setup', 'template' => 'main.setup.tpl', 'locale' => PATH_LOCALE.$localeset."/setup.php"); 
     393$template_panels[] = array('type' => 'body', 'name' => 'setup', 'template' => 'main.setup.tpl', 'locale' => "main.setup"); 
    395394$template_variables['setup'] = $variables; 
    396395 

  • trunk/viewpage.php

    r834 r1071  
    1717 
    1818// load the locale for this module 
    19 include PATH_LOCALE.LOCALESET."custom_pages.php"; 
     19locale_load("main.custom_pages"); 
    2020 
    2121// temp storage for template variables 
    … …  
    4747 
    4848// define the search body panel variables 
    49 $template_panels[] = array('type' => 'body', 'name' => 'viewpage', 'title' => $title, 'template' => 'main.viewpage.tpl', 'locale' => PATH_LOCALE.LOCALESET."custom_pages.php"); 
     49$template_panels[] = array('type' => 'body', 'name' => 'viewpage', 'title' => $title, 'template' => 'main.viewpage.tpl', 'locale' => "main.custom_pages"); 
    5050$template_variables['viewpage'] = $variables; 
    5151 
Note: See TracChangeset for help on using the changeset viewer.